Fix scenario issues, parameters updated

Author: bmaglio

include/CohortLookup.h

@@ -50,7 +50,6 @@ class CohortLookup {
                    //  SOM respiration rate (at 0oC)
   double kdcsomcr; //calibrated soil chemically-resistant
                    //  SOM respiration rate (at 0oC)
-  double rhq10;
   double s2dfraction;
   double d2mfraction;
   //Soil methane calibrated values
@@ -71,8 +70,6 @@ class CohortLookup {
   double oxidkm_ch4;
   double oxidVmax_ch4;
 
-  double rhmoist;
-
   double max_ponding_s;
   double max_ponding_w;
   double inflow_factor;

include/parameters.h

@@ -148,7 +148,6 @@ struct soipar_cal {
                    //respiration rate (at 0oC)
   double kdcsomcr; // calibrated soil chemically-resistant SOM
                    // respiration rate (at 0oC)
-  double rhq10;
   double s2dfraction;
   double d2mfraction;
   //Methane related values
@@ -169,15 +168,13 @@ struct soipar_cal {
   double oxidkm_ch4;
   double oxidVmax_ch4;
 
-  double rhmoist;
-
   soipar_cal() : micbnup(UIN_D), kdcrawc(UIN_D), kdcsoma(UIN_D),
                  kdcsompr(UIN_D), kdcsomcr(UIN_D), kdcrawc_ch4(UIN_D),
-                 rhq10(UIN_D), s2dfraction(UIN_D), d2mfraction(UIN_D),
+                 s2dfraction(UIN_D), d2mfraction(UIN_D),
                  kdcsoma_ch4(UIN_D), kdcsompr_ch4(UIN_D), kdcsomcr_ch4(UIN_D),
                  ch4_ebul_rate(UIN_D), ch4_transport_rate(UIN_D), prodq10_ch4(UIN_D),
                  oxidq10_ch4(UIN_D), prodTref_ch4(UIN_D), oxidTref_ch4(UIN_D),
-                 oxidkm_ch4(UIN_D), oxidVmax_ch4(UIN_D), rhmoist(UIN_D) {}
+                 oxidkm_ch4(UIN_D), oxidVmax_ch4(UIN_D) {}
 };
 
 struct soipar_dim {
@@ -258,6 +255,11 @@ struct soipar_bgc {
   double kdsompr[MAX_SOI_LAY];
   double kdsomcr[MAX_SOI_LAY];
 
+  double kdrawc_ch4[MAX_SOI_LAY];
+  double kdsoma_ch4[MAX_SOI_LAY];
+  double kdsompr_ch4[MAX_SOI_LAY];
+  double kdsomcr_ch4[MAX_SOI_LAY];
+
   soipar_bgc(): kn2(UIN_D), moistmin(UIN_D), moistmax(UIN_D), moistopt(UIN_D),
                 rhq10(UIN_D), rhmoistfrozen(UIN_D), propftos(UIN_D),
                 nmincnsoil(UIN_D), fnloss(UIN_D),

parameters/cmt_calparbgc.txt

@@ -28,7 +28,6 @@
 3.330803     // summermaxponding: 
 110.943159   // wintermaxponding: 
 3.281148     // inflowfactor: 
-2.000000     // rhq10: 
 0.431383     // s2dfraction: 
 0.884434     // d2mfraction: 
 0.000010     // kdcrawcch4: 
@@ -65,7 +64,6 @@
 0.54       // kdcsoma:     .58
 0.002       // kdcsompr:     .003
 0.00007   // kdcsomcr: 0.000025  0.00025 bad
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:
@@ -102,7 +100,6 @@
 0.48       // kdcsoma:    .48
 0.0048       // kdcsompr:   .0028  
 0.000025   // kdcsomcr: 
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:
@@ -139,7 +136,6 @@
 0.58       // kdcsoma:   0.58
 0.003     // kdcsompr:   
 0.000025   // kdcsomcr:
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:
@@ -176,7 +172,6 @@
 0.93     // kdcsoma:
 0.40     // kdcsompr:
 0.00007  // kdcsomcr:
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:
@@ -213,7 +208,6 @@
 0.03      // kdcsoma:  was 0.07
 0.015      // kdcsompr:   was 0.05
 0.000005     // kdcsomcr:  was 0.00005 
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:
@@ -250,7 +244,6 @@
 0.011       // kdcsoma:  was 0.12
 0.0025       // kdcsompr: was .03
 0.00025       // kdcsomcr:
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:
@@ -287,7 +280,6 @@
 0.36       // kdcsoma:  was 0.26      
 0.0332      // kdcsompr: was 0.0062   0.00962
 0.0000001   // kdcsomcr: was 0.0000005
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:
@@ -324,7 +316,6 @@
 0.03       // kdcsoma:
 0.0085      // kdcsompr:
 0.000025    // kdcsomcr:
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:
@@ -361,7 +352,6 @@
 0.67       // kdcsoma:
 0.91      // kdcsompr:
 0.00025    // kdcsomcr:
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:
@@ -398,7 +388,6 @@
 0.258      // kdcsoma: .95 .9 .85
 0.008      // kdcsompr:
 0.00005    // kdcsomcr:
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:
@@ -437,7 +426,6 @@
 3.330803     // summermaxponding: 
 110.943159   // wintermaxponding: 
 3.281148     // inflowfactor: 
-2.000000     // rhq10: 
 0.431383     // s2dfraction: 
 0.884434     // d2mfraction: 
 0.000010     // kdcrawcch4: 
@@ -474,7 +462,6 @@
 0.90     // kdcsoma:  was 0.93   then 0.68
 0.014     // kdcsompr:  was 0.40  then 0.01
 0.000007  // kdcsomcr:
-2.0          // rhq10:
 1.0          // s2dfraction:
 1.0          // d2mfraction:
 0.00      // kdcrawcch4:

src/CohortLookup.cpp

@@ -159,7 +159,6 @@ std::string CohortLookup::calparbgc2str() {
   s << this->max_ponding_s << "// summermaxponding: \n:";
   s << this->max_ponding_w << "// wintermaxponding: \n:";
   s << this->inflow_factor << "// inflowfactor: \n:";
-  s << this->rhq10 << "// rhq10:\n";
   s << this->s2dfraction << "// s2dfraction \n:";
   s << this->d2mfraction << "// d2mfraction \n:";
   s << this->kdcrawc_ch4 << "// kdcrawc_ch4:\n";
@@ -174,7 +173,6 @@ std::string CohortLookup::calparbgc2str() {
   s << this->oxidTref_ch4 << "// oxidTref_ch4:\n";
   s << this->oxidkm_ch4 << "// oxidkm_ch4:\n";
   s << this->oxidVmax_ch4 << "// oxidVmax_ch4:\n";
-  s << this->rhmoist << "// rhmoist:\n";
   return s.str();
 }
 
@@ -184,7 +182,7 @@ void CohortLookup::assignBgcCalpar(std::string & dircmt) {
 
   // get a list of data for the cmt number
   std::list<std::string> l = temutil::parse_parameter_file(
-      dircmt + "cmt_calparbgc.txt", temutil::cmtcode2num(this->cmtcode), 37
+      dircmt + "cmt_calparbgc.txt", temutil::cmtcode2num(this->cmtcode), 35
   );
 
   // pop each line off the front of the list
@@ -211,7 +209,6 @@ void CohortLookup::assignBgcCalpar(std::string & dircmt) {
   temutil::pfll2data(l, max_ponding_s);
   temutil::pfll2data(l, max_ponding_w);
   temutil::pfll2data(l, inflow_factor);
-  temutil::pfll2data(l, rhq10);
   temutil::pfll2data(l, s2dfraction);
   temutil::pfll2data(l, d2mfraction);
 
@@ -231,8 +228,6 @@ void CohortLookup::assignBgcCalpar(std::string & dircmt) {
 
   temutil::pfll2data(l, oxidkm_ch4);
   temutil::pfll2data(l, oxidVmax_ch4);
-
-  temutil::pfll2data(l, rhmoist);
 }
 
 /** Assign "veg dimension?" from parameter file. */

src/Soil_Bgc.cpp

@@ -1676,7 +1676,7 @@ double Soil_Bgc::getRhmoist(const double &vsm, const double &moistmin,
 
 double Soil_Bgc::getRhq10(const double & tsoil) {
   double rhq10;
-  rhq10 =  pow( (double)calpar.rhq10, tsoil/10.0);
+  rhq10 =  pow( (double)bgcpar.rhq10, tsoil/10.0);
   return rhq10;
 };