Updates for ZM round 4

cime_config/atm_in_paramgen.py

@@ -1495,11 +1495,21 @@ def write(self, output_path):
                 # Write all variables within that group (sorted alphabetically):
                 for var in sorted(self._data[nml_group], key=var_sort_key):
                     #Extract variable value(s):
-                    val = self._data[nml_group][var]["values"].strip()
+                    val = self._data[nml_group][var]["values"] #.strip()
 
-                    #If no value is set then move to the next variable:
+                    #Raise error if no value found:
                     if val is None:
-                        continue
+                        emsg = f"Namelist entry '{var}' is missing a "
+                        emsg += "valid/default 'value' element."
+                        raise AtmInParamGenError(emsg)
+                    else:
+                        #If value found then strip white space:
+                        val = val.strip()
+                    #End if
+
+                    #If no value is set then move to the next variable:
+                    #if val is None:
+                    #    continue
                     #End if
 
                     #Extract variable type:

src/data/physconst.meta

@@ -25,7 +25,7 @@
   dimensions = ()
   protected = True
 [ cpliq ]
-  standard_name = specific_heat_of_liquid_water_at_20c
+  standard_name = specific_heat_of_liquid_water_at_constant_pressure
   long_name = Specific heat of fresh H2O
   units = J kg-1 K-1
   type = real | kind = kind_phys

src/data/ref_pres.meta

@@ -35,7 +35,7 @@
   dimensions = ()
   protected = True
 [ trop_cloud_top_lev ]
-  standard_name = index_of_pressure_at_troposhere_cloud_top
+  standard_name = index_of_pressure_at_troposphere_cloud_top
   units = index
   type = integer
   dimensions = ()

src/data/registry.xml

@@ -491,5 +491,76 @@
       <long_name>graupel mass mixing ratio with respect to moist air plus all airborne condensates</long_name>
       <ic_file_input_names>GRAUQM cnst_GRAUQM</ic_file_input_names>
     </variable>
+
+    <!-- cam_in Variables -->
+    <variable local_name="landfrac"
+              standard_name="land_area_fraction"
+              units="fraction" type="real" kind="kind_phys"
+              allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <ic_file_input_names>landfrac cam_in_landfrac</ic_file_input_names>
+    </variable>
+
+    <!-- Zhang McFarlane (ZM) Variables -->
+    <!-- Note that no_deep_pbl defaults to false, but needs to be set to true for diag_TKE or UW schemes -->
+    <variable local_name="pblh"
+              standard_name="atmosphere_boundary_layer_thickness"
+              units="m" type="real" kind="kind_phys"
+              allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <ic_file_input_names>pblh pbuf_pblh</ic_file_input_names>
+    </variable>
+    <variable local_name="delt"
+              standard_name="half_timestep_for_physics"
+              units="s" type="real" kind="kind_phys">
+    </variable>
+    <variable local_name="tpert"
+              standard_name="convective_temperature_perturbation_due_to_pbl_eddies"
+              units="K" type="real" kind="kind_phys"
+              allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <ic_file_input_names>tpert pbuf_tpert</ic_file_input_names>
+    </variable>
+    <variable local_name="ql"
+              standard_name="in_cloud_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_due_to_deep_convection"
+              units="kg kg-1" type="real" kind="kind_phys"
+              allocatable="allocatable">
+      <dimensions>horizontal_dimension vertical_layer_dimension</dimensions>
+      <ic_file_input_names>ICWMRDP pbuf_ICWMRDP</ic_file_input_names>
+    </variable>
+    <variable local_name="cldfrc"
+              standard_name="cloud_area_fraction"
+              units="fraction" type="real" kind="kind_phys"
+              allocatable="allocatable">
+      <dimensions>horizontal_dimension vertical_layer_dimension</dimensions>
+      <initial_value>0.7_kind_phys</initial_value>
+      <ic_file_input_names>CLD pbuf_CLD</ic_file_input_names>
+    </variable>
+    <variable local_name="domomtran"
+              standard_name="flag_for_momentum_transport_by_zhang_mcfarlane_deep_convection_scheme"
+              units="flag" type="logical"
+              access="protected" >
+      <initial_value>.true.</initial_value>
+    </variable>
+    <variable local_name="il1g"
+              standard_name="index_of_first_column_of_gathered_deep_convection_arrays"
+              units="index" type="integer"
+              access="protected" >
+      <initial_value>1</initial_value>
+    </variable>
+    <variable local_name="dpdry"
+              standard_name="air_pressure_thickness_of_dry_air_for_deep_convection_for_gathered_convective_columns"
+              units="hPa" type="real" kind="kind_phys"
+              allocatable="allocatable">
+      <dimensions>horizontal_dimension vertical_layer_dimension</dimensions>
+    </variable>
+    <variable local_name="fracis"
+              standard_name="fraction_of_water_insoluble_convectively_transported_species"
+              units="fraction" type="real" kind="kind_phys"
+              allocatable="allocatable"
+              access="protected" >
+      <dimensions>horizontal_dimension vertical_layer_dimension number_of_ccpp_constituents</dimensions>
+      <initial_value>1</initial_value>
+    </variable>
   </file>
 </registry>

src/physics/utils/musica_ccpp_dependencies.F90

@@ -29,7 +29,6 @@ module musica_ccpp_dependencies
   real(kind_phys), allocatable, public, protected :: extraterrestrial_radiation_flux(:)
   real(kind_phys), allocatable, public, protected :: surface_albedo(:)
   real(kind_phys), allocatable, public, protected :: blackbody_temperature_at_surface(:)
-  real(kind_phys), allocatable, public, protected :: cloud_area_fraction(:,:)
 
   ! local parameters
   character(len=*), parameter :: module_name = '(musica_ccpp_dependencies)'
@@ -77,14 +76,9 @@ subroutine musica_ccpp_dependencies_init(horizontal_dimension, &
     call check_allocate(error_code, subroutine_name, &
                         'blackbody_temperature_at_surface(horizontal_dimension)', &
                         file=__FILE__, line=__LINE__)
-    allocate(cloud_area_fraction(horizontal_dimension, vertical_layer_dimension), stat=error_code)
-    call check_allocate(error_code, subroutine_name, &
-                        'cloud_area_fraction(horizontal_dimension, vertical_layer_dimension)', &
-                        file=__FILE__, line=__LINE__)
 
     surface_albedo(:) = 0.1_kind_phys
     blackbody_temperature_at_surface(:) = 292.3_kind_phys
-    cloud_area_fraction(:,:) = 0.7_kind_phys
     extraterrestrial_radiation_flux(:) = 1.0e14_kind_phys
     photolysis_wavelength_grid_interfaces = (/ &
       120.0e-9_kind_phys, &
@@ -194,4 +188,4 @@ subroutine musica_ccpp_dependencies_init(horizontal_dimension, &
 
   end subroutine musica_ccpp_dependencies_init
 
-end module musica_ccpp_dependencies
+end module musica_ccpp_dependencies

src/physics/utils/musica_ccpp_dependencies.meta

@@ -40,9 +40,3 @@
   units = K
   dimensions = (horizontal_dimension)
   protected = True
-[ cloud_area_fraction ]
-  standard_name = cloud_area_fraction
-  type = real | kind = kind_phys
-  units = fraction
-  dimensions = (horizontal_dimension,vertical_layer_dimension)
-  protected = True

src/physics/utils/phys_comp.F90

@@ -177,12 +177,13 @@ subroutine phys_init()
       use cam_thermo_formula,   only: cam_thermo_formula_init
       use physics_types,        only: allocate_physics_types_fields
       use cam_ccpp_cap,         only: cam_ccpp_physics_initialize
+      use cam_constituents,     only: num_advected
 
       call cam_thermo_init(columns_on_task, pver, pverp)
       call cam_thermo_formula_init()
 
       call allocate_physics_types_fields(columns_on_task, pver, pverp,        &
-           set_init_val_in=.true., reallocate_in=.false.)
+           num_advected, set_init_val_in=.true., reallocate_in=.false.)
       call cam_ccpp_physics_initialize(phys_suite_name)
       if (errcode /= 0) then
          call endrun('cam_ccpp_physics_initialize: '//trim(errmsg))

src/physics/utils/ppgrid.F90

@@ -0,0 +1,24 @@
+
+module ppgrid
+
+!-----------------------------------------------------------------------
+!
+! Purpose:  USED ONLY FOR BACKWARDS COMPATIBILITY WITH CAM!!!!
+!           PLEASE DELETE ONCE NO LONGER NEEDED BY "to_be_ccppized"
+!           PHYSICS SCHEMES!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!           Thanks!
+!-----------------------------------------------------------------------
+
+  use physics_grid,     only: pcols => columns_on_task
+  use vert_coord,       only: pver => pver, pverp => pverp !WILL NEED TO CHANGE THESE NAMES TO
+                                                           !SOMETHING ELSE IN CAM-SIMA!
+
+  implicit none
+  private
+  save
+
+  public pcols
+  public pver
+  public pverp
+
+end module ppgrid

src/utils/time_manager.F90

@@ -84,6 +84,8 @@ subroutine timemgr_init( &
    ref_tod, stop_ymd, stop_tod, curr_ymd, curr_tod,      &
    perpetual_run, perpetual_ymd, initial_run)
 
+   use phys_vars_init_check, only: mark_as_initialized
+
    ! Initialize the time manager.
 
    ! Arguments
@@ -152,6 +154,8 @@ subroutine timemgr_init( &
       call timemgr_print()
    end if
 
+   call mark_as_initialized('current_timestep_number')
+
 end subroutine timemgr_init
 
 !===========================================================================