Merge pull request #17 from BrodiePearson/ocean/addADCMixing

Generalize pressure constants and make consistent with documentation

Author: vanroekel

src/core_ocean/adc_mixing/Registry_adc_mixing_fields_opts.xml

@@ -35,22 +35,34 @@
       description="Ko in RANS equations"
       possible_values="can modify to cerain extent, but highly recommend not altering"
       />
-		<nml_option name="config_adc_gamma1" type="real" default_value="0.33" units="unitless"
-			description="Buoyancy partitioning for pressure correlation term in RANS w2"
+		<nml_option name="config_adc_c_b_tracer" type="real" default_value="0.33" units="unitless"
+			description="Buoyancy partitioning for pressure correlation term in tracer flux budgets"
 			possible_values="0.33 and values close to it"
 		/>
-		<nml_option name="config_adc_beta5" type="real" default_value="0.5" units="unitless"
-			description="Buoyancy partitioning in wt equation for RANS"
-			possible_values="0.5 and values close to it"
-		/>
-		<nml_option name="config_adc_c1" type="real" default_value="4.0" units="unitless"
-			description="c_1 dissipation constant, value from Bougeault and Andre 1986"
-			possible_values="values near 4.0"
-		/>
-		<nml_option name="config_adc_c2" type="real" default_value="0.5" units="unitless"
-			description="c_2 dissipation constant, value from Bougeault and Andre 1986"
-			possible_values="values near -0.5"
+		<nml_option name="config_adc_c_b" type="real" default_value="0.5" units="unitless"
+			description="c_b buoyancy contribution to pressure correlation in w2 equation"
+			possible_values="values near 0.5"
       />
+		<nml_option name="config_adc_alpha_0" type="real" default_value="0.8" units="unitless"
+			description="alpha_0 first (TKE) rapid pressure coefficient for second-moment budgets"
+			possible_values="values near 0.8"
+	    />
+		<nml_option name="config_adc_alpha_1" type="real" default_value="0.984" units="unitless"
+			description="alpha_1 second (strain) rapid pressure coefficient"
+			possible_values="values near 1.0"
+		  />
+		<nml_option name="config_adc_alpha_2" type="real" default_value="0.568" units="unitless"
+			description="alpha_2 third (vorticity) rapid pressure coefficient"
+			possible_values="values near 0.6"
+		  />
+		<nml_option name="config_adc_alpha_tracer1" type="real" default_value="0.6" units="unitless"
+			description="alpha_scalar1 first rapid pressure coefficient in tracer flux budgets (Mironov 2001)"
+			possible_values="suggested values: 0.6 (Canuto 2001) or equal to alpha_scalar2, >0, <1 (Harcourt 2013)"
+			/>
+		<nml_option name="config_adc_alpha_tracer2" type="real" default_value="1.0" units="unitless"
+			description="alpha_scalar2 rapid pressure coefficient in tracer flux budgets (Mironov 2001)"
+			possible_values="suggested values: 1.0 (Canuto 2001) or equal to alpha_scalar2, >0, <1 (Harcourt 2013)"
+			/>
     <nml_option name="config_adc_c11" type="real" default_value="0.1" units="unitless"
       description="c_11 is the buoyancy contribution in the pressure correlation in w3 eqn"
       possible_values="values near 0.1"
@@ -67,22 +79,18 @@
       description="dissipation of w3 from LR01b"
       possible_values="values near 6"
       />
-    <nml_option name="config_adc_cTemp" type="real" default_value="2.0" units="unitless"
-      description="coefficient of temp/salinity dissipation, from Burchard et al 2012"
-      possible_values="values near 2"
-      />
-    <nml_option name="config_adc_cSalt" type="real" default_value="2.0" units="unitless"
-      description="same as cpt above, but for salinity"
+    <nml_option name="config_adc_c_slow" type="real" default_value="2.0" units="unitless"
+      description="c_slow coefficient for slow pressure term in velocity-based tendency equations"
       possible_values="values near 2"
       />
-    <nml_option name="config_adc_cVel" type="real" default_value="2.0" units="unitless"
-      description="same as cpt/cps above, but for momentum"
+    <nml_option name="config_adc_slow_w_factor" type="real" default_value="0.875" units="unitless"
+      description="c_slow_w_factor factor for adjusting slow pressure term in ww budget"
+      possible_values="values near 1"
+    />
+		<nml_option name="config_adc_c_slow_tracer" type="real" default_value="2.0" units="unitless"
+      description="c_slow_tracer coefficient for slow pressure term in tracer-based tendency equations"
       possible_values="values near 2"
       />
-    <nml_option name="config_adc_cwVel" type="real" default_value="1.75" units="unitless"
-      description="same as cVel above, but for w2 equation"
-      possible_values="values near 2"
-    />
     <nml_option name="config_adc_dissipation_constant" type="real" default_value = "5.0" units="unitless"
       description="factor multiplying the dissipation parameterization"
       possible_values="positive values less than 16"