Merge remote-tracking branch 'haipeng/pumas_round3' into pumas_round3

Author: cacraigucar

schemes/pumas/micro_pumas_ccpp_dimensions_post.meta

@@ -480,7 +480,7 @@
   kind = pumas_r8
   intent = in
 [pgamrad]
-  standard_name = cloud_particle_size_distribution_shape_parameter
+  standard_name = size_distribution_shape_parameter_for_microphysics
   long_name = cloud particle size distribution shape (gamma) parameter
   units = 1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -496,7 +496,7 @@
   kind = pumas_r8
   intent = in
 [lamcrad]
-  standard_name = cloud_particle_size_distribution_slope_parameter
+  standard_name = slope_of_droplet_distribution_for_optics
   long_name = cloud particle size distribution slope (lambda) parameter
   units = 1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
@@ -528,8 +528,9 @@
   kind = pumas_r8
   intent = in
 [scaled_diam_snow]
-  standard_name = snow_scaled_diameter
+  standard_name = effective_diameter_of_stratiform_snow_particle_for_radiation
   long_name = snow scaled diameter
+  #rrtmgp takes um and the CCPP framework will convert from m
   units = m
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   type = real
@@ -576,7 +577,7 @@
   kind = pumas_r8
   intent = in
 [scaled_diam_graup]
-  standard_name = graupel_scaled_diameter
+  standard_name = effective_diameter_of_stratiform_cloud_graupel_particle_for_radiation
   long_name = graupel diameter
   units = m
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)

schemes/pumas/micro_pumas_ccpp_dimensions_pre.meta

@@ -127,7 +127,7 @@
   type = integer
   intent = in
 [micro_dust_nbins]
-  standard_name = dust_size_bins_dimension
+  standard_name = dust_size_bin_dimension
   long_name = number of dust bins
   units = count
   dimensions = ()
@@ -485,31 +485,31 @@
   kind = pumas_r8
   intent = out
 [naai_in]
-  standard_name = tendency_of_activated_ice_nuclei_mass_number_concentration
+  standard_name = tendency_of_mass_number_concentration_of_activated_ice_nuclei
   long_name = tendency of activated ice nuclei mass number concentration
   units = kg-1 s-1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = in
 [pumas_naai]
-  standard_name = tendency_of_pumas_activated_ice_nuclei_mass_number_concentration
+  standard_name = tendency_of_pumas_mass_number_concentration_of_activated_ice_nuclei
   long_name = microphysics tendency of activated ice nuclei mass number concentration
   units = kg-1 s-1
   dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension)
   type = real
   kind = pumas_r8
   intent = out
 [npccn_in]
-  standard_name = tendency_of_activated_cloud_condensation_nuclei_mass_number_concentration
+  standard_name = tendency_of_mass_number_concentration_of_activated_cloud_condensation_nuclei
   long_name = tendency of activated cloud condensation nuclei mass number concentration
   units = kg-1 s-1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = in
 [pumas_npccn]
-  standard_name = tendency_of_pumas_activated_cloud_condensation_nuclei_mass_number_concentration
+  standard_name = tendency_of_pumas_mass_number_concentration_of_activated_cloud_condensation_nuclei
   long_name = microphysics tendency of activated cloud condensation nuclei mass number concentration
   units = kg-1 s-1
   dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension)
@@ -520,31 +520,31 @@
   standard_name = dust_radii_by_size_bin
   long_name = dust bin radii
   units = m
-  dimensions = (horizontal_loop_extent, vertical_layer_dimension, dust_size_bins_dimension)
+  dimensions = (horizontal_loop_extent, vertical_layer_dimension, dust_size_bin_dimension)
   type = real
   kind = kind_phys
   intent = in
 [pumas_rndst]
   standard_name = pumas_dust_radii_by_size_bin
   long_name = microphysics dust bin radii
   units = m
-  dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension, dust_size_bins_dimension)
+  dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension, dust_size_bin_dimension)
   type = real
   kind = pumas_r8
   intent = out
 [nacon_in]
   standard_name = dust_number_concentration_by_size_bin_for_contact_freezing
   long_name = dust number concentration by size bin
   units = m-3
-  dimensions = (horizontal_loop_extent, vertical_layer_dimension, dust_size_bins_dimension)
+  dimensions = (horizontal_loop_extent, vertical_layer_dimension, dust_size_bin_dimension)
   type = real
   kind = kind_phys
   intent = in
 [pumas_nacon]
-  standard_name = pumas_dust_number_concentration_by_size_bin
+  standard_name = pumas_dust_number_concentration_by_size_bin_for_contact_freezing
   long_name = microphysics dust number concentration by size bin
   units = m-3
-  dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension, dust_size_bins_dimension)
+  dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension, dust_size_bin_dimension)
   type = real
   kind = pumas_r8
   intent = out