diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index c0f6d5db..00c77ae6 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -13,6 +13,7 @@
CAM cam5 physics:
CAM cam4 physics:
CAM simplified and non-versioned physics:
+ CAM with MPAS-like "convection-permitting" physics suite (EXPERIMENTAL)
+
+
+
+ --physics-suites convection_permitting --analytic-ic
build_component_cam
env_build.xml
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 30b3def5..9fea8ca7 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -275,6 +275,12 @@
+
+
+
+ MPASCP
+ 2000_CAM%MPASCP_SLND_SICE_SOCN_SROF_SGLC_SWAV
+
diff --git a/src/data/physconst.F90 b/src/data/physconst.F90
index 8a528342..c73989dc 100644
--- a/src/data/physconst.F90
+++ b/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)
diff --git a/src/data/physconst.meta b/src/data/physconst.meta
index aafe0880..72b6c823 100644
--- a/src/data/physconst.meta
+++ b/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 = ()
diff --git a/src/data/registry.xml b/src/data/registry.xml
index 5992cd32..9ac7ca92 100644
--- a/src/data/registry.xml
+++ b/src/data/registry.xml
@@ -1841,5 +1841,95 @@
units="flag" type="logical">
.false.
+
+
+
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+
+ horizontal_dimension
+ 0.0_kind_phys
+
+
+ horizontal_dimension
+ 273.15_kind_phys
+
diff --git a/src/dynamics/tests/namelist_definition_analy_ic.xml b/src/dynamics/tests/namelist_definition_analy_ic.xml
index eb9b39e9..7c0dd998 100644
--- a/src/dynamics/tests/namelist_definition_analy_ic.xml
+++ b/src/dynamics/tests/namelist_definition_analy_ic.xml
@@ -24,6 +24,9 @@
held_suarez_1994
moist_baroclinic_wave_dcmip2016
moist_baroclinic_wave_dcmip2016
+
+
+ moist_baroclinic_wave_dcmip2016