Merge pull request #450 from rarutter/20201007_output_update

20201007 output update
uaf-arctic-eco-modeling · Oct 12, 2020 · a735b52 · a735b52
2 parents 7f11f42 + 01100a2
commit a735b52
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/config/output_spec.csv b/config/output_spec.csv
@@ -42,7 +42,6 @@ INNPP,NPP witout N limitation,g/m2/time,,,invalid,,,invalid,double,
 INNUPTAKE,Unlimited N uptake by plants. N uptake by happy plants when N is not limited.,g/m2/time,,,invalid,,invalid,invalid,double,
 IWCLAYER,IWC by layer,m3/m3,,,invalid,invalid,invalid,,double,
 LAI,LAI,m2/m2,,,invalid,,invalid,invalid,double,
-LATERALDRAINAGE,Qdrain per layer,mm,,,,invalid,invalid,,double,
 LAYERDEPTH,Layer depth from the surface,,,,invalid,invalid,invalid,,double,
 LAYERDZ,Thickness of layer,,,,invalid,invalid,invalid,,double,
 LAYERTYPE,0:moss 1:shlw 2:deep 3:mineral,,,,invalid,invalid,invalid,,int,
@@ -67,14 +66,15 @@ PERCOLATION,percolation,,,,,invalid,invalid,,double,
 PERMAFROST,Permafrost (1 or 0),,,invalid,invalid,invalid,invalid,invalid,int,
 PET,Potential ET,mm/m2/time,,,,,invalid,invalid,double,
 QDRAINAGE,Water drainage quotient (~ratio),,,,invalid,invalid,invalid,invalid,double,
+QDRAINLAYER,Qdrain per layer,mm,invalid,invalid,,invalid,invalid,,double,
 QINFILTRATION,Water infiltration quotient (~ratio),,,,invalid,invalid,invalid,invalid,double,
 QRUNOFF,Water runoff quotient (~ratio),,,,invalid,invalid,invalid,invalid,double,
 RAINFALL,Total rainfall,mm,,,invalid,invalid,invalid,invalid,double,
 RG,Growth respiration,g/m2/time,,,invalid,,,invalid,double,
 RH,Heterotrophic respiration,g/m2/time,,,invalid,invalid,invalid,,double,
 RM,Maintenance respiration,g/m2/time,,,invalid,,,invalid,double,
 ROLB,Relative organic layer burned ratio C,g/g,,,invalid,invalid,invalid,invalid,double,
-ROOTWATERUPTAKE,Water uptake by roots per layer,,,,,invalid,invalid,,double,
+ROOTWATERUPTAKE,Water uptake by roots per layer,,invalid,invalid,,invalid,invalid,,double,
 SHLWC,Fibrous SOM C,g/m2,,,invalid,invalid,invalid,invalid,double,
 SHLWDZ,Fibrous SOM layer thickness,m,,invalid,invalid,invalid,invalid,invalid,double,
 SNOWEND,DOY of last snow fall,DOY,,invalid,invalid,invalid,invalid,invalid,int,

diff --git a/src/Runner.cpp b/src/Runner.cpp
@@ -2300,23 +2300,6 @@ void Runner::output_netCDF(std::map<std::string, OutputSpec> &netcdf_outputs, in
   map_itr = netcdf_outputs.end();
 
 
-  //LATERALDRAINAGE
-  map_itr = netcdf_outputs.find("LATERALDRAINAGE");
-  if(map_itr != netcdf_outputs.end()){
-    BOOST_LOG_SEV(glg, debug)<<"NetCDF output: LATERALDRAINAGE";
-    curr_spec = map_itr->second;
-
-    #pragma omp critical(outputLATERALDRAINAGE)
-    {
-      //daily
-      if(curr_spec.daily){
-        output_nc_4dim(&curr_spec, file_stage_suffix, &cohort.edall->daily_layer_drain[0][0], MAX_SOI_LAY, day_timestep, dinm);
-      }
-    }//end critical(outputLATERALDRAINAGE)
-  }//end LATERALDRAINAGE 
-  map_itr = netcdf_outputs.end();
-
-
   //LAYERDEPTH
   map_itr = netcdf_outputs.find("LAYERDEPTH");
   if(map_itr != netcdf_outputs.end()){
@@ -3327,6 +3310,23 @@ void Runner::output_netCDF(std::map<std::string, OutputSpec> &netcdf_outputs, in
   map_itr = netcdf_outputs.end();
 
 
+  //QDRAINLAYER
+  map_itr = netcdf_outputs.find("QDRAINLAYER");
+  if(map_itr != netcdf_outputs.end()){
+    BOOST_LOG_SEV(glg, debug)<<"NetCDF output: QDRAINLAYER";
+    curr_spec = map_itr->second;
+
+    #pragma omp critical(outputQDRAINLAYER)
+    {
+      //daily
+      if(curr_spec.daily){
+        output_nc_4dim(&curr_spec, file_stage_suffix, &cohort.edall->daily_layer_drain[0][0], MAX_SOI_LAY, day_timestep, dinm);
+      }
+    }//end critical(outputQDRAINLAYER)
+  }//end QDRAINLAYER
+  map_itr = netcdf_outputs.end();
+
+
   //QINFILTRATION
   map_itr = netcdf_outputs.find("QINFILTRATION");
   if(map_itr != netcdf_outputs.end()){