Skip to content

Commit

Permalink
Remove old/obsolete suites (CPT_v0, GSD_v0, GSD_SAR) from workflow (#697
Browse files Browse the repository at this point in the history
)

## DOCUMENTATION:
This PR removes the `FV3_CPT_v0`, `FV3_GSD_v0`, and `FV3_GSD_SAR` suites from the workflow.  This consists of:
1. Removing these suites from ex-scripts, templates, and the set of valid values for the variable `CCPP_PHYS_SUITE`,
2. Removing the `diag_table_...` and `field_table_...` files for these suites.
3. Removing WE2E tests in the `grids_extrn_mdls_suites_community` category (which are tests to make sure that specific combinations of grids, external models, and suites work well together) that use these suites.
4. Modifying the three WE2E tests in the `wflow_features` category (`get_from_HPSS_ics_HRRR_lbcs_RAP`, `get_from_HPSS_ics_RAP_lbcs_RAP`, and `specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE`) that happen to use the `FV3_GSD_SAR` suite such that they now use the `FV3_HRRR` suite. (There are no such tests that use the `FV3_CPT_v0` and `FV3_GSD_v0` suites.)  Note that we don't remove these tests because their purpose is not to test the suite but to test fetching of files from HPSS (`get_from_HPSS_ics_HRRR_lbcs_RAP` and `get_from_HPSS_ics_RAP_lbcs_RAP`) and to test that the experiment variables `DT_ATMOS`, `LAYOUT_X`, `LAYOUT_Y`, and `BLOCKSIZE` can be correctly specified in the user's experiment configuration file (`specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE`
5. Updating comments in scripts that may refer to one of these three suites.

This PR also makes improvements to the `tests/get_expts_status.sh` script that is used to check the status of a set of experiments in a specified directory.

## DEPENDENCIES:
PR #[224](ufs-community/ufs-srweather-app#224) in the `ufs-srweather-app` repo.

## TESTS CONDUCTED:
Ran the following tests on Hera:
```
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_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
nco_grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_HRRR
get_from_HPSS_ics_HRRR_lbcs_RAP
get_from_HPSS_ics_RAP_lbcs_RAP
specify_DT_ATMOS_LAYOUT_XY_BLOCKSIZE
```
All succeeded.  Also, since the modifications to the `FV3.input.yml` file affect the `FV3_RRFS_v1alpha`, `FV3_RRFS_v1beta`, and `FV3_HRRR` suites, the `input.nml` files for these suites generated using the (original) `develop` branch were compared to the ones generated using this branch/PR, and all were found to be identical.

## ISSUE (optional): 
Resolves Issue #668.
  • Loading branch information
gsketefian authored Mar 15, 2022
1 parent b8bdb49 commit 6c98bb0
Show file tree
Hide file tree
Showing 30 changed files with 51 additions and 2,139 deletions.
4 changes: 1 addition & 3 deletions scripts/exregional_make_ics.sh
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,10 @@ case "${CCPP_PHYS_SUITE}" in
"FV3_GFS_2017_gfdlmp" | \
"FV3_GFS_2017_gfdlmp_regional" | \
"FV3_GFS_v16" | \
"FV3_GFS_v15p2" | "FV3_CPT_v0" )
"FV3_GFS_v15p2" )
varmap_file="GFSphys_var_map.txt"
;;
#
"FV3_GSD_v0" | \
"FV3_GSD_SAR" | \
"FV3_RRFS_v1alpha" | \
"FV3_RRFS_v1beta" | \
"FV3_GFS_v15_thompson_mynn_lam3km" | \
Expand Down
4 changes: 1 addition & 3 deletions scripts/exregional_make_lbcs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,10 @@ case "${CCPP_PHYS_SUITE}" in
"FV3_GFS_2017_gfdlmp" | \
"FV3_GFS_2017_gfdlmp_regional" | \
"FV3_GFS_v16" | \
"FV3_GFS_v15p2" | "FV3_CPT_v0" )
"FV3_GFS_v15p2" )
varmap_file="GFSphys_var_map.txt"
;;
#
"FV3_GSD_v0" | \
"FV3_GSD_SAR" | \
"FV3_RRFS_v1alpha" | \
"FV3_RRFS_v1beta" | \
"FV3_GFS_v15_thompson_mynn_lam3km" | \
Expand Down
38 changes: 24 additions & 14 deletions tests/WE2E/get_expts_status.sh
Original file line number Diff line number Diff line change
Expand Up @@ -309,40 +309,50 @@ check_for_preexist_dir_file "${expts_status_fp}" "rename"
#-----------------------------------------------------------------------
#
launch_wflow_fn="launch_FV3LAM_wflow.sh"
launch_wflow_log_fn="log.launch_FV3LAM_wflow"
num_tail_lines="40"

for (( i=0; i<=$((num_expts-1)); i++ )); do

expt_subdir="${expt_subdirs[$i]}"
print_info_msg "\
msg="\
$separator
Checking workflow status of experiment: \"${expt_subdir}\""
Checking workflow status of experiment \"${expt_subdir}\" ..."
print_info_msg "$msg"
#
# Change location to the experiment subdirectory, call the workflow launch
# script to update the launch log file, and capture the output from that
# call.
# script to update the workflow launch log file, and capture the output
# from that call.
#
cd_vrfy "${expt_subdir}"
launch_msg=$( "${launch_wflow_fn}" 2>&1 )
log_tail=$( tail -n ${num_tail_lines} log.launch_FV3LAM_wflow )
#
# Record the tail from the log file into the status report file.
#
print_info_msg "$msg" >> "${expts_status_fp}"
print_info_msg "${log_tail}" >> "${expts_status_fp}"
log_tail=$( tail -n ${num_tail_lines} "${launch_wflow_log_fn}" )
#
# Print the workflow status to the screen.
#
wflow_status=$( printf "${log_tail}" | grep "Workflow status:" )
# wflow_status="${wflow_status## }" # Not sure why this doesn't work to strip leading spaces.
wflow_status=$( printf "${wflow_status}" "%s" | sed -r 's|^[ ]*||g' )
msg="${wflow_status}"
print_info_msg "$msg"

wflow_status=$( printf "${wflow_status}" "%s" | sed -r 's|^[ ]*||g' ) # Remove leading spaces.
print_info_msg "${wflow_status}"
print_info_msg "\
$separator
"
#
# Combine message above with the last num_tail_lines lines from the workflow
# launch log file and place the result in the status report file.
#
msg=$msg"
${wflow_status}
The last ${num_tail_lines} lines of this experiment's workflow launch log file
(\"${launch_wflow_log_fn}\") are:
${log_tail}
"
print_info_msg "$msg" >> "${expts_status_fp}"
#
# Change location back to the experiments base directory.
#
cd_vrfy "${expts_basedir}"
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 6c98bb0

Please sign in to comment.