Remove the USE_CCPP variable (NOAA-EMC#308)

## DESCRIPTION OF CHANGES: This PR removes the USE_CCPP variable from all scripts and other files. The workflow only supports running the FV3 model with CCPP, so USE_CCPP is deprecated. ## TESTS CONDUCTED: Ran one WE2E test (regional_002) on hera. Succeeded. ## ISSUE (optional): This resolves Issue NOAA-EMC#196.
EricJames-NOAA · Oct 13, 2020 · 3d6e1df · 3d6e1df
1 parent a94a89e
commit 3d6e1df
Show file tree

Hide file tree

Showing 56 changed files with 93 additions and 246 deletions.
diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
@@ -352,21 +352,19 @@ case "${EXTRN_MDL_NAME_ICS}" in
   fn_grib2="${EXTRN_MDL_FNS[0]}"
   input_type="grib2"
 #
-# Set soil levels based on LSM in CCPP SDF (RUC-LSM or Noah/Noah MP)
+# Set soil levels based on LSM in CCPP SDF (RUC-LSM or Noah/Noah MP).
 #
-  if [ "${USE_CCPP}" = "TRUE" ]; then
-    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
-      nsoill_out="4"
-    elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-         [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
-      nsoill_out="9"
-    fi
+  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
+    nsoill_out="4"
+  elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+    nsoill_out="9"
   fi
 #
 # These geogrid files need to be moved to more permanent locations.
@@ -397,20 +395,18 @@ case "${EXTRN_MDL_NAME_ICS}" in
   fn_grib2="${EXTRN_MDL_FNS[0]}"
   input_type="grib2"
 #
-# Set soil levels based on CCPP SDF
+# Set soil levels based on CCPP SDF.
 #
-  if [ "${USE_CCPP}" = "TRUE" ]; then
-    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
-      nsoill_out="4"
-    elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-         [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
-      nsoill_out="9"
-    fi
+  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
+    nsoill_out="4"
+  elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
+       [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+    nsoill_out="9"
   fi
 #
 # These geogrid files need to be moved to more permanent locations.
@@ -441,20 +437,19 @@ case "${EXTRN_MDL_NAME_ICS}" in
   input_type="grib2"
 
 #
-# Use Thompson climatology for ice- and water-friendly aerosols if CCPP suite uses Thompson MP
+# Use Thompson climatology for ice- and water-friendly aerosols if CCPP 
+# suite uses Thompson MP
 #
-  if [ "${USE_CCPP}" = "TRUE" ]; then
-    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_GFS_v15p2" ] || \
-       [ "${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" ] || \
-      thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
-    fi
+  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_GFS_v15p2" ] || \
+     [ "${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" ] || \
+    thomp_mp_climo_file="${FIXam}/Thompson_MP_MONTHLY_CLIMO.nc"
   fi
 
   nsoill_out="4" #If the CCPP suites uses RUC-LSM, the scheme will interpolate from 4 to 9 soil levels.

diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh
@@ -437,16 +437,11 @@ else
   ln_vrfy -sf ${relative_or_null} ${FV3_NML_FP} ${run_dir}
 fi
 
-if [ "${USE_CCPP}" = "TRUE" ]; then
-
-  ln_vrfy -sf ${relative_or_null} ${CCPP_PHYS_SUITE_FP} ${run_dir} 
-
-  if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
-    ln_vrfy -sf ${relative_or_null} $EXPTDIR/CCN_ACTIVATE.BIN ${run_dir}
-  fi
-
+ln_vrfy -sf ${relative_or_null} ${CCPP_PHYS_SUITE_FP} ${run_dir} 
+if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
+   [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
+   [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+  ln_vrfy -sf ${relative_or_null} $EXPTDIR/CCN_ACTIVATE.BIN ${run_dir}
 fi
 #
 #-----------------------------------------------------------------------

diff --git a/tests/baseline_configs/config.DOT_OR_USCORE.sh b/tests/baseline_configs/config.DOT_OR_USCORE.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.community_ensemble_008mems.sh b/tests/baseline_configs/config.community_ensemble_008mems.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.community_ensemble_2mems.sh b/tests/baseline_configs/config.community_ensemble_2mems.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.get_extrn_files_from_hpss_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.get_extrn_files_from_hpss_FV3GFS_FV3GFS.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.get_extrn_files_from_hpss_GSMGFS_GSMGFS.sh b/tests/baseline_configs/config.get_extrn_files_from_hpss_GSMGFS_GSMGFS.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.get_extrn_files_from_hpss_HRRRX_RAPX.sh b/tests/baseline_configs/config.get_extrn_files_from_hpss_HRRRX_RAPX.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.get_extrn_files_from_hpss_RAPX_RAPX.sh b/tests/baseline_configs/config.get_extrn_files_from_hpss_RAPX_RAPX.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="CONUS_25km_GFDLgrid"
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_v16beta"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

diff --git a/tests/baseline_configs/config.grid_CONUS_3km_GFDLgrid_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_CONUS_3km_GFDLgrid_FV3GFS_FV3GFS.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="CONUS_3km_GFDLgrid"
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_v16beta"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

diff --git a/tests/baseline_configs/config.grid_GSD_HRRR_AK_50km.sh b/tests/baseline_configs/config.grid_GSD_HRRR_AK_50km.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="GSD_HRRR_AK_50km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.grid_GSD_RAP13km.sh b/tests/baseline_configs/config.grid_GSD_RAP13km.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="GSD_RAP13km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_v0"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.grid_RRFS_AK_13km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_RRFS_AK_13km_FV3GFS_FV3GFS.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_AK_13km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_v16beta"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.grid_RRFS_AK_13km_RAPX_RAPX.sh b/tests/baseline_configs/config.grid_RRFS_AK_13km_RAPX_RAPX.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_AK_13km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.grid_RRFS_AK_3km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_RRFS_AK_3km_FV3GFS_FV3GFS.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_AK_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_v16beta"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.grid_RRFS_AK_3km_RAPX_RAPX.sh b/tests/baseline_configs/config.grid_RRFS_AK_3km_RAPX_RAPX.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_AK_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_13km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_13km_FV3GFS_FV3GFS.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_13km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_v16beta"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_13km_HRRRX_RAPX.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_13km_HRRRX_RAPX.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_13km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_25km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_25km_FV3GFS_FV3GFS.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_v16beta"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_25km_HRRRX_RAPX.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_25km_HRRRX_RAPX.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_3km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_3km_FV3GFS_FV3GFS.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_v16beta"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

diff --git a/tests/baseline_configs/config.grid_RRFS_CONUS_3km_HRRRX_RAPX.sh b/tests/baseline_configs/config.grid_RRFS_CONUS_3km_HRRRX_RAPX.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

diff --git a/tests/baseline_configs/config.grid_RRFS_SUBCONUS_3km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.grid_RRFS_SUBCONUS_3km_FV3GFS_FV3GFS.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_SUBCONUS_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_v16beta"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

diff --git a/tests/baseline_configs/config.grid_RRFS_SUBCONUS_3km_HRRRX_RAPX.sh b/tests/baseline_configs/config.grid_RRFS_SUBCONUS_3km_HRRRX_RAPX.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_SUBCONUS_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="3"

diff --git a/tests/baseline_configs/config.nco_RRFS_CONUS_25km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_RRFS_CONUS_25km_HRRRX_RAPX.sh
@@ -5,7 +5,6 @@ EMC_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.nco_RRFS_CONUS_3km_FV3GFS_FV3GFS.sh b/tests/baseline_configs/config.nco_RRFS_CONUS_3km_FV3GFS_FV3GFS.sh
@@ -5,7 +5,6 @@ EMC_GRID_NAME="RRFS_CONUS_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.nco_RRFS_CONUS_3km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_RRFS_CONUS_3km_HRRRX_RAPX.sh
@@ -5,7 +5,6 @@ EMC_GRID_NAME="RRFS_CONUS_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.nco_RRFS_SUBCONUS_3km_HRRRX_RAPX.sh b/tests/baseline_configs/config.nco_RRFS_SUBCONUS_3km_HRRRX_RAPX.sh
@@ -5,7 +5,6 @@ EMC_GRID_NAME="RRFS_SUBCONUS_3km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GSD_SAR"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.nco_conus.sh b/tests/baseline_configs/config.nco_conus.sh
@@ -5,7 +5,6 @@ EMC_GRID_NAME="conus"  # This maps to PREDEF_GRID_NAME="EMC_CONUS_3km".
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.nco_conus_c96.sh b/tests/baseline_configs/config.nco_conus_c96.sh
@@ -5,7 +5,6 @@ EMC_GRID_NAME="conus_c96"  # This maps to PREDEF_GRID_NAME="EMC_CONUS_coarse".
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.nco_conus_c96__suite_FV3_GFS_2017_gfdlmp.sh b/tests/baseline_configs/config.nco_conus_c96__suite_FV3_GFS_2017_gfdlmp.sh
@@ -5,7 +5,6 @@ EMC_GRID_NAME="conus_c96"  # This maps to PREDEF_GRID_NAME="EMC_CONUS_coarse".
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.nco_ensemble.sh b/tests/baseline_configs/config.nco_ensemble.sh
@@ -5,7 +5,6 @@ EMC_GRID_NAME="conus_c96"  # This maps to PREDEF_GRID_NAME="EMC_CONUS_coarse".
 GRID_GEN_METHOD="GFDLgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.new_ESGgrid.sh b/tests/baseline_configs/config.new_ESGgrid.sh
@@ -35,7 +35,6 @@ WRTCMP_lat_lwr_left="22.41403305"
 WRTCMP_dx="${ESGgrid_DELX}"
 WRTCMP_dy="${ESGgrid_DELY}"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp_regional"
 
 FCST_LEN_HRS="06"

diff --git a/tests/baseline_configs/config.new_GFDLgrid.sh b/tests/baseline_configs/config.new_GFDLgrid.sh
@@ -52,7 +52,6 @@ if [ "$QUILTING" = "TRUE" ]; then
   WRTCMP_dlat="0.24"
 fi
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
 
 FCST_LEN_HRS="06"

diff --git a/.../baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh b/.../baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh
@@ -50,7 +50,6 @@ if [ "$QUILTING" = "TRUE" ]; then
   WRTCMP_dlat="0.24"
 fi
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
 
 FCST_LEN_HRS="06"