standardizing names, removing WRM in favor of water retention model, …

…removing via names in favor of comma, etc

src/pks/flow/constitutive_relations/sources/soil_resistance_sakagucki_zeng_evaluator.hh

@@ -26,9 +26,9 @@ referred to Sakagucki and Zeng (2009).
     through method 2 in Ma et al. (1999). Originally this method is from
     Lenhard et al. (1989).
 
-    - If `"Brooks-Corey`" is used for WRM, `"Brooks Corey lambda [-]`" will
+    - If `"Brooks-Corey`" is used for WRM, `"Brooks-Corey lambda [-]`" will
     be used to determine Clapp-Hornberger-b, which is the reciprocal of
-    `"Brooks Corey lambda [-]`".
+    `"Brooks-Corey lambda [-]`".
 
     - `"residual saturation [-]`" ``[double]`` **0.0**
 

src/pks/flow/constitutive_relations/sources/soil_resistance_sakagucki_zeng_model.hh

@@ -81,7 +81,7 @@ class SoilResistanceSakaguckiZengModel {
         b_ = 1. / lambda;
       }
     } else if (plist_.get<std::string>("wrm type") == "Brooks-Corey") {
-      double lambda = plist_.get<double>("Brooks Corey lambda [-]");
+      double lambda = plist_.get<double>("Brooks-Corey lambda [-]");
       b_ = 1. / lambda;
     } else {
       b_ = plist_.get<double>("Clapp-Hornberger b [-]");

src/pks/flow/constitutive_relations/wrm/rel_perm_evaluator.hh

@@ -143,8 +143,8 @@ parameters to Brooks-Corey parameters.
         <ParameterList name="domain" type="ParameterList">
           <Parameter name="region" type="string" value="domain" />
           <Parameter name="wrm type" type="string" value="Brooks-Corey" />
-          <Parameter name="Brooks Corey lambda [-]" type="double" value="0.49" />
-          <Parameter name="Brooks Corey saturted matric suction [Pa]" type="double" value="32439.03" />
+          <Parameter name="Brooks-Corey lambda [-]" type="double" value="0.49" />
+          <Parameter name="Brooks-Corey saturted matric suction [Pa]" type="double" value="32439.03" />
           <Parameter name="residual saturation [-]" type="double" value="0.2" />
           <Parameter name="smoothing interval width [saturation]" type="double" value="0.05" />
         </ParameterList>

src/pks/flow/constitutive_relations/wrm/rel_perm_evaluator_reg.hh

@@ -14,7 +14,7 @@ namespace Flow {
 
 // registry of method
 Utils::RegisteredFactory<Evaluator, RelPermEvaluator>
-  RelPermEvaluator::factory_("relative permeability, van Genuchten");
+  RelPermEvaluator::factory_("relative permeability, water retention model");
 
 } // namespace Flow
 } // namespace Amanzi

src/pks/flow/constitutive_relations/wrm/rel_perm_frzBC_evaluator.hh

@@ -112,8 +112,8 @@ parameters to Brooks-Corey parameters.
         <ParameterList name="domain" type="ParameterList">
           <Parameter name="region" type="string" value="domain" />
           <Parameter name="wrm type" type="string" value="Brooks-Corey" />
-          <Parameter name="Brooks Corey lambda [-]" type="double" value="0.49" />
-          <Parameter name="Brooks Corey saturted matric suction [Pa]" type="double" value="32439.03" />
+          <Parameter name="Brooks-Corey lambda [-]" type="double" value="0.49" />
+          <Parameter name="Brooks-Corey saturted matric suction [Pa]" type="double" value="32439.03" />
           <Parameter name="residual saturation [-]" type="double" value="0.2" />
           <Parameter name="smoothing interval width [saturation]" type="double" value="0.05" />
         </ParameterList>

src/pks/flow/constitutive_relations/wrm/rel_perm_frzBC_evaluator_reg.hh

@@ -14,7 +14,7 @@ namespace Flow {
 
 // registry of method
 Utils::RegisteredFactory<Evaluator, RelPermFrzBCEvaluator>
-  RelPermFrzBCEvaluator::factory_("relative permeability, freezing Brooks Corey");
+  RelPermFrzBCEvaluator::factory_("relative permeability, freezing Brooks-Corey");
 
 } // namespace Flow
 } // namespace Amanzi

src/pks/flow/constitutive_relations/wrm/wrm_brooks_corey.cc

@@ -30,9 +30,9 @@ WRMBrooksCorey::WRMBrooksCorey(Teuchos::ParameterList& plist) : plist_(plist)
 void
 WRMBrooksCorey::InitializeFromPlist_()
 {
-  lambda_ = plist_.get<double>("Brooks Corey lambda [-]");
+  lambda_ = plist_.get<double>("Brooks-Corey lambda [-]");
   b_ = 1. / lambda_; // clapp hornberger b
-  p_sat_ = plist_.get<double>("Brooks Corey saturated matric suction [Pa]");
+  p_sat_ = plist_.get<double>("Brooks-Corey saturated matric suction [Pa]");
   sr_ = plist_.get<double>("residual saturation [-]", 0.0);
 
   s0_ = 1.0 - plist_.get<double>("smoothing interval width [saturation]", 0.0);

src/pks/flow/constitutive_relations/wrm/wrm_brooks_corey.hh

@@ -8,7 +8,7 @@
            Bo Gao (gaob@ornl.gov)
 */
 
-//! WRMBrooksCorey : water retention model using Brooks Corey's parameterization
+//! WRMBrooksCorey : water retention model using Brooks-Corey's parameterization
 /*!
 
 Brooks-Corey's water retention curve, typically used to determine relative
@@ -19,8 +19,8 @@ to Brooks-Corey parameters.
 .. admonition:: WRM-Brooks-Corey-spec
 
     * `"region`" ``[string]`` Region to which this applies
-    * `"Brooks Corey lambda [-]`" ``[double]`` Brooks Corey's lambda
-    * `"Brooks Corey saturated matric suction [Pa]`" ``[double]`` Brooks Corey
+    * `"Brooks-Corey lambda [-]`" ``[double]`` Brooks-Corey's lambda
+    * `"Brooks-Corey saturated matric suction [Pa]`" ``[double]`` Brooks-Corey
     saturated matric suction in Pa
 
     END
@@ -35,8 +35,8 @@ Example:
     <ParameterList name="moss" type="ParameterList">
       <Parameter name="region" type="string" value="moss" />
       <Parameter name="WRM type" type="string" value="Brooks-Corey" />
-      <Parameter name="Brooks Corey lambda [-]" type="double" value="0.5" />
-      <Parameter name="Brooks Corey saturated matric suction [Pa]" type="double" value="1.e3" />
+      <Parameter name="Brooks-Corey lambda [-]" type="double" value="0.5" />
+      <Parameter name="Brooks-Corey saturated matric suction [Pa]" type="double" value="1.e3" />
       <Parameter name="residual saturation [-]" type="double" value="0.0" />
       <Parameter name="smoothing interval width [saturation]" type="double" value=".05" />
     </ParameterList>

src/pks/flow/constitutive_relations/wrm/wrm_evaluator.hh

@@ -114,8 +114,7 @@ class WRMEvaluator : public EvaluatorSecondaryMonotypeCV {
   Key cap_pres_key_;
 
  private:
-  static Utils::RegisteredFactory<Evaluator, WRMEvaluator> factory_;
-  static Utils::RegisteredFactory<Evaluator, WRMEvaluator> factory2_;
+  static Utils::RegisteredFactory<Evaluator, WRMEvaluator> reg_;
 };
 
 } // namespace Flow

src/pks/flow/constitutive_relations/wrm/wrm_evaluator_reg.hh

@@ -13,8 +13,7 @@ namespace Amanzi {
 namespace Flow {
 
 // registry of method
-Utils::RegisteredFactory<Evaluator, WRMEvaluator> WRMEvaluator::factory_("WRM");
-Utils::RegisteredFactory<Evaluator, WRMEvaluator> WRMEvaluator::factory2_("wrm");
+Utils::RegisteredFactory<Evaluator, WRMEvaluator> WRMEvaluator::reg_("water retention model");
 
 } // namespace Flow
 } // namespace Amanzi

src/pks/flow/constitutive_relations/wrm/wrm_permafrost_evaluator_reg.hh

@@ -21,7 +21,7 @@ namespace Flow {
 
 // registry of method
 Utils::RegisteredFactory<Evaluator, WRMPermafrostEvaluator>
-  WRMPermafrostEvaluator::factory_("permafrost WRM");
+  WRMPermafrostEvaluator::factory_("water retention model with ice");
 
 } // namespace Flow
 } // namespace Amanzi

src/pks/surface_balance/constitutive_relations/land_cover/land_cover_evaluator_reg.hh

@@ -63,7 +63,7 @@ Utils::RegisteredFactory<Evaluator, PETPriestleyTaylorEvaluator>
   PETPriestleyTaylorEvaluator::reg_("potential evapotranspiration, Priestley-Taylor");
 
 Utils::RegisteredFactory<Evaluator, EvaporationDownregulationEvaluator>
-  EvaporationDownregulationEvaluator::reg_("evaporation downregulation via soil resistance");
+  EvaporationDownregulationEvaluator::reg_("evaporation downregulation, soil resistance");
 
 Utils::RegisteredFactory<Evaluator, PlantWiltingFactorEvaluator>
   PlantWiltingFactorEvaluator::reg_("plant wilting factor");
@@ -72,10 +72,10 @@ Utils::RegisteredFactory<Evaluator, RootingDepthFractionEvaluator>
   RootingDepthFractionEvaluator::reg_("root fraction");
 
 Utils::RegisteredFactory<Evaluator, TranspirationDistributionEvaluator>
-  TranspirationDistributionEvaluator::reg_("transpiration distribution via rooting depth");
+  TranspirationDistributionEvaluator::reg_("transpiration distribution, rooting depth");
 Utils::RegisteredFactory<Evaluator, TranspirationDistributionRelPermEvaluator>
   TranspirationDistributionRelPermEvaluator::reg_(
-    "transpiration distribution via relative permeability");
+    "transpiration distribution, relative permeability");
 
 Utils::RegisteredFactory<Evaluator, SnowMeltRateEvaluator>
   SnowMeltRateEvaluator::reg_("snow melt rate");