Feature/update model namelist definitions (#377)

## DESCRIPTION OF CHANGES: Part of the effort described in ufs-community/ufs-srweather-app#71 to update the master branch of ufs-srweather-app to a functioning state. Updates include: - Cherry-picking 10911bcb from release branch in order to include the RRFS_v1alpha CCPP suite, as well as fixing some updated namelist settings in the ufs-weather-model - Fixing other namelist options that have been updated in ufs-weather-model This PR must be merged prior to ufs-community/ufs-srweather-app#71, then that PR updated to point to this PR's hash. ## TESTS CONDUCTED: The following end-to-end tests are now all successful on Hera: - DOT_OR_USCORE - GST_release_public_v1 - get_extrn_files_from_hpss_FV3GFS_FV3GFS - get_extrn_files_from_hpss_GSMGFS_GSMGFS - get_extrn_files_from_hpss_HRRR_RAP - get_extrn_files_from_hpss_RAP_RAP - grid_GSD_HRRR_AK_50km - grid_GSD_RAP13km - grid_RRFS_AK_13km_FV3GFS_FV3GFS - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR - grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR - grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta - new_ESGgrid - new_GFDLgrid - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE - regional_001 - regional_002 - suite_FV3_GFS_v15p2 - suite_FV3_GFS_v16beta - suite_FV3_GSD_SAR - suite_FV3_GSD_v0 - suite_FV3_RRFS_v1beta The following end-to-end tests were successful on Jet: - DOT_OR_USCORE - get_extrn_files_from_hpss_FV3GFS_FV3GFS - get_extrn_files_from_hpss_GSMGFS_GSMGFS - get_extrn_files_from_hpss_HRRR_RAP - get_extrn_files_from_hpss_RAP_RAP - grid_RRFS_AK_13km_FV3GFS_FV3GFS - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 - grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta - new_ESGgrid - new_GFDLgrid - new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE - regional_001 - regional_002 - suite_FV3_GFS_v16beta A few tests on Hera and Jet are still failing, but they are known errors and will be fixed at a later date. Cheyenne tests are failing but this is fixed by #378 ## ISSUE (optional): In conjunction with #378 and ufs-community/ufs-srweather-app#71, will solve ufs-community/ufs-srweather-app#57, fixing the master branch of ufs-srweather-app so everyone will be happy and nothing will be broken and we will all live happily ever after.
ufs-community · Dec 11, 2020 · c0596be · c0596be
1 parent 1cc0b82
commit c0596be
Show file tree

Hide file tree

Showing 13 changed files with 540 additions and 41 deletions.
diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -159,6 +159,7 @@ case "${CCPP_PHYS_SUITE}" in
 #
   "FV3_GSD_v0" | \
   "FV3_GSD_SAR" | \
+  "FV3_RRFS_v1alpha" | \
   "FV3_RRFS_v1beta" )
     if [ "${EXTRN_MDL_NAME_ICS}" = "RAP" ] || \
        [ "${EXTRN_MDL_NAME_ICS}" = "HRRR" ]; then
@@ -325,8 +326,9 @@ case "${EXTRN_MDL_NAME_ICS}" in
        [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
       thomp_mp_climo_file=""
     elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-         [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-         [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+         [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+         [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+         [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
       thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
     else
       print_err_msg_exit "\
@@ -357,8 +359,9 @@ case "${EXTRN_MDL_NAME_ICS}" in
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
     thomp_mp_climo_file=""
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
     thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   else
     print_err_msg_exit "\
@@ -410,11 +413,11 @@ case "${EXTRN_MDL_NAME_ICS}" in
 #
   if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
+     [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
     nsoill_out="4"
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
@@ -450,9 +453,10 @@ case "${EXTRN_MDL_NAME_ICS}" in
   if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
+     [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
     nsoill_out="4"
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
        [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
@@ -491,8 +495,9 @@ case "${EXTRN_MDL_NAME_ICS}" in
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
     thomp_mp_climo_file=""
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
-       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
     thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   fi
 

diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh
@@ -159,6 +159,7 @@ case "${CCPP_PHYS_SUITE}" in
 #
   "FV3_GSD_v0" | \
   "FV3_GSD_SAR" | \
+  "FV3_RRFS_v1alpha" | \
   "FV3_RRFS_v1beta" )
     if [ "${EXTRN_MDL_NAME_LBCS}" = "RAP" ] || \
        [ "${EXTRN_MDL_NAME_LBCS}" = "HRRR" ]; then
@@ -294,8 +295,9 @@ case "${EXTRN_MDL_NAME_LBCS}" in
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
      thomp_mp_climo_file=""
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
      thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   else
     print_err_msg_exit "\
@@ -319,8 +321,9 @@ case "${EXTRN_MDL_NAME_LBCS}" in
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
      thomp_mp_climo_file=""
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
      thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   else
     print_err_msg_exit "\
@@ -378,8 +381,9 @@ case "${EXTRN_MDL_NAME_LBCS}" in
      [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
      thomp_mp_climo_file=""
   elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1alpha" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
      thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   else
     print_err_msg_exit "\

diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
@@ -0,0 +1,18 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_CONUS_13km"
+GRID_GEN_METHOD="ESGgrid"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
+FCST_LEN_HRS="06"
+LBC_SPEC_INTVL_HRS="3"
+
+DATE_FIRST_CYCL="20200801"
+DATE_LAST_CYCL="20200801"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="HRRR"
+EXTRN_MDL_NAME_LBCS="RAP"
+USE_USER_STAGED_EXTRN_FILES="TRUE"
diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
@@ -0,0 +1,18 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_CONUS_25km"
+GRID_GEN_METHOD="ESGgrid"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
+FCST_LEN_HRS="06"
+LBC_SPEC_INTVL_HRS="3"
+
+DATE_FIRST_CYCL="20200801"
+DATE_LAST_CYCL="20200801"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="HRRR"
+EXTRN_MDL_NAME_LBCS="RAP"
+USE_USER_STAGED_EXTRN_FILES="TRUE"
diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha.sh
@@ -0,0 +1,18 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_CONUS_3km"
+GRID_GEN_METHOD="ESGgrid"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
+FCST_LEN_HRS="06"
+LBC_SPEC_INTVL_HRS="3"
+
+DATE_FIRST_CYCL="20200801"
+DATE_LAST_CYCL="20200801"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="HRRR"
+EXTRN_MDL_NAME_LBCS="RAP"
+USE_USER_STAGED_EXTRN_FILES="TRUE"
diff --git a/tests/baseline_configs/config.suite_FV3_RRFS_v1alpha.sh b/tests/baseline_configs/config.suite_FV3_RRFS_v1alpha.sh
@@ -0,0 +1,19 @@
+RUN_ENVIR="community"
+PREEXISTING_DIR_METHOD="rename"
+
+PREDEF_GRID_NAME="RRFS_CONUS_25km"
+GRID_GEN_METHOD="ESGgrid"
+QUILTING="TRUE"
+
+CCPP_PHYS_SUITE="FV3_RRFS_v1alpha"
+
+FCST_LEN_HRS="06"
+LBC_SPEC_INTVL_HRS="6"
+
+DATE_FIRST_CYCL="20190520"
+DATE_LAST_CYCL="20190520"
+CYCL_HRS=( "00" )
+
+EXTRN_MDL_NAME_ICS="HRRR"
+EXTRN_MDL_NAME_LBCS="RAP"
+USE_USER_STAGED_EXTRN_FILES="TRUE"
diff --git a/tests/baselines_list.txt b/tests/baselines_list.txt
@@ -17,14 +17,17 @@ grid_RRFS_AK_3km_RAP_RAP
 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
 grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
+grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
 grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
+grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
 grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16beta
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_GSD_SAR
+grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_RRFS_SUBCONUS_3km_FV3GFS_FV3GFS
 grid_RRFS_SUBCONUS_3km_HRRR_RAP
@@ -46,4 +49,5 @@ suite_FV3_GFS_v15p2
 suite_FV3_GFS_v16beta
 suite_FV3_GSD_SAR
 suite_FV3_GSD_v0
+suite_FV3_RRFS_v1alpha
 suite_FV3_RRFS_v1beta
diff --git a/tests/testlist.release_public_v1.txt b/tests/testlist.release_public_v1.txt
@@ -1,7 +1,7 @@
 GST_release_public_v1
-grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
-grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
 grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
-grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
+grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
+grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
+grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
 grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
-grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
+grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1alpha
diff --git a/ush/templates/FV3.input.yml b/ush/templates/FV3.input.yml
@@ -11,11 +11,14 @@
 
 
 FV3_GSD_v0:
+  gfs_physics_nml:
+    effr_in: True
 
 FV3_GSD_SAR: 
   gfs_physics_nml: &gsd_sar_phys
     cnvcld: false
     cnvgwd: false
+    effr_in: True
     imfdeepcnv: 0
     imfshalcnv: 0
     iopt_alb: 2
@@ -33,28 +36,29 @@ FV3_GSD_SAR:
     shal_cnv: false
     do_deep: False
 
-FV3_GSD_SAR_v1:
-  gfs_physics_nml:
-    <<: *gsd_sar_phys
-    lsm: 1
-    lsoil_lsm: 4
-
-FV3_RRFS_v0:
+FV3_RRFS_v1alpha:
   gfs_physics_nml:
     <<: *gsd_sar_phys
+    do_deep: False
+    do_mynnsfclay: False
+    effr_in: True
+    imfdeepcnv: -1
+    imfshalcnv: -1
     lsm: 2
     lsoil_lsm: 4
-    do_deep: False
+  atmos_model_nml:
+    fdiag: 3
 
 FV3_RRFS_v1beta:
   gfs_physics_nml:
     <<: *gsd_sar_phys
+    do_deep: False
+    do_mynnsfclay: True
+    effr_in: True
+    imfdeepcnv: -1
+    imfshalcnv: -1
     lsm: 2
     lsoil_lsm: 4
-    imfshalcnv: -1
-    IMFDEEPCNV: -1
-    DO_MYNNSFCLAY: true
-    do_deep: False
   atmos_model_nml:
     fdiag: 3
 
@@ -87,7 +91,8 @@ FV3_GFS_2017_gfdlmp:
     do_deep: False
     do_mynnedmf: !!python/none
     do_mynnsfclay: !!python/none
-    do_sfcperts: !!python/none
+    lndp_type: !!python/none
+    n_var_lndp: !!python/none
     effr_in: True
     fhcyc: 0.0
     fhlwr: 3600.0
@@ -167,7 +172,8 @@ FV3_GFS_2017_gfdlmp_regional:
   gfs_physics_nml:
     <<: *gfs_2017_gfdlmp_phys
     cplflx: False
-    do_sfcperts: False
+    lndp_type: 0
+    n_var_lndp: 0
     iopt_alb: 2
     iopt_btr: 1
     iopt_crs: 1
@@ -321,16 +327,16 @@ FV3_GFS_v16beta:
     cdmbgwd: [4.0, 0.15, 1.0, 1.0]
     do_myjpbl: !!python/none
     do_myjsfc: !!python/none
-    do_sfcperts: !!python/none
+    lndp_type: !!python/none
+    n_var_lndp: !!python/none
     do_tofd: True
     do_ysu: !!python/none
     effr_in: True
     hybedmf: False
     iaer: 5111
     icliq_sw: 2
     iopt_dveg: 1
-    iovr_lw: 3
-    iovr_sw: 3
+    iovr: 3
     isatmedmf: 1
     lgfdlmprad: True
     lheatstrg: True
@@ -389,7 +395,8 @@ FV3_CPT_v0:
     do_sb_physics: True
     do_mynnedmf: !!python/none
     do_mynnsfclay: !!python/none
-    do_sfcperts: !!python/none
+    lndp_type: !!python/none
+    n_var_lndp: !!python/none
     do_shoc: False
     effr_in: True
     fhcyc: 0.0
@@ -441,6 +448,5 @@ FV3_CPT_v0:
     xkzm_h: 0.5
     xkzm_m: 0.5
     xkzm_s: 1.0
-  nam_sfcperts: !!python/none
   surf_map_nml: !!python/none