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

utest changes to go with gfs_rt updates #12

Merged
merged 2 commits into from
Jun 1, 2021
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
31 changes: 9 additions & 22 deletions tests/utest
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,14 @@ run_utests() {
RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( SHOUR + FHMAX/2 )))0000"
export RESTART_FILE_PREFIX

FHROT=12
WARM_START=.T.
NGGPS_IC=.F.
EXTERNAL_IC=.F.
MAKE_NH=.F.
MOUNTAIN=.T.
NA_INIT=0
NSTF_NAME=2,0,1,0,5
FDIAG=3

LIST_FILES="RESTART/coupler.res RESTART/fv_core.res.nc RESTART/fv_core.res.tile1.nc \
RESTART/fv_core.res.tile2.nc RESTART/fv_core.res.tile3.nc
Expand All @@ -252,36 +253,22 @@ run_utests() {
RESTART/sfc_data.tile2.nc RESTART/sfc_data.tile3.nc RESTART/sfc_data.tile4.nc \
RESTART/sfc_data.tile5.nc RESTART/sfc_data.tile6.nc"

comp_hr=$(printf "%03d" $(( SHOUR + FHMAX )))
if [[ $OUTPUT_GRID == "'cubed_sphere_grid'" ]]; then
LIST_FILES="phyf${comp_hr}.tile1.nc phyf${comp_hr}.tile2.nc phyf${comp_hr}.tile3.nc \
phyf${comp_hr}.tile4.nc phyf${comp_hr}.tile5.nc phyf${comp_hr}.tile6.nc \
dynf${comp_hr}.tile1.nc dynf${comp_hr}.tile2.nc dynf${comp_hr}.tile3.nc \
dynf${comp_hr}.tile4.nc dynf${comp_hr}.tile5.nc dynf${comp_hr}.tile6.nc ${LIST_FILES}"
elif [[ $OUTPUT_GRID == "'gaussian_grid'" ]]; then
if [[ $OUTPUT_FILE == "'netcdf'" || $OUTPUT_FILE == "'netcdf_esmf'" ]]; then
LIST_FILES="phyf${comp_hr}.nc dynf${comp_hr}.nc ${LIST_FILES}"
elif [[ $OUTPUT_FILE == "'nemsio'" ]]; then
LIST_FILES="phyf${comp_hr}.nemsio dynf${comp_hr}.nemsio ${LIST_FILES}"
else
error "Unrecognized OUTPUT_FILE ${OUTPUT_FILE}"
fi
else
error "Unrecognized OUTPUT_GRID ${OUTPUT_GRID}"
fi
comp_hr=$(printf "%03d" $FHMAX)
LIST_FILES="sfcf${comp_hr}.nc atmf${comp_hr}.nc GFSFLX.GrbF24 GFSPRS.GrbF24 ${LIST_FILES}"

cat <<-EOF >${RUNDIR_ROOT}/unit_test${RT_SUFFIX}.env
export UNIT_TEST=${UNIT_TEST}
export CI_TEST=${CI_TEST}
export RT_COMPILER=${RT_COMPILER}
export RESTART_FILE_PREFIX=${RESTART_FILE_PREFIX}
export FHROT=${FHROT}
export WARM_START=${WARM_START}
export NGGPS_IC=${NGGPS_IC}
export EXTERNAL_IC=${EXTERNAL_IC}
export MAKE_NH=${MAKE_NH}
export MOUNTAIN=${MOUNTAIN}
export NA_INIT=${NA_INIT}
export NSTF_NAME=${NSTF_NAME}
export FDIAG=${FDIAG}
export LIST_FILES="${LIST_FILES}"
export MPI_PROC_BIND="-bind-to user:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41"
EOF
Expand Down Expand Up @@ -312,7 +299,7 @@ run_utests() {
CREATE_BASELINE=true
BL_SUFFIX=_dbg_base
comp_nm=dbg
WLCLK=30
WLCLK=60
cat <<-EOF >${RUNDIR_ROOT}/unit_test${RT_SUFFIX}.env
export UNIT_TEST=${UNIT_TEST}
export CI_TEST=${CI_TEST}
Expand Down Expand Up @@ -719,8 +706,8 @@ fi
mkdir -p ${STMP}/${USER}
NEW_BASELINE=${STMP}/${USER}/FV3_UT/UNIT_TEST
RTPWD=${NEW_BASELINE}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210115}
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20201220/
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20210528}
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20210503/

rm -rf $NEW_BASELINE
mkdir -p $NEW_BASELINE
Expand Down
30 changes: 8 additions & 22 deletions tests/utest.bld
Original file line number Diff line number Diff line change
@@ -1,22 +1,8 @@
fv3_control | APP=ATM SUITES=FV3_GFS_2017
fv3_wrtGauss_netcdf_esmf | APP=ATM SUITES=FV3_GFS_2017
fv3_wrtGauss_netcdf | APP=ATM SUITES=FV3_GFS_2017
fv3_wrtGlatlon_netcdf | APP=ATM SUITES=FV3_GFS_2017
fv3_wrtGauss_nemsio | APP=ATM SUITES=FV3_GFS_2017
fv3_stochy | APP=ATM SUITES=FV3_GFS_2017
fv3_iau | APP=ATM SUITES=FV3_GFS_2017
fv3_ca | APP=ATM SUITES=FV3_GFS_2017
fv3_lheatstrg | APP=ATM SUITES=FV3_GFS_2017
fv3_gfdlmprad | APP=ATMW SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp
fv3_gfdlmprad_atmwav | APP=ATMW SUITES=FV3_GFS_2017,FV3_GFS_2017_gfdlmp
fv3_multigases | APP=ATM SUITES=FV3_GFS_2017_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
fv3_gfdlmp | APP=ATM SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
fv3_gfdlmprad_gwd | APP=ATM SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
fv3_gfdlmprad_noahmp | APP=ATM SUITES=FV3_GFS_2017_gfdlmp, FV3_GFS_2017_gfdlmp_noahmp
fv3_csawmg | APP=ATM SUITES=FV3_GFS_2017_csawmg
fv3_satmedmf | APP=ATM SUITES=FV3_GFS_2017_satmedmf
fv3_satmedmfq | APP=ATM SUITES=FV3_GFS_2017_satmedmfq
fv3_gfsv16_csawmg | APP=ATM SUITES=FV3_GFS_v16_csawmg
fv3_gfsv16_csawmgt | APP=ATM SUITES=FV3_GFS_v16_csawmg
fv3_gocart_clm | APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
fv3_gfs_v16_flake | APP=ATM SUITES=FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_noahmp,FV3_GFS_v16_flake
control | APP=ATM SUITES=FV3_GFS_v16
control_wrtGauss_netcdf_parallel | APP=ATM SUITES=FV3_GFS_v16
control_stochy | APP=ATM SUITES=FV3_GFS_v16
control_ca | APP=ATM SUITES=FV3_GFS_v16
control_lheatstrg | APP=ATM SUITES=FV3_GFS_v16
control_multigases | APP=ATM SUITES=FV3_GFS_v16_fv3wam 32BIT=Y MULTI_GASES=Y REPRO=Y
control_csawmg | APP=ATM SUITES=FV3_GFS_v16_csawmg
control_flake | APP=ATM SUITES=FV3_GFS_v16_flake