More robust fixes for the clamp and initialize; dimensions_pre unit fix

Author: Haipeng Lin

schemes/pumas/micro_pumas_ccpp_dimensions_pre.meta

@@ -581,17 +581,17 @@
   intent = out
 
 [effi_external_in]
-  standard_name = effective_radius_of_stratiform_cloud_ice_crystal
+  standard_name = effective_radius_of_stratiform_cloud_ice_crystal_from_external_microphysics
   long_name = effective radius of stratiform cloud ice particle from external microphysics
-  units = um
+  units = m
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   type = real
   kind = kind_phys
   intent = in
 [pumas_effi_external]
   standard_name = pumas_effective_radius_of_stratiform_cloud_ice_crystal_from_external_microphysics
   long_name = microphysics effective radius of stratiform cloud ice particle from external microphysics
-  units = um
+  units = m
   dimensions = (microphysics_horizontal_loop_extent, microphysics_vertical_layer_dimension)
   type = real
   kind = pumas_r8

schemes/utilities/clamp_number_concentrations.F90

@@ -28,11 +28,11 @@ module clamp_number_concentrations
   real(kind_phys), parameter :: qmax = 1.0e10_kind_phys  ! maximum number concentration [kg-1]
 
   ! Standard names for each species (order matches ix_ variables above)
-  character(len=128), parameter :: std_names(num_species) = &
-    (/'mass_number_concentration_of_cloud_liquid_water_droplets_in_moist_air_and_condensed_water', &
-      'mass_number_concentration_of_rain_drops_in_moist_air_and_condensed_water        ', &
-      'mass_number_concentration_of_ice_wrt_moist_air_and_condensed_water         ', &
-      'mass_number_concentration_of_snow_crystals_in_moist_air_and_condensed_water        '/)
+  character(len=*), parameter :: std_names(num_species) = &
+    [character(len=128) :: 'mass_number_concentration_of_cloud_liquid_water_droplets_in_moist_air_and_condensed_water', &
+                           'mass_number_concentration_of_rain_drops_in_moist_air_and_condensed_water', &
+                           'mass_number_concentration_of_ice_wrt_moist_air_and_condensed_water', &
+                           'mass_number_concentration_of_snow_crystals_in_moist_air_and_condensed_water']
 
 contains
 

test/test_schemes/initialize_constituents.F90

@@ -35,13 +35,13 @@ subroutine initialize_constituents_register(constituents, errmsg, errcode)
     character(len=512) :: alloc_err_msg
     character(len=256), allocatable :: constituent_names(:)
     character(len=256), allocatable :: const_diag_names(:)
-    character(len=65), parameter :: water_species_std_names(6) = &
-       ['water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water       ', &
-        'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', &
-        'rain_mixing_ratio_wrt_moist_air_and_condensed_water              ', &
-        'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water         ', &
-        'snow_mixing_ratio_wrt_moist_air_and_condensed_water              ', &
-        'graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water     ']
+    character(len=*), parameter :: water_species_std_names(*) = &
+       [character(len=128) :: 'water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water', &
+                              'cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water', &
+                              'rain_mixing_ratio_wrt_moist_air_and_condensed_water', &
+                              'cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', &
+                              'snow_mixing_ratio_wrt_moist_air_and_condensed_water', &
+                              'graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water']
 
     character(len=11), parameter :: const_file_names(6) = &
                                                 ['cnst_Q     ', &
@@ -56,12 +56,12 @@ subroutine initialize_constituents_register(constituents, errmsg, errcode)
                                         'cnst_NUMICE', &
                                         'cnst_NUMSNO', &
                                         'cnst_NUMGRA']
-    character(len=128), parameter :: water_species_number_std_names(5) = &
-       ['mass_number_concentration_of_cloud_liquid_water_droplets_in_moist_air_and_condensed_water', &
-        'mass_number_concentration_of_rain_drops_in_moist_air_and_condensed_water        ', &
-        'mass_number_concentration_of_ice_wrt_moist_air_and_condensed_water         ', &
-        'mass_number_concentration_of_snow_crystals_in_moist_air_and_condensed_water        ', &
-        'mass_number_concentration_of_graupel_particles_in_moist_air_and_condensed_water     ']
+    character(len=*), parameter :: water_species_number_std_names(*) = &
+       [character(len=128) :: 'mass_number_concentration_of_cloud_liquid_water_droplets_in_moist_air_and_condensed_water', &
+                              'mass_number_concentration_of_rain_drops_in_moist_air_and_condensed_water', &
+                              'mass_number_concentration_of_ice_wrt_moist_air_and_condensed_water', &
+                              'mass_number_concentration_of_snow_crystals_in_moist_air_and_condensed_water', &
+                              'mass_number_concentration_of_graupel_particles_in_moist_air_and_condensed_water']
 
     errcode = 0
     errmsg = ''