Update namelist settings to CAM7 and fix inconsitent standard names

Author: cacraigucar

schemes/pumas/micro_pumas_ccpp_dimensions_post.meta

@@ -254,7 +254,7 @@
   kind = pumas_r8
   intent = in
 [graupice_tend]
-  standard_name = tendency_of_graupel_mixing_ratio_wrt_moist_air_and_condensed_water
+  standard_name = tendency_of_graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water
   long_name = tendency of graupel mixing ratio wrt moist air and condensed water
   units = kg kg-1 s-1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -263,7 +263,7 @@
   intent = out
   constituent = true
 [pumas_graupice_tend]
-  standard_name = tendency_of_pumas_graupel_mixing_ratio_wrt_moist_air_and_condensed_water
+  standard_name = tendency_of_pumas_graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water
   long_name = microphysics tendency of graupel mixing ratio wrt moist air and condensed water
   units = kg kg-1 s-1
   dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension)
@@ -544,15 +544,15 @@
   kind = pumas_r8
   intent = in
 [graupice_in_prec]
-  standard_name = graupel_mixing_ratio_wrt_moist_air_and_condensed_water_of_new_state_in_precipitating_fraction_of_gridcell
+  standard_name = graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water_of_new_state_in_precipitating_fraction_of_gridcell
   long_name = graupel mixing ratio wrt moist air and condensed water of new state in precipitating fraction of gridcell
   units = kg kg-1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = out
 [pumas_graupice_in_prec]
-  standard_name = pumas_graupel_mixing_ratio_wrt_moist_air_and_condensed_water_of_new_state_in_precipitating_fraction_of_gridcell
+  standard_name = pumas_graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water_of_new_state_in_precipitating_fraction_of_gridcell
   long_name = microphysics graupel mixing ratio wrt moist air and condensed water of new state in precipitating fraction of gridcell
   units = kg kg-1
   dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension)
@@ -1056,15 +1056,15 @@
   kind = pumas_r8
   intent = in
 [graupice]
-  standard_name = graupel_mixing_ratio_wrt_moist_air_and_condensed_water_of_new_state
+  standard_name = graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water_of_new_state
   long_name = graupel mixing ratio wrt moist air and condensed water of new state
   units = kg kg-1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = out
 [pumas_graupice]
-  standard_name = pumas_graupel_mixing_ratio_wrt_moist_air_and_condensed_water_of_new_state
+  standard_name = pumas_graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water_of_new_state
   long_name = microphysics graupel mixing ratio wrt moist air and condensed water of new state
   units = kg kg-1
   dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension)

schemes/pumas/micro_pumas_ccpp_dimensions_pre.meta

@@ -323,7 +323,7 @@
   kind = pumas_r8
   intent = out
 [graupice_in]
-  standard_name = graupel_mixing_ratio_wrt_moist_air_and_condensed_water
+  standard_name = graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water
   long_name = graupel mixing ratio wrt moist air and condensed water of new state
   units = kg kg-1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -332,7 +332,7 @@
   intent = in
   advected = true
 [pumas_graupice]
-  standard_name = pumas_graupel_mixing_ratio_wrt_moist_air_and_condensed_water
+  standard_name = pumas_graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water
   long_name = microphysics graupel mixing ratio wrt moist air and condensed water of new state
   units = kg kg-1
   dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension)

schemes/pumas/pumas_pre_main_namelist.xml

@@ -315,7 +315,7 @@
   <kind>kind_phys</kind>
   <desc>autoconversion size threshold for cloud ice to snow for MG microphysics</desc>
   <values>
-    <value>600.D-6</value>
+    <value>450.D-6</value>
   </values>
 </entry>
 
@@ -341,7 +341,7 @@
   <kind>kind_phys</kind>
   <desc>KK2000 accretion enhancement factor for MG microphysics</desc>
   <values>
-    <value>1.D0</value>
+    <value>0.731D0</value>
   </values>
 </entry>
 
@@ -380,7 +380,7 @@
   <kind>kind_phys</kind>
   <desc>KK2000 autonconverion lwp (qc) exponent in MG microphysics</desc>
   <values>
-    <value>2.47D0</value>
+    <value>2.37D0</value>
   </values>
 </entry>
 
@@ -406,7 +406,7 @@
   <kind>kind_phys</kind>
   <desc>scaling factor for cloud ice fall speed in MG microphysics</desc>
   <values>
-    <value>1.D0</value>
+    <value>1.39D0</value>
   </values>
 </entry>
 

test/test_suites/suite_pumas.xml

@@ -18,5 +18,6 @@
     <!-- Apply tendencies -->
     <scheme>apply_constituent_tendencies</scheme>
     <scheme>apply_heating_rate</scheme>
+    <scheme>clamp_number_concentrations</scheme>
   </group>
 </suite>