Add woodCreation as output (#161)

* Add woodCreation as output

* Update src/sipnet/sipnet.c

Co-authored-by: Mike Longfritz <Mike.Longfritz@gmail.com>

* Updates to print mis-matched column info

* Fixes for linter

* Fixes (again) for linter

---------

Co-authored-by: Cameron Webb <cwebb16@scc1.bu.edu>
Co-authored-by: Mike Longfritz <Mike.Longfritz@gmail.com>

Author: 3 people

src/sipnet/sipnet.c

@@ -398,7 +398,7 @@ void readParamData(ModelParams **modelParamsPtr, const char *paramFile) {
 void outputHeader(FILE *out) {
   fprintf(out, "Notes: (PlantWoodC, PlantLeafC, Soil and Litter in g C/m^2; "
                "Water and Snow in cm; SoilWetness is fraction of WHC;\n");
-  fprintf(out, "year day time plantWoodC plantLeafC ");
+  fprintf(out, "year day time plantWoodC plantLeafC woodCreation ");
   fprintf(out, "soil microbeC coarseRootC fineRootC ");
   fprintf(out, "litter soilWater soilWetnessFrac snow ");
   fprintf(out, "npp nee cumNEE gpp rAboveground rSoil rRoot ra rh rtot "
@@ -414,8 +414,8 @@ void outputHeader(FILE *out) {
  */
 void outputState(FILE *out, int year, int day, double time) {
 
-  fprintf(out, "%4d %3d %5.2f %8.2f %8.2f ", year, day, time, envi.plantWoodC,
-          envi.plantLeafC);
+  fprintf(out, "%4d %3d %5.2f %8.2f %8.2f %8.2f ", year, day, time,
+          envi.plantWoodC, envi.plantLeafC, trackers.woodCreation);
   fprintf(out, "%8.2f ", envi.soil);
   fprintf(out, "%8.2f ", envi.microbeC);
   fprintf(out, "%8.2f %8.2f", envi.coarseRootC, envi.fineRootC);
@@ -1285,6 +1285,7 @@ void initTrackers(void) {
   trackers.evapotranspiration = 0.0;
   trackers.soilWetnessFrac = envi.soilWater / params.soilWHC;
   trackers.rSoil = 0.0;
+  trackers.woodCreation = 0.0;
 
   trackers.rRoot = 0.0;
 
@@ -1382,6 +1383,7 @@ void updateTrackers(double oldSoilWater) {
   trackers.totRtot += trackers.rtot;
   trackers.totNpp += trackers.npp;
   trackers.totNee += trackers.nee;
+  trackers.woodCreation = fluxes.woodCreation * climate->length;
 
   // evapotranspiration includes water lost to evaporation from canopy
   // irrigation (fluxes.eventEvap)

src/sipnet/state.h

@@ -576,6 +576,10 @@ typedef struct TrackerVars {  // variables to track various things
   double rAboveground;
   // g C * m^-2 litterfall, year to date: SUM litter
   double yearlyLitter;
+
+  // g C * m^-2 wood creation
+  double woodCreation;
+
 } Trackers;
 
 // Global var

tests/smoke/niwot/sipnet.out

@@ -124,12 +124,23 @@ def check_results(smoke_dir: str, verbose: bool):
     git_df = pd.read_table(git_result, skiprows=1, header=0, sep=r'\s+', dtype=float)
 
     if set(new_df.columns) != set(git_df.columns):
-      print("Columns have changed! Comparing subset of matching columns")
+      print("Columns have changed!")
       common_columns = [col for col in new_df.columns if col in git_df.columns]
+      git_inter_columns = [col for col in git_df.columns if col not in new_df.columns]
+      new_inter_columns = [col for col in new_df.columns if col not in git_df.columns]
       # common_columns = list(set(new_df.columns) & set(git_df.columns))
+      if git_inter_columns:
+        print(f"Removed columns from git: {git_inter_columns}")
+      else:
+        print("No columns removed")
+      if new_inter_columns:
+        print(f"New columns: {new_inter_columns}")
+      else:
+        print("No new columns added")
       print(f"Common columns: {common_columns}")
       new_df = new_df[common_columns]
       git_df = git_df[common_columns]
+      print("Comparing common columns")
   else:
     cols = 'year day time plantWoodC plantLeafC soil microbeC coarseRootC fineRootC litter litterWater soilWater soilWetnessFrac snow npp nee cumNEE gpp rAboveground rSoil rRoot ra rh rtot evapotranspiration fluxestranspiration fPAR'
     cols = cols.split(' ')