Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/public v1 feature remove use ccpp #317

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 35 additions & 40 deletions scripts/exregional_make_ics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
15 changes: 5 additions & 10 deletions scripts/exregional_run_fcst.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
#-----------------------------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.DOT_OR_USCORE.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.grid_GSD_HRRR_AK_50km.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.grid_GSD_RAP13km.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.nco_conus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.nco_conus_c96.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.nco_ensemble.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.new_ESGgrid.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion tests/baseline_configs/config.new_GFDLgrid.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading