First round of review changes

Author: cacraigucar

schemes/microp_aero/ccpp/hetfrz_classnuc_stub.F90

@@ -2,7 +2,7 @@
 !
 ! This scheme exists to read the use_hetfrz_classnuc namelist flag and expose it
 ! via its CCPP standard name so downstream schemes (e.g. nucleate_ice_ccpp,
-! eventually PUMAS) can see the flag. It performs no heterogeneous-freezing
+! PUMAS) can see the flag. It performs no heterogeneous-freezing
 ! computation -- the real hetfrz_classnuc_ccpp is not yet ported to CAM-SIMA.
 !
 ! Safe to use with use_hetfrz_classnuc=.true. for snapshot-testing flows where

schemes/microp_aero/ccpp/hetfrz_classnuc_stub_namelist.xml

@@ -87,7 +87,7 @@
     <desc>
       Switch to turn on heterogeneous freezing by classical nucleation theory.
       Currently a stub in CAM-SIMA: the flag is propagated to downstream schemes
-      (nucleate_ice_ccpp, eventually PUMAS) but no hetfrz computation is performed.
+      (nucleate_ice_ccpp, PUMAS) but no hetfrz computation is performed.
       Setting this to TRUE is supported for snapshot-testing flows where the flag
       must match CAM; a warning is emitted at init time.
       Default: FALSE; TRUE for CAM6 and CAM7.

schemes/pumas/micro_pumas_ccpp_dimensions_post.meta

@@ -159,7 +159,7 @@
   kind = pumas_r8
   intent = in
 [numice_tend]
-  standard_name = tendency_of_mass_number_concentration_of_ice_wrt_moist_air_and_condensed_water
+  standard_name = tendency_of_mass_number_concentration_of_cloud_ice_water_crystals_in_moist_air_and_condensed_water
   long_name = mass number concentration of cloud ice wrt moist air and condensed water
   units = kg-1 s-1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)

schemes/pumas/micro_pumas_ccpp_dimensions_pre.F90

@@ -1,8 +1,5 @@
 module micro_pumas_ccpp_dimensions_pre
 
-  use pumas_kinds,       only: pumas_r8=>kind_r8
-  use ccpp_kinds,        only: kind_phys
-
   implicit none
   private
 
@@ -31,7 +28,7 @@ subroutine micro_pumas_ccpp_dimensions_pre_init( ncol, nlev, nlevp1,
 
     !CCPP error handling:
     character(len=*), intent(out) :: errmsg
-    integer,            intent(out) :: errcode
+    integer,          intent(out) :: errcode
 
     !Initialize error message and error code:
     errmsg  = ''
@@ -46,9 +43,8 @@ end subroutine micro_pumas_ccpp_dimensions_pre_init
 
   !> \section arg_table_micro_pumas_ccpp_dimensions_pre_run Argument Table
   !! \htmlinclude micro_pumas_ccpp_dimensions_pre_run.html
-  subroutine micro_pumas_ccpp_dimensions_pre_run(ncol, nlev, nlevp1,                &
+  subroutine micro_pumas_ccpp_dimensions_pre_run(ncol,                &
                              trop_cloud_top_lev,                                     &
-                             micro_ncol, micro_nlev, micro_nlevp1, micro_dust_nbins,&
                              airT_in, pumas_airT, airq_in, pumas_airq,              &
                              cldliq_in, pumas_cldliq,                               &
                              cldice_in, pumas_cldice,                               &
@@ -82,19 +78,14 @@ subroutine micro_pumas_ccpp_dimensions_pre_run(ncol, nlev, nlevp1,
                              frzdep_in, pumas_frzdep,                               &
                              errmsg, errcode)
 
+    use pumas_kinds,       only: pumas_r8=>kind_r8
+    use ccpp_kinds,        only: kind_phys
+
     !Host model dimensions/parameters:
     integer,         intent(in) :: ncol
-    integer,         intent(in) :: nlev
-    integer,         intent(in) :: nlevp1
     integer,         intent(in) :: trop_cloud_top_lev  !Index of the top model level for which
                                                        !cloud physics is applied (1 to nlev)
 
-    !PUMAS dimensions/parameters:
-    integer,         intent(in) :: micro_ncol          !Number of horizontal microphysics columns (count)
-    integer,         intent(in) :: micro_nlev          !Number of microphysics vertical layers (count)
-    integer,         intent(in) :: micro_nlevp1        !Number of microphysics vertical interfaces (count)
-    integer,         intent(in) :: micro_dust_nbins    !Number of dust bins
-
     ! Air temperature (K)
     real(kind_phys), intent(in)  :: airT_in(:, :)
     real(pumas_r8), intent(out) :: pumas_airT(:, :)

schemes/pumas/micro_pumas_ccpp_dimensions_pre.meta

@@ -88,57 +88,12 @@
   dimensions = ()
   type = integer
   intent = in
-[nlev]
-  standard_name = vertical_layer_dimension
-  long_name = number of vertical levels
-  units = count
-  dimensions = ()
-  type = integer
-  intent = in
-[nlevp1]
-  standard_name = vertical_interface_dimension
-  long_name = number of vertical levels plus one
-  units = count
-  dimensions = ()
-  type = integer
-  intent = in
 [trop_cloud_top_lev]
   standard_name = vertical_layer_index_of_troposphere_cloud_physics_top
   units = index
   type = integer
   dimensions = ()
   intent = in
-[micro_ncol]
-  #Equivalent to "horizontal_loop_extent" unless subcolumns is enabled
-  standard_name = microphysics_horizontal_loop_extent
-  long_name = number of horizontal columns used by microphysics
-  units = count
-  dimensions = ()
-  type = integer
-  intent = in
-[micro_nlev]
-  #Vertical levels from surface to highest level with tropospheric clouds
-  standard_name = microphysics_vertical_layer_dimension
-  long_name = vertical layer dimension used by microphysics
-  units = count
-  dimensions = ()
-  type = integer
-  intent = in
-[micro_nlevp1]
-  #Vertical interfaces from surface to highest level with tropospheric clouds
-  standard_name = microphysics_vertical_interface_dimension
-  long_name = vertical interface dimension used by microphysics
-  units = count
-  dimensions = ()
-  type = integer
-  intent = in
-[micro_dust_nbins]
-  standard_name = dust_size_bin_dimension
-  long_name = number of dust bins
-  units = count
-  dimensions = ()
-  type = integer
-  intent = in
 [airT_in]
   standard_name = air_temperature
   long_name = air temperature of new state
@@ -228,7 +183,7 @@
   intent = out
 [numliq_in]
   standard_name = mass_number_concentration_of_cloud_liquid_water_droplets_in_moist_air_and_condensed_water
-  long_name = mass number concentration of cloud liquid wrt moist air and condensed water of new state
+  long_name = mass number concentration of cloud liquid mixing ratio wrt moist air and condensed water of new state
   units = kg-1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)
   type = real
@@ -244,7 +199,7 @@
   kind = pumas_r8
   intent = out
 [numice_in]
-  standard_name = mass_number_concentration_of_ice_wrt_moist_air_and_condensed_water
+  standard_name = mass_number_concentration_of_cloud_ice_water_crystals_in_moist_air_and_condensed_water
   long_name = mass number concentration of cloud ice wrt moist air and condensed water of new state
   units = kg-1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)

schemes/pumas/pumas_post_main.meta

@@ -79,7 +79,7 @@
   intent = in
   advected = true
 [numice]
-  standard_name = mass_number_concentration_of_ice_wrt_moist_air_and_condensed_water
+  standard_name = mass_number_concentration_of_cloud_ice_water_crystals_in_moist_air_and_condensed_water
   long_name = mass number concentration of cloud ice wrt moist air and condensed water
   units = kg-1
   dimensions = (horizontal_loop_extent, vertical_layer_dimension)

schemes/pumas/pumas_pre_main.F90

@@ -5,14 +5,11 @@
 
 module pumas_pre_main
 
-   use ccpp_kinds,        only: kind_phys
-
    implicit none
 
    private
 
    public :: pumas_pre_main_init
-   public :: pumas_pre_main_timestep_init
 
    contains
 
@@ -21,6 +18,8 @@ module pumas_pre_main
    subroutine pumas_pre_main_init(do_clubb_sgs, remove_supersat, spat_vary_accre_enhan_in, errmsg, errcode)
 
 
+     use ccpp_kinds,        only: kind_phys
+
      logical,            intent(in)  :: do_clubb_sgs
      real(kind_phys), dimension (:,:) , intent(out) :: spat_vary_accre_enhan_in
      logical,            intent(out) :: remove_supersat
@@ -42,17 +41,5 @@ subroutine pumas_pre_main_init(do_clubb_sgs, remove_supersat, spat_vary_accre_en
 
    end subroutine pumas_pre_main_init
 
-  !> \section arg_table_pumas_pre_main_timestep_init Argument Table
-  !! \htmlinclude pumas_pre_main_timestep_init.html
-   subroutine pumas_pre_main_timestep_init( errmsg, errcode)
-
-
-     character(len=*),   intent(out) :: errmsg
-     integer,            intent(out) :: errcode
-
-     errmsg = ' '
-     errcode = 0
-
-   end subroutine pumas_pre_main_timestep_init
-
 end module pumas_pre_main
+

schemes/pumas/pumas_pre_main.meta

@@ -42,24 +42,6 @@
   dimensions = ()
   intent = out
 
-[ccpp-arg-table]
-  name = pumas_pre_main_timestep_init
-  type = scheme
-[ errmsg ]
-  standard_name = ccpp_error_message
-  long_name = Error message for error handling in CCPP
-  units = none
-  type = character | kind = len=*
-  dimensions = ()
-  intent = out
-[ errcode ]
-  standard_name = ccpp_error_code
-  long_name = Error flag for error handling in CCPP
-  units = 1
-  type = integer
-  dimensions = ()
-  intent = out
-
 #####################
 #End of metadata file
 #####################

schemes/pumas/pumas_pre_main_namelist.xml

@@ -347,7 +347,7 @@
   <type>char*256</type>
   <desc>emulated stochastic collection filename for quantiles</desc>
   <values>
-    <value>"${SRCROOT}2/src/atmos_phys/schemes/pumas/pumas/KBARF_tau_kernel.dat"</value>
+    <value>"${SRCROOT}/src/atmos_phys/schemes/pumas/pumas/KBARF_tau_kernel.dat"</value>
   </values>
 </entry>
 
@@ -543,7 +543,6 @@
   <desc>droplet concentration constant for MG microphysics</desc>
   <values>
     <value>50000000.</value>
-    <value micro_mg_version="2">8</value>
   </values>
 </entry>
 

schemes/utilities/clamp_number_concentrations.F90

@@ -33,7 +33,7 @@ module clamp_number_concentrations
   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_cloud_ice_water_crystals_in_moist_air_and_condensed_water', &
                            'mass_number_concentration_of_snow_crystals_in_moist_air_and_condensed_water']
 
 contains