Skip to content

Fix else-statement bug in make_orog task; fix model_config bug for ensemble forecasts; remove obsolete physics suites; get WE2E tests to run on cheyenne #287

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.

Sign up for GitHub

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

Merged
gsketefian merged 11 commits into from
Sep 14, 2020
Merged

Fix else-statement bug in make_orog task; fix model_config bug for ensemble forecasts; remove obsolete physics suites; get WE2E tests to run on cheyenne #287

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
be54bde
Fix bugs that cause the workflow to fail for suites other than RRFS_v…
gsketefian Sep 10, 2020
c82d57f
Remove suites FV3_GSD_SAR_v1 and FV3_RRFS_v0; fix model_configure gen…
gsketefian Sep 10, 2020
425e6f5
Remove the FV3_GSD_SAR_v1 and FV3_RRFS_v0 suites from various scripts…
gsketefian Sep 10, 2020
050bec9
Fix indentation.
gsketefian Sep 10, 2020
9bee707
Rename function (and file) create_model_config_file(.sh) to create_mo…
gsketefian Sep 10, 2020
0a9e4e5
Specify the path on cheyenne where the orography statistics files nee…
gsketefian Sep 10, 2020
d93cf29
The WE2E test FV3_RRFS_v1beta should use the GSD_HRRR25km grid rather…
gsketefian Sep 11, 2020
f2a899c
Add a comment to the FV3_RRFS_v1beta test configuration file indicati…
gsketefian Sep 11, 2020
8dbe540
Preliminary set of changes to get the WE2E tests to run on cheyenne. …
Sep 14, 2020
70cf365
Additional mods after getting a look at the previous set of mods with…
gsketefian Sep 14, 2020
2f91cd6
Additional bug fixes after rerunning WE2E tests on hera.
gsketefian Sep 14, 2020
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
8 changes: 1 addition & 7 deletions scripts/exregional_make_ics.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ case "${CCPP_PHYS_SUITE}" in
"FV3_GFS_2017_gfdlmp" | "FV3_GFS_2017_gfdlmp_regional" )
phys_suite="GFS"
;;
"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" |"FV3_RRFS_v0" |"FV3_RRFS_v1beta")
"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_RRFS_v1beta")
phys_suite="GSD"
;;
"FV3_CPT_v0")
Expand Down Expand Up @@ -305,8 +305,6 @@ case "${EXTRN_MDL_NAME_ICS}" in
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
tracers="[\"sphum\",\"liq_wat\",\"o3mr\",\"ice_wat\",\"rainwat\",\"snowwat\",\"graupel\"]"
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
# For GSD physics, add three additional tracers (the ice, rain and water
Expand Down Expand Up @@ -371,8 +369,6 @@ HRRRX grib2 files created after about \"${cdate_min_HRRRX}\"..."
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_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_CPT_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
Expand Down Expand Up @@ -419,8 +415,6 @@ of external model (EXTRN_MDL_NAME_ICS) and physics suite (CCPP_PHYS_SUITE):
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_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
Expand Down
6 changes: 1 addition & 5 deletions scripts/exregional_make_lbcs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ case "${CCPP_PHYS_SUITE}" in
"FV3_GFS_2017_gfdlmp" | "FV3_GFS_2017_gfdlmp_regional")
phys_suite="GFS"
;;
"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_GSD_SAR_v1" | "FV3_RRFS_v0" | "FV3_RRFS_v1beta" )
"FV3_GSD_v0" | "FV3_GSD_SAR" | "FV3_RRFS_v1beta" )
phys_suite="GSD"
;;
"FV3_CPT_v0" )
Expand Down Expand Up @@ -288,8 +288,6 @@ case "${EXTRN_MDL_NAME_LBCS}" in
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
tracers="[\"sphum\",\"liq_wat\",\"o3mr\",\"ice_wat\",\"rainwat\",\"snowwat\",\"graupel\"]"
elif [ "${CCPP_PHYS_SUITE}" = "FV3_GSD_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GSD_SAR" ]; then
# For GSD physics, add three additional tracers (the ice, rain and water
Expand Down Expand Up @@ -340,8 +338,6 @@ and FV3GFS file type (FV3GFS_FILE_FMT_LBCS):
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_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v0" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v15p2" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_GFS_v16beta" ]; then
Expand Down
10 changes: 2 additions & 8 deletions scripts/exregional_make_orog.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,14 +355,8 @@ mv_vrfy "${raw_orog_fp_orig}" "${raw_orog_fp}"
#-----------------------------------------------------------------------
#
if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
cp_vrfy ${GWD_RRFS_v1beta_DIR}/* ${OROG_DIR}
else
print_err_msg_exit "\
The location from which to copy the files needed by the gravity wave drag
parameterization in the current physics suite (CCPP_PHYS_SUITE) has not
been specified for this machine (MACHINE):
CCPP_PHYS_SUITE = \"${CCPP_PHYS_SUITE}\"
MACHINE = \"${MACHINE}\""
cp_vrfy ${GWD_RRFS_v1beta_DIR}/*_ls*.nc ${OROG_DIR}
cp_vrfy ${GWD_RRFS_v1beta_DIR}/*_ss*.nc ${OROG_DIR}
fi

print_info_msg "$VERBOSE" "
Expand Down
29 changes: 11 additions & 18 deletions scripts/exregional_run_fcst.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
#-----------------------------------------------------------------------
#
. $USHDIR/create_model_config_file.sh
. $USHDIR/create_model_configure_file.sh
#
#-----------------------------------------------------------------------
#
Expand Down Expand Up @@ -252,11 +252,16 @@ Cannot create symlink because target does not exist:
target = \"$target\""
fi
#
# two files for drag_suite scheme
# this is only for the drag parameterization in the FV3_RRFS_v1beta physics suite
# If using the FV3_RRFS_v1beta physics suite, there are two files (that
# contain statistics of the orography) that are needed by the drag
# parameterization in that suite. Below, symlinks to these are created
# in the run directory. Note that the symlinks must have specific names
# that the FV3 model is hardcoded to recognize ("${CRES}_" and "halo0"
# must be stripped from the file names). We use those below.
#
if [ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_v1beta" ]; then
# Symlink to orographic statistics fields file with "${CRES}_" and "halo0" stripped from name.
# Symlink to orographic statistics fields file with "${CRES}_" and "halo0"
# stripped from name.
target="${FIXLAM}/${CRES}${DOT_OR_USCORE}oro_data_ls.tile${TILE_RGNL}.halo${NH0}.nc"
symlink="oro_data_ls.nc"
if [ -f "${target}" ]; then
Expand Down Expand Up @@ -437,22 +442,12 @@ 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_GSD_SAR_v1" ] || \
[ "${CCPP_PHYS_SUITE}" = "FV3_RRFS_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

fi
#-----------------------------------------------------------------------
#
# If running enemble forecasts, create links to the cycle-specific
# diagnostic tables file and model configuration file in the cycle
# directory. Note that these links should not be made if not running
# ensemble forecasts because in that case, the cycle directory is the
# run directory (and we would be creating a symlink with the name of a
# file that already exists).
#
#-----------------------------------------------------------------------
#
Expand All @@ -461,7 +456,7 @@ fi
#
#-----------------------------------------------------------------------
#
create_model_config_file \
create_model_configure_file \
cdate="$cdate" \
nthreads=${OMP_NUM_THREADS:-1} \
run_dir="${run_dir}" || print_err_msg_exit "\
Expand All @@ -472,7 +467,7 @@ cycle's (cdate) run directory (run_dir) failed:
#
#-----------------------------------------------------------------------
#
# If running enemble forecasts, create a link to the cycle-specific
# If running ensemble forecasts, create a link to the cycle-specific
# diagnostic tables file in the cycle directory. Note that this link
# should not be made if not running ensemble forecasts because in that
# case, the cycle directory is the run directory (and we would be creating
Expand All @@ -484,8 +479,6 @@ if [ "${DO_ENSEMBLE}" = "TRUE" ]; then
relative_or_null="--relative"
diag_table_fp="${cycle_dir}/${DIAG_TABLE_FN}"
ln_vrfy -sf ${relative_or_null} ${diag_table_fp} ${run_dir}
model_config_fp="${cycle_dir}/${MODEL_CONFIG_FN}"
ln_vrfy -sf ${relative_or_null} ${model_config_fp} ${run_dir}
fi
#
#-----------------------------------------------------------------------
Expand Down
6 changes: 5 additions & 1 deletion tests/baseline_configs/config.FV3_RRFS_v1beta.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,8 @@ EXTRN_MDL_NAME_LBCS="RAPX"
RUN_TASK_MAKE_GRID="TRUE"
RUN_TASK_MAKE_OROG="TRUE"
RUN_TASK_MAKE_SFC_CLIMO="TRUE"
GWD_RRFS_v1beta_BASEDIR="/scratch2/BMC/gsd-fv3-test/she/orog"

# On hera:
GWD_RRFS_v1beta_BASEDIR="/scratch2/BMC/det/FV3LAM_pregen/orog"
# On cheyenne:
#GWD_RRFS_v1beta_BASEDIR="/glade/p/ral/jntp/UFS_CAM/FV3LAM_pregen/orog/GSD_HRRR25km"
47 changes: 0 additions & 47 deletions tests/baseline_configs/config.regional_013.sh
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions tests/baseline_configs/config.regional_016.sh
View file
Open in desktop

This file was deleted.

Empty file modified tests/baseline_configs/config.user_download_extrn_files.sh
100755 → 100644
View file
Open in desktop
Empty file.
4 changes: 1 addition & 3 deletions tests/baselines_list.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
FV3_RRFS_v1beta
GSD_RAP13km
community_ensemble_008mems
community_ensemble_2mems
Expand All @@ -19,9 +20,6 @@ regional_009
regional_010
regional_011
regional_012
regional_013
regional_014
regional_015
regional_016
user_staged_extrn_files
user_download_extrn_files
Loading