diff --git a/FV3 b/FV3 index 79c220772e..adf2a77b66 160000 --- a/FV3 +++ b/FV3 @@ -1 +1 @@ -Subproject commit 79c220772ea819f3557ca91de99c1b1dcf255feb +Subproject commit adf2a77b6680b123c4b16ce3acaf98acbdadcce5 diff --git a/tests/default_vars.sh b/tests/default_vars.sh index 7baa1aeba5..8f00b08ff4 100755 --- a/tests/default_vars.sh +++ b/tests/default_vars.sh @@ -922,6 +922,7 @@ export HWRF_SAMFDEEP=.false. export RAS=.false. export RANDOM_CLDS=.false. export CNVCLD=.true. +export PROGSIGMA=.false. # Aerosol convective scavenging export FSCAV_AERO="'*:0.0'" diff --git a/tests/opnReqTests/dcp.sh b/tests/opnReqTests/dcp.sh index 3a3ad9ef75..a3d26fec1a 100644 --- a/tests/opnReqTests/dcp.sh +++ b/tests/opnReqTests/dcp.sh @@ -7,8 +7,9 @@ if [[ $application == 'global' ]]; then INPES=$JNPES JNPES=$temp else - INPES=6 - JNPES=4 + temp=$INPES + INPES=$JNPES + JNPES=$temp fi elif [[ $application == 'regional' ]]; then if [[ $CI_TEST == 'true' ]]; then diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN index 135ca807bf..aa2a30f1c2 100644 --- a/tests/parm/control.nml.IN +++ b/tests/parm/control.nml.IN @@ -199,6 +199,7 @@ deflate_level=1 rrtmgp_nBandsSW = 14 doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT] doGP_lwscat = @[DOGP_LWSCAT] + progsigma = @[PROGSIGMA] / &gfdl_cloud_microphysics_nml diff --git a/tests/parm/field_table/field_table_gfsv16_progsigma b/tests/parm/field_table/field_table_gfsv16_progsigma new file mode 100644 index 0000000000..851726d387 --- /dev/null +++ b/tests/parm/field_table/field_table_gfsv16_progsigma @@ -0,0 +1,47 @@ +# added by FRE: sphum must be present in atmos +# specific humidity for moist runs + "TRACER", "atmos_mod", "sphum" + "longname", "specific humidity" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / +# prognostic cloud water mixing ratio + "TRACER", "atmos_mod", "liq_wat" + "longname", "cloud water mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / + "TRACER", "atmos_mod", "rainwat" + "longname", "rain mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / + "TRACER", "atmos_mod", "ice_wat" + "longname", "cloud ice mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / + "TRACER", "atmos_mod", "snowwat" + "longname", "snow mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / + "TRACER", "atmos_mod", "graupel" + "longname", "graupel mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / +# prognostic ozone mixing ratio tracer + "TRACER", "atmos_mod", "o3mr" + "longname", "ozone mixing ratio" + "units", "kg/kg" + "profile_type", "fixed", "surface_value=1.e30" / +# prognostic subgrid scale turbulent kinetic energy + "TRACER", "atmos_mod", "sgs_tke" + "longname", "subgrid scale turbulent kinetic energy" + "units", "m2/s2" + "profile_type", "fixed", "surface_value=0.0" / +# prognotsitc sigmab tracer + "TRACER", "atmos_mod", "sigmab" + "longname", "sigma fraction" + "units", "fraction" + "profile_type", "fixed", "surface_value=0.0" / +# non-prognostic cloud amount + "TRACER", "atmos_mod", "cld_amt" + "longname", "cloud amount" + "units", "1" + "profile_type", "fixed", "surface_value=0.0" /