Skip to content

Commit

Permalink
Incorporate Graduate Student Test (GST) into config.community.sh (#344)
Browse files Browse the repository at this point in the history
## DESCRIPTION OF CHANGES: 
* Modify config.community.sh to be very similar to the one in the release branch, which is being used for the Graduate Student Test (GST).
* Add the GST as another WE2E test.  It is called GST_release_public_v1.
* Modify the WE2E testing script (run_experiments.sh) so that it can handle both nemsio and grib2 format files from FV3GFS and GSMGFS.  This is needed for the GST test because that uses grib2 files.
* Add new file (testlist.release_public_v1.txt) containing a minimal list of WE2E tests that should be run for PRs to make sure that release features aren't broken.

## TESTS CONDUCTED: 
On Hera, ran the new WE2E test **GST_release_public_v1** as well as **grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2**.  Both succeeded.

## CONTRIBUTORS (optional): 
@jwolff-ncar
  • Loading branch information
gsketefian authored Oct 29, 2020
1 parent 1113dde commit 161ae6d
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 10 deletions.
23 changes: 23 additions & 0 deletions tests/baseline_configs/config.GST_release_public_v1.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
RUN_ENVIR="community"
PREEXISTING_DIR_METHOD="rename"

PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
FCST_LEN_HRS="48"
LBC_SPEC_INTVL_HRS="6"

DATE_FIRST_CYCL="20190615"
DATE_LAST_CYCL="20190615"
CYCL_HRS=( "00" )

EXTRN_MDL_NAME_ICS="FV3GFS"
EXTRN_MDL_NAME_LBCS="FV3GFS"
USE_USER_STAGED_EXTRN_FILES="TRUE"

FV3GFS_FILE_FMT_ICS="grib2"
FV3GFS_FILE_FMT_LBCS="grib2"

WTIME_RUN_FCST="01:00:00"
1 change: 1 addition & 0 deletions tests/baselines_list.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
DOT_OR_USCORE
GST_release_public_v1
community_ensemble_008mems
community_ensemble_2mems
get_extrn_files_from_hpss_FV3GFS_FV3GFS
Expand Down
14 changes: 11 additions & 3 deletions tests/run_experiments.sh
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,11 @@ machine (MACHINE):
EXTRN_MDL_SOURCE_BASEDIR_ICS="${extrn_mdl_source_basedir}/${EXTRN_MDL_NAME_ICS}"
if [ "${EXTRN_MDL_NAME_ICS}" = "FV3GFS" ] || \
[ "${EXTRN_MDL_NAME_ICS}" = "GSMGFS" ]; then
EXTRN_MDL_FILES_ICS=( "gfs.atmanl.nemsio" "gfs.sfcanl.nemsio" )
if [ "${FV3GFS_FILE_FMT_ICS}" = "nemsio" ]; then
EXTRN_MDL_FILES_ICS=( "gfs.atmanl.nemsio" "gfs.sfcanl.nemsio" )
elif [ "${FV3GFS_FILE_FMT_ICS}" = "grib2" ]; then
EXTRN_MDL_FILES_ICS=( "gfs.pgrb2.0p25.f000" )
fi
elif [ "${EXTRN_MDL_NAME_ICS}" = "HRRR" ] || \
[ "${EXTRN_MDL_NAME_ICS}" = "RAP" ]; then
EXTRN_MDL_FILES_ICS=( "${EXTRN_MDL_NAME_ICS,,}.out.for_f000" )
Expand All @@ -744,8 +748,12 @@ boundary conditions specification interval (LBC_SPEC_INTVL_HRS):
EXTRN_MDL_FILES_LBCS=( $( printf "%03d " "${lbc_spec_times_hrs[@]}" ) )
if [ "${EXTRN_MDL_NAME_LBCS}" = "FV3GFS" ] || \
[ "${EXTRN_MDL_NAME_LBCS}" = "GSMGFS" ]; then
EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/#/gfs.atmf}" )
EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/%/.nemsio}" )
if [ "${FV3GFS_FILE_FMT_ICS}" = "nemsio" ]; then
EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/#/gfs.atmf}" )
EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/%/.nemsio}" )
elif [ "${FV3GFS_FILE_FMT_ICS}" = "grib2" ]; then
EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/#/gfs.pgrb2.0p25.f}" )
fi
elif [ "${EXTRN_MDL_NAME_LBCS}" = "HRRR" ] || \
[ "${EXTRN_MDL_NAME_LBCS}" = "RAP" ]; then
EXTRN_MDL_FILES_LBCS=( "${EXTRN_MDL_FILES_LBCS[@]/#/${EXTRN_MDL_NAME_LBCS,,}.out.for_f}" )
Expand Down
7 changes: 7 additions & 0 deletions tests/testlist.release_public_v1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
GST_release_public_v1
grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
25 changes: 18 additions & 7 deletions ush/config.community.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,28 @@ PREEXISTING_DIR_METHOD="rename"
PREDEF_GRID_NAME="RRFS_CONUS_25km"
GRID_GEN_METHOD="ESGgrid"
QUILTING="TRUE"
CCPP_PHYS_SUITE="FV3_GFS_2017_gfdlmp"
FCST_LEN_HRS="6"

CCPP_PHYS_SUITE="FV3_GFS_v15p2"
FCST_LEN_HRS="48"
LBC_SPEC_INTVL_HRS="6"

DATE_FIRST_CYCL="20190701"
DATE_LAST_CYCL="20190701"
DATE_FIRST_CYCL="20190615"
DATE_LAST_CYCL="20190615"
CYCL_HRS=( "00" )

EXTRN_MDL_NAME_ICS="FV3GFS"
EXTRN_MDL_NAME_LBCS="FV3GFS"

RUN_TASK_MAKE_GRID="TRUE"
RUN_TASK_MAKE_OROG="TRUE"
RUN_TASK_MAKE_SFC_CLIMO="TRUE"
FV3GFS_FILE_FMT_ICS="grib2"
FV3GFS_FILE_FMT_LBCS="grib2"

WTIME_RUN_FCST="01:00:00"

# The following is specifically for Hera. It will have to be modified
# if on another platform, using other dates, other external models, etc.
USE_USER_STAGED_EXTRN_FILES="TRUE"
EXTRN_MDL_SOURCE_BASEDIR_ICS="/scratch2/BMC/det/UFS_SRW_app/v1p0/model_data/FV3GFS"
EXTRN_MDL_FILES_ICS=( "gfs.pgrb2.0p25.f000" )
EXTRN_MDL_SOURCE_BASEDIR_LBCS="/scratch2/BMC/det/UFS_SRW_app/v1p0/model_data/FV3GFS"
EXTRN_MDL_FILES_LBCS=( "gfs.pgrb2.0p25.f006" "gfs.pgrb2.0p25.f012" "gfs.pgrb2.0p25.f018" "gfs.pgrb2.0p25.f024" \
"gfs.pgrb2.0p25.f030" "gfs.pgrb2.0p25.f036" "gfs.pgrb2.0p25.f042" "gfs.pgrb2.0p25.f048" )

0 comments on commit 161ae6d

Please sign in to comment.