Skip to content

Enable rt.sh dependency relations (#112) #42

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
DeniseWorthen merged 1 commit into from
Jun 25, 2020
Merged

Enable rt.sh dependency relations (#112) #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19,054 changes: 9,527 additions & 9,527 deletions tests/Compile_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fi
readonly PATHTR=$1
readonly BUILD_TARGET=$2
readonly MAKE_OPT=${3:-}
readonly BUILD_NAME=fv3_mom6_cice${4:+_$4}
readonly BUILD_NAME=fcst${4:+_$4}

readonly clean_before=${5:-YES}
readonly clean_after=${6:-YES}
Expand Down
59 changes: 0 additions & 59 deletions tests/fv3_conf/cpld_fv3_mom6_cice_atm_flux_restart_run.IN
View file
Open in desktop

This file was deleted.

55 changes: 40 additions & 15 deletions tests/fv3_conf/cpld_fv3_mom6_cice_atm_flux_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,46 @@ cp @[RTPWD]/MOM6_FIX/@[OCNRES]/* ./INPUT
cp @[RTPWD]/CICE_FIX/@[OCNRES]/grid_cice_NEMS_mx025.nc .
cp @[RTPWD]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx025.nc .

# ICs
cp @[RTPWD]/${FV3_DIR}/INPUT/sfc_data*.nc ./INPUT
cp @[RTPWD]/${FV3_DIR}/INPUT/gfs_data*.nc ./INPUT
cp @[RTPWD]/MOM6_IC/MOM*.nc ./INPUT
cp @[RTPWD]/CICE_IC/cice5_model_0.25.*.nc ./cice5_model.res.nc

# Restart from coldstart, NEMS or CMEPS
if [[ ! $MED_restart_data == '' ]]; then
if [[ $MEDCOMP == 'cmeps' ]]; then
RFILE="ufs.s2s.cold.cpl.r.${SYEAR}-${SMONTH}-${SDAY}-03600.nc"
cp @[RTPWD]/@[MED_restart_data]/${RFILE} .
ls -1 ${RFILE}>rpointer.cpl
else
cp @[RTPWD]/@[MED_restart_data]/mediator_* .
fi
# No restart
if [ $WARM_START = .F. ]; then
# ICs
cp @[RTPWD]/${FV3_DIR}/INPUT/sfc_data*.nc ./INPUT
cp @[RTPWD]/${FV3_DIR}/INPUT/gfs_data*.nc ./INPUT
cp @[RTPWD]/MOM6_IC/MOM*.nc ./INPUT
cp @[RTPWD]/CICE_IC/cice5_model_0.25.*.nc ./cice5_model.res.nc

# Restart from coldstart, NEMS or CMEPS
if [[ ! $MED_restart_data == '' ]]; then
if [[ $MEDCOMP == 'cmeps' ]]; then
RFILE="ufs.s2s.cold.cpl.r.${SYEAR}-${SMONTH}-${SDAY}-03600.nc"
cp @[RTPWD]/@[MED_restart_data]/${RFILE} .
ls -1 ${RFILE}>rpointer.cpl
else
cp @[RTPWD]/@[MED_restart_data]/mediator_* .
fi
fi

# Restart
else
# Restart files
cp ../${DEP_RUN}/RESTART/coupler.res ./INPUT
cp ../${DEP_RUN}/RESTART/fv_*.nc ./INPUT
cp ../${DEP_RUN}/RESTART/sfc_data*.nc ./INPUT
cp ../${DEP_RUN}/RESTART/phy_data*.nc ./INPUT
cp ../${DEP_RUN}/RESTART/MOM*.nc ./INPUT

# CMEPS restart and pointer files
if [[ $MEDCOMP == 'cmeps' ]]; then
#cp ${DEP_RUN}/RESTART/ufs.s2s.cpl.r.2016-10-05-00000.nc .
cp ../${DEP_RUN}/ufs.s2s.cpl.r.2016-10-05-00000.nc .
RFILE="ufs.s2s.cpl.r.2016-10-05-00000.nc"
ls -1 ${RFILE}>rpointer.cpl
fi

# CICE restart and pointer files
cp ../${DEP_RUN}/RESTART/iced.2016-10-05-00000.nc ./INPUT
RFILE="iced.2016-10-05-00000.nc"
ls -1 "./INPUT/"${RFILE}>ice.restart_file
fi

# CCPP
Expand Down
43 changes: 0 additions & 43 deletions tests/fv3_conf/fv3_slurm.IN
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions tests/fv3_conf/fv3_slurm.IN_hera
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set -eux
set +x
source ./module-setup.sh
module use $( pwd -P )
module load modules.fv3
module load modules.fcst
module list

set -x
Expand All @@ -32,7 +32,7 @@ export PSM_SHAREDCONTEXTS=1
# Avoid job errors because of filesystem synchronization delays
sync && sleep 1

srun --label -n @[TASKS] ./fv3_mom6_cice.exe
srun --label -n @[TASKS] ./fcst.exe

echo "Model ended: " `date`

Expand Down
4 changes: 2 additions & 2 deletions tests/fv3_conf/fv3_slurm.IN_orion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ set -eux
set +x
source ./module-setup.sh
module use $( pwd -P )
module load modules.fv3
module load modules.fcst
module list

set -x
Expand All @@ -36,7 +36,7 @@ export OMP_NUM_THREADS=@[THRD]
# Avoid job errors because of filesystem synchronization delays
sync && sleep 1

srun --label -n @[TASKS] ./fv3_mom6_cice.exe
srun --label -n @[TASKS] ./fcst.exe

echo "Model ended: " `date`

Expand Down
28 changes: 14 additions & 14 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,40 @@ RUN | cpld_fv3_ccpp_mom6_cice_cold_atm_flux
RUN | cpld_fv3_ccpp_mom6_cice_cold_satmedmf | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_cold_atm_flux | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_cold_bmark_rt | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_2d_atm_flux | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_2d_atm_flux | | | fv3 | cpld_fv3_ccpp_mom6_cice_cold_atm_flux
RUN | cpld_fv3_ccpp_mom6_cice_2d_2threads | | | |
RUN | cpld_fv3_ccpp_mom6_cice_2d_decomp | | | |
RUN | cpld_fv3_ccpp_mom6_cice_1d_satmedmf | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_2d_atm_flux | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_1d_bmark_rt | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_1d_satmedmf | | | fv3 | cpld_fv3_ccpp_mom6_cice_cold_satmedmf
RUN | cpld_fv3_ccpp_384_mom6_cice_2d_atm_flux | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_cold_atm_flux
RUN | cpld_fv3_ccpp_384_mom6_cice_1d_bmark_rt | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_cold_bmark_rt
COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y WW3=Y | | hera.intel | fv3 |
COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y WW3=Y | | orion.intel | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cold_bmark_rt | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_1d_bmark_rt | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_1d_bmark_rt | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_ww3_cold_bmark_rt
COMPILE | CCPP=Y DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y | | hera.intel | fv3 |
COMPILE | CCPP=Y DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y | | orion.intel | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_cold_debug | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_6h_debug | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_6h_debug | | | fv3 | cpld_fv3_ccpp_mom6_cice_cold_debug
#
COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y CMEPS=Y | | hera.intel | fv3 |
COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y CMEPS=Y | | orion.intel | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_cold_atm_flux | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_cold_satmedmf | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_atm_flux | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_bmark_rt | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_restart | | | |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux | | | fv3 | cpld_fv3_ccpp_mom6_cice_cmeps_cold_atm_flux
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux | | | fv3 | cpld_fv3_ccpp_mom6_cice_cmeps_cold_atm_flux
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_restart | | | | cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_2d_2threads | | | |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_2d_decomp | | | |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf | | | fv3 | cpld_fv3_ccpp_mom6_cice_cmeps_cold_satmedmf
RUN | cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_atm_flux
RUN | cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_bmark_rt
COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y WW3=Y CMEPS=Y | | hera.intel | fv3 |
COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y WW3=Y CMEPS=Y | | orion.intel | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_cold_bmark_rt | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_cold_bmark_rt
COMPILE | CCPP=Y DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y CMEPS=Y | | hera.intel | fv3 |
COMPILE | CCPP=Y DEBUG=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled MOM6=Y CICE=Y CMEPS=Y | | orion.intel | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_cold_debug | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug | | | fv3 |
RUN | cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug | | | fv3 | cpld_fv3_ccpp_mom6_cice_cmeps_cold_debug
4 changes: 3 additions & 1 deletion tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@ while read -r line; do
MACHINES=$( echo $line | cut -d'|' -f4)
CB=$( echo $line | cut -d'|' -f5)
DEP_RUN=$( echo $line | cut -d'|' -f6 | sed -e 's/^ *//' -e 's/ *$//')
#export DEP_RUN
[[ -e "tests/$TEST_NAME" ]] || die "run test file tests/$TEST_NAME does not exist"
[[ $SET_ID != ' ' && $SET != *${SET_ID}* ]] && continue
[[ $MACHINES != ' ' && $MACHINES != *${MACHINE_ID}* ]] && continue
Expand Down Expand Up @@ -684,6 +685,7 @@ EOF
export PARTITION=${PARTITION}
export ROCOTO=${ROCOTO}
export LOG_DIR=${LOG_DIR}
export DEP_RUN=${DEP_RUN}
EOF

if [[ $ROCOTO == true ]]; then
Expand Down Expand Up @@ -740,7 +742,7 @@ else
echo ; echo REGRESSION TEST WAS SUCCESSFUL
(echo ; echo REGRESSION TEST WAS SUCCESSFUL) >> ${REGRESSIONTEST_LOG}

rm -f fv3_*.x fv3_*.exe modules.fv3_*
rm -f fcst_*.x fcst_*.exe modules.fcst_*
[[ ${KEEP_RUNDIR} == false ]] && rm -rf ${RUNDIR_ROOT}
[[ ${ROCOTO} == true ]] && rm -f ${ROCOTO_XML} ${ROCOTO_DB} *_lock.db
fi
Expand Down
16 changes: 8 additions & 8 deletions tests/rt_35d_cmeps.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2013010100 | |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2013040100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2013070100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2013100100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2012010100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2012040100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2012070100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2012100100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2013010100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2013040100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2013070100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2013100100 | | | fv3 |
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2012010100 | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2012010100
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2012040100 | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2012040100
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2012070100 | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2012070100
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2012100100 | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2012100100
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2013010100 | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2013010100
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2013040100 | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2013040100
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2013070100 | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2013070100
RUN | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_35d_2013100100 | | | fv3 | cpld_fv3_ccpp_384_mom6_cice_ww3_cmeps_cold_2013100100
Loading