From 3d6e1df5203a6ef7f193e43af85ff21f3f8c88a6 Mon Sep 17 00:00:00 2001
From: gsketefian <31046882+gsketefian@users.noreply.github.com>
Date: Tue, 13 Oct 2020 15:31:52 -0600
Subject: [PATCH] Remove the USE_CCPP variable (#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 #196.
---
 scripts/exregional_make_ics.sh                | 75 +++++++++---------
 scripts/exregional_run_fcst.sh                | 15 ++--
 .../baseline_configs/config.DOT_OR_USCORE.sh  |  1 -
 .../config.community_ensemble_008mems.sh      |  1 -
 .../config.community_ensemble_2mems.sh        |  1 -
 ...get_extrn_files_from_hpss_FV3GFS_FV3GFS.sh |  1 -
 ...get_extrn_files_from_hpss_GSMGFS_GSMGFS.sh |  1 -
 ...ig.get_extrn_files_from_hpss_HRRRX_RAPX.sh |  1 -
 ...fig.get_extrn_files_from_hpss_RAPX_RAPX.sh |  1 -
 ....grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS.sh |  1 -
 ...g.grid_CONUS_3km_GFDLgrid_FV3GFS_FV3GFS.sh |  1 -
 .../config.grid_GSD_HRRR_AK_50km.sh           |  1 -
 .../config.grid_GSD_RAP13km.sh                |  1 -
 .../config.grid_RRFS_AK_13km_FV3GFS_FV3GFS.sh |  1 -
 .../config.grid_RRFS_AK_13km_RAPX_RAPX.sh     |  1 -
 .../config.grid_RRFS_AK_3km_FV3GFS_FV3GFS.sh  |  1 -
 .../config.grid_RRFS_AK_3km_RAPX_RAPX.sh      |  1 -
 ...nfig.grid_RRFS_CONUS_13km_FV3GFS_FV3GFS.sh |  1 -
 .../config.grid_RRFS_CONUS_13km_HRRRX_RAPX.sh |  1 -
 ...nfig.grid_RRFS_CONUS_25km_FV3GFS_FV3GFS.sh |  1 -
 .../config.grid_RRFS_CONUS_25km_HRRRX_RAPX.sh |  1 -
 ...onfig.grid_RRFS_CONUS_3km_FV3GFS_FV3GFS.sh |  1 -
 .../config.grid_RRFS_CONUS_3km_HRRRX_RAPX.sh  |  1 -
 ...ig.grid_RRFS_SUBCONUS_3km_FV3GFS_FV3GFS.sh |  1 -
 ...onfig.grid_RRFS_SUBCONUS_3km_HRRRX_RAPX.sh |  1 -
 .../config.nco_RRFS_CONUS_25km_HRRRX_RAPX.sh  |  1 -
 ...config.nco_RRFS_CONUS_3km_FV3GFS_FV3GFS.sh |  1 -
 .../config.nco_RRFS_CONUS_3km_HRRRX_RAPX.sh   |  1 -
 ...config.nco_RRFS_SUBCONUS_3km_HRRRX_RAPX.sh |  1 -
 tests/baseline_configs/config.nco_conus.sh    |  1 -
 .../baseline_configs/config.nco_conus_c96.sh  |  1 -
 ...co_conus_c96__suite_FV3_GFS_2017_gfdlmp.sh |  1 -
 tests/baseline_configs/config.nco_ensemble.sh |  1 -
 tests/baseline_configs/config.new_ESGgrid.sh  |  1 -
 tests/baseline_configs/config.new_GFDLgrid.sh |  1 -
 ..._USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh |  1 -
 ...d_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh |  1 -
 .../config.pregen_grid_orog_sfc_climo.sh      |  1 -
 tests/baseline_configs/config.regional_001.sh |  1 -
 tests/baseline_configs/config.regional_002.sh |  1 -
 .../config.suite_FV3_CPT_v0.sh                |  1 -
 .../config.suite_FV3_GFS_v15p2.sh             |  1 -
 .../config.suite_FV3_GFS_v16beta.sh           |  1 -
 .../config.suite_FV3_GSD_SAR.sh               |  1 -
 .../config.suite_FV3_GSD_v0.sh                |  1 -
 .../config.suite_FV3_RRFS_v1beta.sh           |  1 -
 .../config.user_download_extrn_files.sh       |  1 -
 tests/baselines_list.txt                      | 15 +++-
 ush/config.community.sh                       |  1 -
 ush/config.nco.sh                             |  1 -
 ush/config_defaults.sh                        | 32 ++------
 ush/generate_FV3LAM_wflow.sh                  | 39 +++-------
 ush/load_modules_run_task.sh                  | 14 ----
 ush/set_ozone_param.sh                        | 23 ++----
 ush/setup.sh                                  | 77 ++++---------------
 ush/valid_param_vals.sh                       |  2 -
 56 files changed, 93 insertions(+), 246 deletions(-)

diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh
index c89e458fe..04cc14652 100755
--- 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
index 75bf3588a..2168b985f 100755
--- 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
index 0b7c202c6..2f80f2bef 100644
--- 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
index a0a75a139..8a4068f44 100644
--- 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
index 00450be06..6032fca71 100644
--- 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
index c0d56966d..4acc7545e 100644
--- 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
index 1fbf5962c..904b899b0 100644
--- 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
index 5e786809a..a5ead9f08 100644
--- 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
index 393c8bc0b..1e32f3d03 100644
--- 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
index 0d0b0e736..d4e014c3c 100644
--- 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
index c41026343..39a39cb82 100644
--- 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
index b6a041892..204884dc1 100644
--- 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
index a565e3aae..f46a8f895 100644
--- 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
index 57da4b332..f15dbf8cf 100644
--- 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
index 630271e55..f3d92e400 100644
--- 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
index 02e9f97ee..02ebccb82 100644
--- 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
index c3cb06e8f..6bed997f4 100644
--- 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
index b30f7f457..81f6bbbe0 100644
--- 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
index e5e302975..fc450b49f 100644
--- 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
index 68511e5cb..35162b55d 100644
--- 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
index 4047e11fd..41cf5423c 100644
--- 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
index 15d70793c..171db735f 100644
--- 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
index 751172472..d46c101fd 100644
--- 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
index 68c1a1581..faf2d1992 100644
--- 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
index 85ed27905..75b19fee7 100644
--- 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
index 4e28b83af..c7248904e 100644
--- 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
index 0bd17e582..b58db4315 100644
--- 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
index 523194b41..d39e689d3 100644
--- 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
index 1bb952e72..f0cb3da8a 100644
--- 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
index 54549494e..dba68fead 100644
--- 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
index b0b82f1e0..5f3f58bca 100644
--- 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
index 5534594aa..2b1f1ec03 100644
--- 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
index 9464a4899..83c9188c7 100644
--- 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
index a62c4010d..45c315172 100644
--- 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
index d712cf2df..3cc8b620e 100644
--- 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/tests/baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh b/tests/baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh
index 134325580..f6bd589e4 100644
--- a/tests/baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_FALSE.sh
+++ b/tests/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"
diff --git a/tests/baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh b/tests/baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh
index 57f64337a..ee7e3144a 100644
--- a/tests/baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.sh
+++ b/tests/baseline_configs/config.new_GFDLgrid__GFDLgrid_USE_GFDLgrid_RES_IN_FILENAMES_eq_TRUE.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"
diff --git a/tests/baseline_configs/config.pregen_grid_orog_sfc_climo.sh b/tests/baseline_configs/config.pregen_grid_orog_sfc_climo.sh
index e08418601..225a60b3e 100644
--- a/tests/baseline_configs/config.pregen_grid_orog_sfc_climo.sh
+++ b/tests/baseline_configs/config.pregen_grid_orog_sfc_climo.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.regional_001.sh b/tests/baseline_configs/config.regional_001.sh
index 4f6c92ceb..d58093fb1 100644
--- a/tests/baseline_configs/config.regional_001.sh
+++ b/tests/baseline_configs/config.regional_001.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.regional_002.sh b/tests/baseline_configs/config.regional_002.sh
index 678975ecc..d93294178 100644
--- a/tests/baseline_configs/config.regional_002.sh
+++ b/tests/baseline_configs/config.regional_002.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.suite_FV3_CPT_v0.sh b/tests/baseline_configs/config.suite_FV3_CPT_v0.sh
index d23e50841..5746ca00f 100644
--- a/tests/baseline_configs/config.suite_FV3_CPT_v0.sh
+++ b/tests/baseline_configs/config.suite_FV3_CPT_v0.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_CPT_v0"
 
 FCST_LEN_HRS="06"
diff --git a/tests/baseline_configs/config.suite_FV3_GFS_v15p2.sh b/tests/baseline_configs/config.suite_FV3_GFS_v15p2.sh
index 692db567c..03b1d6e98 100644
--- a/tests/baseline_configs/config.suite_FV3_GFS_v15p2.sh
+++ b/tests/baseline_configs/config.suite_FV3_GFS_v15p2.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_v15p2"
 
 FCST_LEN_HRS="06"
diff --git a/tests/baseline_configs/config.suite_FV3_GFS_v16beta.sh b/tests/baseline_configs/config.suite_FV3_GFS_v16beta.sh
index 554b8a727..39a1217f1 100644
--- a/tests/baseline_configs/config.suite_FV3_GFS_v16beta.sh
+++ b/tests/baseline_configs/config.suite_FV3_GFS_v16beta.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"
diff --git a/tests/baseline_configs/config.suite_FV3_GSD_SAR.sh b/tests/baseline_configs/config.suite_FV3_GSD_SAR.sh
index 613d1b786..fa8783a80 100644
--- a/tests/baseline_configs/config.suite_FV3_GSD_SAR.sh
+++ b/tests/baseline_configs/config.suite_FV3_GSD_SAR.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.suite_FV3_GSD_v0.sh b/tests/baseline_configs/config.suite_FV3_GSD_v0.sh
index 9193847fe..e8bee0888 100644
--- a/tests/baseline_configs/config.suite_FV3_GSD_v0.sh
+++ b/tests/baseline_configs/config.suite_FV3_GSD_v0.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_v0"
 
 FCST_LEN_HRS="06"
diff --git a/tests/baseline_configs/config.suite_FV3_RRFS_v1beta.sh b/tests/baseline_configs/config.suite_FV3_RRFS_v1beta.sh
index 63b2d6404..90a1aad41 100644
--- a/tests/baseline_configs/config.suite_FV3_RRFS_v1beta.sh
+++ b/tests/baseline_configs/config.suite_FV3_RRFS_v1beta.sh
@@ -5,7 +5,6 @@ PREDEF_GRID_NAME="RRFS_CONUS_25km"
 GRID_GEN_METHOD="ESGgrid"
 QUILTING="TRUE"
 
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_RRFS_v1beta"
 
 FCST_LEN_HRS="06"
diff --git a/tests/baseline_configs/config.user_download_extrn_files.sh b/tests/baseline_configs/config.user_download_extrn_files.sh
index 3a1b32819..5c0049d08 100644
--- a/tests/baseline_configs/config.user_download_extrn_files.sh
+++ b/tests/baseline_configs/config.user_download_extrn_files.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/baselines_list.txt b/tests/baselines_list.txt
index 7946d6aa0..9c2297087 100644
--- a/tests/baselines_list.txt
+++ b/tests/baselines_list.txt
@@ -5,9 +5,22 @@ get_extrn_files_from_hpss_FV3GFS_FV3GFS
 get_extrn_files_from_hpss_GSMGFS_GSMGFS
 get_extrn_files_from_hpss_HRRRX_RAPX
 get_extrn_files_from_hpss_RAPX_RAPX
+grid_CONUS_25km_GFDLgrid_FV3GFS_FV3GFS
+grid_CONUS_3km_GFDLgrid_FV3GFS_FV3GFS
 grid_GSD_HRRR_AK_50km
-grid_RRFS_CONUS_13km
 grid_GSD_RAP13km
+grid_RRFS_AK_13km_FV3GFS_FV3GFS
+grid_RRFS_AK_13km_RAPX_RAPX
+grid_RRFS_AK_3km_FV3GFS_FV3GFS
+grid_RRFS_AK_3km_RAPX_RAPX
+grid_RRFS_CONUS_13km_FV3GFS_FV3GFS
+grid_RRFS_CONUS_13km_HRRRX_RAPX
+grid_RRFS_CONUS_25km_FV3GFS_FV3GFS
+grid_RRFS_CONUS_25km_HRRRX_RAPX
+grid_RRFS_CONUS_3km_FV3GFS_FV3GFS
+grid_RRFS_CONUS_3km_HRRRX_RAPX
+grid_RRFS_SUBCONUS_3km_FV3GFS_FV3GFS
+grid_RRFS_SUBCONUS_3km_HRRRX_RAPX
 nco_RRFS_CONUS_25km_HRRRX_RAPX
 nco_RRFS_CONUS_3km_FV3GFS_FV3GFS
 nco_RRFS_CONUS_3km_HRRRX_RAPX
diff --git a/ush/config.community.sh b/ush/config.community.sh
index 5c71641d8..1b5b9018a 100644
--- a/ush/config.community.sh
+++ b/ush/config.community.sh
@@ -14,7 +14,6 @@ PREEXISTING_DIR_METHOD="rename"
 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="6"
 LBC_SPEC_INTVL_HRS="6"
diff --git a/ush/config.nco.sh b/ush/config.nco.sh
index 6f176789c..fd8cd98ca 100644
--- a/ush/config.nco.sh
+++ b/ush/config.nco.sh
@@ -15,7 +15,6 @@ EMC_GRID_NAME="conus_c96"  # For now (20200130), this is maps to PREDEF_GRID_NAM
 GRID_GEN_METHOD="GFDLgrid"
 
 QUILTING="TRUE"
-USE_CCPP="TRUE"
 CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
 FCST_LEN_HRS="06"
 LBC_SPEC_INTVL_HRS="6"
diff --git a/ush/config_defaults.sh b/ush/config_defaults.sh
index a80bff088..e5fa2d4be 100644
--- a/ush/config_defaults.sh
+++ b/ush/config_defaults.sh
@@ -452,38 +452,16 @@ EXTRN_MDL_FILES_LBCS=( "LBCS_file1" "LBCS_file2" "..." )
 #
 # Set CCPP-associated parameters.  Definitions:
 #
-# USE_CCPP:
-# Flag controlling whether or not a CCPP-enabled version of the forecast
-# model will be run.  Note that the user is responsible for ensuring that
-# a CCPP-enabled forecast model executable is built and placed at the 
-# correct location (that is part of the build process).
-#
 # CCPP_PHYS_SUITE:
-# If USE_CCPP has been set to "TRUE", this variable defines the physics
-# suite that will run using CCPP.  The choice of physics suite determines
-# the forecast model's namelist file, the diagnostics table file, the 
-# field table file, and the XML physics suite definition file that are 
-# staged in the experiment directory or the cycle directories under it.
-# If USE_CCPP is set to "FALSE", the only physics suite that can be run
-# is the GFS.
-#
-# Note that it is up to the user to ensure that the CCPP-enabled forecast 
-# model executable is built with either the dynamic build (which can 
-# handle any CCPP physics package but is slower to run) or the static 
-# build with the correct physics package.  If using a static build, the 
-# forecast will fail if the physics package specified in the experiment's 
-# variable defintions file (GLOBAL_VAR_DEFNS_FN) is not the same as the
-# one that was used for the static build. 
-#
-# OZONE_PARAM_NO_CCPP:
-# The ozone parameterization to use if NOT using a CCPP-enabled forecast
-# model executable.
+# The physics suite that will run using CCPP (Common Community Physics
+# Package).  The choice of physics suite determines the forecast model's 
+# namelist file, the diagnostics table file, the field table file, and 
+# the XML physics suite definition file that are staged in the experiment 
+# directory or the cycle directories under it.
 #
 #-----------------------------------------------------------------------
 #
-USE_CCPP="FALSE"
 CCPP_PHYS_SUITE="FV3_GSD_v0"
-OZONE_PARAM_NO_CCPP="ozphys"
 #
 #-----------------------------------------------------------------------
 #
diff --git a/ush/generate_FV3LAM_wflow.sh b/ush/generate_FV3LAM_wflow.sh
index daad082e3..8ffe98768 100755
--- a/ush/generate_FV3LAM_wflow.sh
+++ b/ush/generate_FV3LAM_wflow.sh
@@ -510,33 +510,27 @@ print_info_msg "$VERBOSE" "
   ory..."
 cp_vrfy "${NEMS_CONFIG_TMPL_FP}" "${NEMS_CONFIG_FP}"
 #
-# If using CCPP ...
-#
-if [ "${USE_CCPP}" = "TRUE" ]; then
-#
 # Copy the CCPP physics suite definition file from its location in the
 # clone of the FV3 code repository to the experiment directory (EXPT-
 # DIR).
 #
-  print_info_msg "$VERBOSE" "
+print_info_msg "$VERBOSE" "
 Copying the CCPP physics suite definition XML file from its location in
 the forecast model directory sturcture to the experiment directory..."
-  cp_vrfy "${CCPP_PHYS_SUITE_IN_CCPP_FP}" "${CCPP_PHYS_SUITE_FP}"
+cp_vrfy "${CCPP_PHYS_SUITE_IN_CCPP_FP}" "${CCPP_PHYS_SUITE_FP}"
 #
-# If using the GSD_v0 or GSD_SAR physics suite, copy the fixed file con-
-# taining cloud condensation nuclei (CCN) data that is needed by the
-# Thompson microphysics parameterization to the experiment directory.
+# If using a physics suite that includes the Thompson microphysics 
+# parameterization, copy the fixed file containing cloud condensation 
+# nuclei (CCN) data that is needed by that parameterization.
 #
-  if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
-     [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
-    print_info_msg "$VERBOSE" "
+if [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
+   [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
+   [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
+  print_info_msg "$VERBOSE" "
 Copying the fixed file containing cloud condensation nuclei (CCN) data
 (needed by the Thompson microphysics parameterization) to the experiment
 directory..."
-    cp_vrfy "${FIXgsm}/CCN_ACTIVATE.BIN" "$EXPTDIR"
-  fi
-
+  cp_vrfy "${FIXgsm}/CCN_ACTIVATE.BIN" "$EXPTDIR"
 fi
 #
 #-----------------------------------------------------------------------
@@ -552,8 +546,7 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-if [ "${USE_CCPP}" = "TRUE" ] && \
-   [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ]; then
+if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ]; then
   mv_vrfy "${CCPP_PHYS_SUITE_FP}.tmp" "${CCPP_PHYS_SUITE_FP}"
 fi
 
@@ -588,15 +581,7 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-if [ "${USE_CCPP}" = "TRUE" ]; then
-  exec_fn="NEMS.exe"
-else
-    print_err_msg_exit "\
-Running this workflow without CCPP is not supported at this time.
-Please set USE_CCPP=TRUE in your config.sh file.
-"
-fi
-
+exec_fn="NEMS.exe"
 exec_fp="${SR_WX_APP_TOP_DIR}/bin/${exec_fn}"
 #Check for the old build location for fv3 executable
 if [ ! -f "${exec_fp}" ]; then
diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh
index 6e523ce3e..fb66658fd 100755
--- a/ush/load_modules_run_task.sh
+++ b/ush/load_modules_run_task.sh
@@ -172,21 +172,7 @@ modulefile_name="${task_name}"
 default_modules_dir="$HOMErrfs/modulefiles"
 default_modulefile_name="${machine}.default"
 use_default_modulefile=0
-# Dom says that a correct modules.fv3 file is generated by the forecast
-# model build regardless of whether building with or without CCPP.
-# Thus, we can have a symlink named "run_fcst" that points to that file
-# regardless of the setting of USE_CCPP.  But this requires that we then
-# test the non-CCPP-enabled version, which we've never done.  Leave this
-# for another time...
-#if [ "${task_name}" = "run_fcst" ]; then
-#  if [ "${USE_CCPP}" = "TRUE" ]; then
-#    modulefile_name=${modulefile_name}_ccpp
-#  else
-#    modulefile_name=${modulefile_name}_no_ccpp
-#  fi
-#fi
 #
-
 #-----------------------------------------------------------------------
 #
 # This comment needs to be updated:
diff --git a/ush/set_ozone_param.sh b/ush/set_ozone_param.sh
index b08b8bffa..df2dfa704 100644
--- a/ush/set_ozone_param.sh
+++ b/ush/set_ozone_param.sh
@@ -66,7 +66,6 @@ function set_ozone_param() {
 #
   local valid_args=( \
 "ccpp_phys_suite_fp" \
-"ozone_param_no_ccpp" \
 "output_varname_ozone_param" \
   )
   process_args valid_args "$@"
@@ -114,9 +113,8 @@ function set_ozone_param() {
 #     being used, then we set the variable ozone_param to the string 
 #     "ozphys".
 #
-# If the forecast model executable is CCPP-enabled, then we check the 
-# CCPP physics suite file to determine the parameterization being used.
-# If this file contains the line
+# We check the CCPP physics suite definition file (SDF) to determine the 
+# parameterization being used.  If this file contains the line
 #
 #   <scheme>ozphys_2015</scheme>
 #
@@ -125,21 +123,14 @@ function set_ozone_param() {
 #
 #   <scheme>ozphys</scheme>
 #
-# then the after-2015 parameterization is being used.  (The suite file 
-# should contain exactly one of these lines; not both or neither; check
-# for this.)  If the forecast model executable is not CCPP-enabled, then
-# the ozone parameterization must be specified by the user.  This user-
-# specified value is passed in as an argument (ozone_param_no_ccpp), and
-# ozone_param simply gets set to this value.
+# then the after-2015 parameterization is being used.  (The SDF should
+# contain exactly one of these lines; not both nor neither; we check for 
+# this.)  
 #
 #-----------------------------------------------------------------------
 #
-  if [ "${USE_CCPP}" = "FALSE" ]; then
-    ozone_param="${ozone_param_no_ccpp}"
-  else
-    regex_search="^[ ]*<scheme>(ozphys.*)<\/scheme>[ ]*$"
-    ozone_param=$( sed -r -n -e "s/${regex_search}/\1/p" "${ccpp_phys_suite_fp}" )
-  fi
+  regex_search="^[ ]*<scheme>(ozphys.*)<\/scheme>[ ]*$"
+  ozone_param=$( sed -r -n -e "s/${regex_search}/\1/p" "${ccpp_phys_suite_fp}" )
 
   if [ "${ozone_param}" = "ozphys_2015" ]; then
     fixgsm_ozone_fn="ozprdlos_2015_new_sbuvO3_tclm15_nuchem.f77"
diff --git a/ush/setup.sh b/ush/setup.sh
index d55b90d7d..9e13c6a19 100755
--- a/ush/setup.sh
+++ b/ush/setup.sh
@@ -538,38 +538,15 @@ check_var_valid_value \
 #
 #-----------------------------------------------------------------------
 #
-# Make sure USE_CCPP is set to a valid value.
+# Make sure CCPP_PHYS_SUITE is set to a valid value.
 #
 #-----------------------------------------------------------------------
 #
-check_var_valid_value "USE_CCPP" "valid_vals_USE_CCPP"
-#
-# Set USE_CCPP to either "TRUE" or "FALSE" so we don't have to consider
-# other valid values later on.
-#
-USE_CCPP=${USE_CCPP^^}
-if [ "$USE_CCPP" = "TRUE" ] || \
-   [ "$USE_CCPP" = "YES" ]; then
-  USE_CCPP="TRUE"
-elif [ "$USE_CCPP" = "FALSE" ] || \
-     [ "$USE_CCPP" = "NO" ]; then
-  USE_CCPP="FALSE"
-fi
-#
-#-----------------------------------------------------------------------
-#
-# If USE_CCPP is set to "TRUE", make sure CCPP_PHYS_SUITE is set to a 
-# valid value.
-#
-#-----------------------------------------------------------------------
-#
-if [ "${USE_CCPP}" = "TRUE" ] && [ ! -z ${CCPP_PHYS_SUITE} ]; then
-  err_msg="\
+err_msg="\
 The CCPP physics suite specified in CCPP_PHYS_SUITE is not supported:
   CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\""
-  check_var_valid_value \
-    "CCPP_PHYS_SUITE" "valid_vals_CCPP_PHYS_SUITE" "${err_msg}"
-fi
+check_var_valid_value \
+  "CCPP_PHYS_SUITE" "valid_vals_CCPP_PHYS_SUITE" "${err_msg}"
 #
 #-----------------------------------------------------------------------
 #
@@ -578,8 +555,7 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-if [ "${USE_CCPP}" = "TRUE" ] && \
-   [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ]; then
+if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp" ]; then
 
   if [ "${EXTRN_MDL_NAME_ICS}" != "GSMGFS" -a \
        "${EXTRN_MDL_NAME_ICS}" != "FV3GFS" ] || \
@@ -713,8 +689,7 @@ NUM_CYCLES="${#ALL_CDATES[@]}"
 #
 # UFS_WTHR_MDL_DIR:
 # Directory in which the (NEMS-enabled) FV3-LAM application is located.
-# This directory includes subdirectories for FV3, NEMS, and FMS.  If
-# USE_CCPP is set to "TRUE", it also includes a subdirectory for CCPP.
+# This directory includes subdirectories for FV3, NEMS, and FMS.
 #
 #-----------------------------------------------------------------------
 #
@@ -1220,10 +1195,7 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-dot_ccpp_phys_suite_or_null=""
-if [ "${USE_CCPP}" = "TRUE" ]; then
-  dot_ccpp_phys_suite_or_null=".${CCPP_PHYS_SUITE}"
-fi
+dot_ccpp_phys_suite_or_null=".${CCPP_PHYS_SUITE}"
 
 DATA_TABLE_TMPL_FN="${DATA_TABLE_FN}"
 DIAG_TABLE_TMPL_FN="${DIAG_TABLE_FN}${dot_ccpp_phys_suite_or_null}"
@@ -1261,20 +1233,14 @@ NEMS_CONFIG_TMPL_FP="${TEMPLATE_DIR}/${NEMS_CONFIG_TMPL_FN}"
 #
 #-----------------------------------------------------------------------
 #
-CCPP_PHYS_SUITE_FN=""
-CCPP_PHYS_SUITE_IN_CCPP_FP=""
-CCPP_PHYS_SUITE_FP=""
-
-if [ "${USE_CCPP}" = "TRUE" ]; then
-  CCPP_PHYS_SUITE_FN="suite_${CCPP_PHYS_SUITE}.xml"
-  CCPP_PHYS_SUITE_IN_CCPP_FP="${UFS_WTHR_MDL_DIR}/FV3/ccpp/suites/${CCPP_PHYS_SUITE_FN}"
-  CCPP_PHYS_SUITE_FP="${EXPTDIR}/${CCPP_PHYS_SUITE_FN}"
-  if [ ! -f "${CCPP_PHYS_SUITE_IN_CCPP_FP}" ]; then
-    print_err_msg_exit "\
+CCPP_PHYS_SUITE_FN="suite_${CCPP_PHYS_SUITE}.xml"
+CCPP_PHYS_SUITE_IN_CCPP_FP="${UFS_WTHR_MDL_DIR}/FV3/ccpp/suites/${CCPP_PHYS_SUITE_FN}"
+CCPP_PHYS_SUITE_FP="${EXPTDIR}/${CCPP_PHYS_SUITE_FN}"
+if [ ! -f "${CCPP_PHYS_SUITE_IN_CCPP_FP}" ]; then
+  print_err_msg_exit "\
 The CCPP suite definition file (CCPP_PHYS_SUITE_IN_CCPP_FP) does not exist
 in the local clone of the ufs-weather-model:
   CCPP_PHYS_SUITE_IN_CCPP_FP = \"${CCPP_PHYS_SUITE_IN_CCPP_FP}\""
-  fi
 fi
 #
 #-----------------------------------------------------------------------
@@ -2165,14 +2131,6 @@ NNODES_RUN_FCST=$(( (PE_MEMBER01 + PPN_RUN_FCST - 1)/PPN_RUN_FCST ))
 #
 #-----------------------------------------------------------------------
 #
-# Make sure that OZONE_PARAM_NO_CCPP is set to a valid value.
-#
-#-----------------------------------------------------------------------
-#
-check_var_valid_value "OZONE_PARAM_NO_CCPP" "valid_vals_OZONE_PARAM_NO_CCPP"
-#
-#-----------------------------------------------------------------------
-#
 # Create a new experiment directory.  Note that at this point we are 
 # guaranteed that there is no preexisting experiment directory.
 #
@@ -2208,8 +2166,7 @@ mkdir_vrfy -p "$EXPTDIR"
 #
 #-----------------------------------------------------------------------
 #
-if [ "${USE_CCPP}" = "TRUE" ] && \
-   [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ]; then
+if [ "${CCPP_PHYS_SUITE}" = "FV3_GFS_2017_gfdlmp_regional" ]; then
 
   CCPP_PHYS_SUITE_FP="${CCPP_PHYS_SUITE_FP}.tmp"
   cp_vrfy "${CCPP_PHYS_SUITE_IN_CCPP_FP}" "${CCPP_PHYS_SUITE_FP}"
@@ -2250,7 +2207,6 @@ in the suite definition file (CCPP_PHYS_SUITE_FP) failed:
 #
   set_ozone_param \
     ccpp_phys_suite_fp="${CCPP_PHYS_SUITE_FP}" \
-    ozone_param_no_ccpp="OZONE_PARAM_NO_CCPP" \
     output_varname_ozone_param="OZONE_PARAM"
 
   CCPP_PHYS_SUITE_FP="${CCPP_PHYS_SUITE_FP%.tmp}"
@@ -2271,7 +2227,6 @@ else
 #
 set_ozone_param \
   ccpp_phys_suite_fp="${CCPP_PHYS_SUITE_IN_CCPP_FP}" \
-  ozone_param_no_ccpp="OZONE_PARAM_NO_CCPP" \
   output_varname_ozone_param="OZONE_PARAM"
 
 
@@ -2769,10 +2724,8 @@ fi
 #
 #-----------------------------------------------------------------------
 #
-# Name of the ozone parameterization.  If USE_CCPP is set to "FALSE", 
-# then this will be equal to OZONE_PARAM_NO_CCPP.  If USE_CCPP is set to
-# "TRUE", then the value this gets set to depends on the CCPP physics
-# suite being used.
+# Name of the ozone parameterization.  The value this gets set to depends 
+# on the CCPP physics suite being used.
 #
 #-----------------------------------------------------------------------
 #
diff --git a/ush/valid_param_vals.sh b/ush/valid_param_vals.sh
index f7590e0dd..2aad5c51d 100644
--- a/ush/valid_param_vals.sh
+++ b/ush/valid_param_vals.sh
@@ -37,7 +37,6 @@ valid_vals_EMC_GRID_NAME=( \
 "RRFS_SUBCONUS_3km" \
 "GSD_RAP13km" \
 )
-valid_vals_USE_CCPP=("TRUE" "true" "YES" "yes" "FALSE" "false" "NO" "no")
 valid_vals_CCPP_PHYS_SUITE=( \
 "FV3_CPT_v0" \
 "FV3_GFS_2017_gfdlmp" \
@@ -48,7 +47,6 @@ valid_vals_CCPP_PHYS_SUITE=( \
 "FV3_GFS_v16beta" \
 "FV3_RRFS_v1beta" \
 ) 
-valid_vals_OZONE_PARAM_NO_CCPP=("ozphys_2015" "ozphys")
 valid_vals_GFDLgrid_RES=("48" "96" "192" "384" "768" "1152" "3072")
 valid_vals_EXTRN_MDL_NAME_ICS=("GSMGFS" "FV3GFS" "RAPX" "HRRRX" "NAM")
 valid_vals_EXTRN_MDL_NAME_LBCS=("GSMGFS" "FV3GFS" "RAPX" "HRRRX" "NAM")