Add experimental support for MPAS "convection-permitting" physics suite

cime_config/config_component.xml

@@ -13,6 +13,7 @@
     <desc atm="CAM50[%CCTS][%CLB][%PORT][%RCO2][%SCAM][%SDYN][%WCSC][%WCTS]"              >CAM cam5 physics:</desc>
     <desc atm="CAM40[%PORT][%RCO2][%SCAM][%SDYN][%TMOZ][%WXIE][%WXIED][%WCMD]"                   >CAM cam4 physics:</desc>
     <desc atm="CAM[%ADIAB][%PHYSTEST][%DABIP04][%TJ16][%HS94][%KESSLER][%RCO2][%SPCAMS][%SPCAMCLBS][%SPCAMM][%SPCAMCLBM]">CAM simplified and non-versioned physics:</desc>
+    <desc atm="CAM%MMMCONVPERM">CAM with MMM "convection-permitting" physics suite (EXPERIMENTAL)</desc>
 
   <!--
     ===============
@@ -174,6 +175,10 @@
 
       <!-- PORT -->
 <!--      <value compset="%PORT">-offline_drv rad</value> -->
+
+      <!-- CAM with MMM "convection-permitting" physics suite (EXPERIMENTAL) -->
+      <!-- Temporarily using analytic initial condition during development -->
+      <value compset="CAM%MMMCONVPERM">--physics-suites convection_permitting --analytic-ic</value>
     </values>
     <group>build_component_cam</group>
     <file>env_build.xml</file>

cime_config/config_compsets.xml

@@ -275,6 +275,12 @@
 
   <!-- Untested simple model compsets -->
 
+  <!-- CAM with MMM "convection-permitting" physics suite (EXPERIMENTAL) -->
+  <!-- Temporarily using stub land model during development, but a real one will be required -->
+  <compset>
+    <alias>MMMCONVPERM</alias>
+    <lname>2000_CAM%MMMCONVPERM_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
+  </compset>
 
   <!-- ****************************** -->
   <!-- WACCM science supported compsets -->

src/data/physconst.F90

@@ -10,6 +10,7 @@ module physconst
    use shr_const_mod,  only: shr_const_mwwv
    use shr_const_mod,  only: shr_const_latice
    use shr_const_mod,  only: shr_const_latvap
+   use shr_const_mod,  only: shr_const_latsub
    use shr_const_mod,  only: shr_const_cpdair
    use shr_const_mod,  only: shr_const_rhofw
    use shr_const_mod,  only: shr_const_cpwv
@@ -52,6 +53,7 @@ module physconst
    real(kind_phys), public, parameter :: karman      = real(shr_const_karman, kind_phys)     ! Von Karman constant
    real(kind_phys), public, parameter :: latice      = real(shr_const_latice, kind_phys)     ! Latent heat of fusion (J kg-1)
    real(kind_phys), public, parameter :: latvap      = real(shr_const_latvap, kind_phys)     ! Latent heat of vaporization (J kg-1)
+   real(kind_phys), public, parameter :: latsub      = real(shr_const_latsub, kind_phys)     ! Latent heat of sublimation (J kg-1)
    real(kind_phys), public, parameter :: pi          = real(shr_const_pi, kind_phys)         ! 3.14...
    real(kind_phys), public, protected :: pstd        = real(shr_const_pstd, kind_phys)       ! Standard pressure (Pascals)
    real(kind_phys), public, protected :: pref        = 1.0e5_kind_phys                       ! Reference surface pressure (Pascals)

src/data/physconst.meta

@@ -55,6 +55,12 @@
   type = real | kind = kind_phys
   dimensions = ()
   protected = True
+[ latsub ]
+  standard_name = latent_heat_of_sublimation_of_water_at_0c
+  units = J kg-1
+  type = real | kind = kind_phys
+  dimensions = ()
+  protected = True
 [ pi ]
   standard_name = pi_constant
   units = 1
@@ -280,7 +286,7 @@
   dimensions = ()
   protected = True
 [ cpvir ]
-  standard_name = ratio_of_specific_heat_of_water_vapor_to_specific_heat_of_dry_air
+  standard_name = ratio_of_specific_heat_of_water_vapor_to_specific_heat_of_dry_air_minus_one
   units = 1
   type = real | kind = kind_phys
   dimensions = ()

src/data/registry.xml

@@ -1841,5 +1841,93 @@
 	    units="flag" type="logical">
       <initial_value>.false.</initial_value>
     </variable>
+
+    <!-- CAM with MMM "convection-permitting" physics suite (EXPERIMENTAL) -->
+    <!-- Variables for "bl_gwdo" physics scheme -->
+    <variable local_name="var"
+              standard_name="standard_deviation_of_subgrid_orography"
+              units="m" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <variable local_name="oc1"
+              standard_name="convexity_of_subgrid_orography"
+              units="1" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <variable local_name="oa2d1"
+              standard_name="eastward_asymmetry_of_subgrid_orography"
+              units="1" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <variable local_name="oa2d2"
+              standard_name="northward_asymmetry_of_subgrid_orography"
+              units="1" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <variable local_name="oa2d3"
+              standard_name="northeastward_asymmetry_of_subgrid_orography"
+              units="1" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <variable local_name="oa2d4"
+              standard_name="southeastward_asymmetry_of_subgrid_orography"
+              units="1" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <variable local_name="ol2d1"
+              standard_name="eastward_dimensionless_effective_length_of_subgrid_orography"
+              units="1" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <variable local_name="ol2d2"
+              standard_name="northward_dimensionless_effective_length_of_subgrid_orography"
+              units="1" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <variable local_name="ol2d3"
+              standard_name="northeastward_dimensionless_effective_length_of_subgrid_orography"
+              units="1" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <variable local_name="ol2d4"
+              standard_name="southeastward_dimensionless_effective_length_of_subgrid_orography"
+              units="1" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <!-- Variables for "sf_mynn" physics scheme -->
+    <variable local_name="mavail"
+              standard_name="surface_moisture_availability"
+              units="1" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>0.0_kind_phys</initial_value>
+    </variable>
+    <variable local_name="tsk"
+              standard_name="skin_temperature_at_surface"
+              units="K" type="real" kind="kind_phys"
+              access="public" allocatable="allocatable">
+      <dimensions>horizontal_dimension</dimensions>
+      <initial_value>273.15_kind_phys</initial_value>
+    </variable>
   </file>
 </registry>

src/dynamics/tests/namelist_definition_analy_ic.xml

@@ -24,6 +24,9 @@
       <value phys_suite="held_suarez_1994">held_suarez_1994</value>
       <value phys_suite="kessler">moist_baroclinic_wave_dcmip2016</value>
       <value phys_suite="tj2016">moist_baroclinic_wave_dcmip2016</value>
+      <!-- CAM with MMM "convection-permitting" physics suite (EXPERIMENTAL) -->
+      <!-- Temporarily using analytic initial condition during development -->
+      <value phys_suite="convection_permitting">moist_baroclinic_wave_dcmip2016</value>
     </values>
   </entry>