Skip to content
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
224 changes: 121 additions & 103 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

210 changes: 114 additions & 96 deletions tests/RegressionTests_orion.intel.log

Large diffs are not rendered by default.

236 changes: 157 additions & 79 deletions tests/RegressionTests_wcoss_dell_p3.log

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ export RUNID='unknown'
export DUMPFREQ='d'
export DUMPFREQ_N=1000
export USE_RESTART_TIME='.false.'
export RESTART_EXT='.false'
export RESTART_EXT='.false.'
# setting to true will allow Frazil FW and Salt to be
# included in fluxes sent to ocean
export FRAZIL_FWSALT='.true.'
Expand All @@ -540,6 +540,7 @@ export FHMAX=24
export WLCLK=30
export THRD=1
export FHROT='0'
export WARM_START=.F.

# atm/ocn/ice resolution
# GEFS
Expand Down Expand Up @@ -620,11 +621,12 @@ export RUNID='unknown'
export DUMPFREQ='d'
export DUMPFREQ_N=1000
export USE_RESTART_TIME='.false.'
export RESTART_EXT='.false'
export RESTART_EXT='.false.'
# setting to true will allow Frazil FW and Salt to be
# included in fluxes sent to ocean
export FRAZIL_FWSALT='.true.'
# default to write CICE average history files
export CICE_HIST_AVG='.true.'
export BL_SUFFIX=""
export RT_SUFFIX=""
}
24 changes: 20 additions & 4 deletions tests/fv3_conf/cpld_datm_cfsr.IN
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
mkdir INPUT DATM_INPUT RESTART history MOM6_OUTPUT

export DATM=true
# FV3 fixed input
# DATM fixed input
export IATM=1760
export JATM=880
ICERES="${OCNRES:0:1}.${OCNRES:1}"
cp @[INPUTDATA_ROOT]/DATM/cfsr.SCRIP.nc DATM_INPUT
ln -s @[INPUTDATA_ROOT]/DATM/CFSR/201110/* DATM_INPUT

Expand All @@ -16,11 +17,26 @@ cp @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/grid_cice_NEMS_mx@[OCNRES].nc .
cp @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/kmtu_cice_NEMS_mx@[OCNRES].nc .
cp @[INPUTDATA_ROOT]/CICE_FIX/@[OCNRES]/mesh.mx@[OCNRES].nc .


if [[ $OCNRES == '025' ]]; then
if [ $WARM_START = .F. ]; then
# cold start
if [[ $OCNRES == '025' ]]; then
cp @[INPUTDATA_ROOT]/MOM6_IC/@[OCNRES]/2011100100/MOM*.nc ./INPUT
cp @[INPUTDATA_ROOT]/CICE_IC/@[OCNRES]/cice_model_@[ICERES].cpc*.nc cice_model.res.nc
else
else
cp @[INPUTDATA_ROOT]/MOM6_IC/@[OCNRES]/2011100100/MOM6_IC_TS*.nc ./INPUT/MOM6_IC_TS.nc
cp @[INPUTDATA_ROOT]/CICE_IC/@[OCNRES]/cice_model_@[ICERES].cpc*.nc cice_model.res.nc
fi
else
# warm start
cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/MOM.res.2011-10-01-12*.nc ./INPUT/MOM.res.nc

# CMEPS restart and pointer files
RFILE="DATM_${DATM_SRC}.cpl.r.2011-10-01-43200.nc"
cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/${RFILE} .
ls -1 ${RFILE}>rpointer.cpl

# CICE restart and pointer files
cp ../${DEP_RUN}${RT_SUFFIX}/RESTART/iced.2011-10-01-43200.nc ./INPUT
RFILE="iced.2011-10-01-43200.nc"
ls -1 "./INPUT/"${RFILE}>ice.restart_file
fi
3 changes: 2 additions & 1 deletion tests/fv3_conf/cpld_datm_gefs.IN
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
mkdir INPUT DATM_INPUT RESTART history MOM6_OUTPUT

export DATM=true
# FV3 fixed input
# DATM fixed input
ICERES="${OCNRES:0:1}.${OCNRES:1}"
cp @[INPUTDATA_ROOT]/DATM/gefs.SCRIP.nc DATM_INPUT
ln -s @[INPUTDATA_ROOT]/DATM/GEFS/201110/* DATM_INPUT

Expand Down
2 changes: 2 additions & 0 deletions tests/parm/datm_configure.IN
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ start_second: 0
nhours_fcst: @[FHMAX]
RUN_CONTINUE: .false.
ENS_SPS: .false.
calendar: 'julian'
fhrot: @[FHROT]

dt_atmos: @[DT_ATMOS]
atm_coupling_interval_sec: @[coupling_interval_fast_sec]
Expand Down
18 changes: 11 additions & 7 deletions tests/rt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -253,19 +253,23 @@ RUN | cpld_debug
# Data Atmosphere tests
#######################################################################################################################################################################################

COMPILE | DATM=Y S2S=Y | standard | hera.intel orion.intel | fv3 |
COMPILE | DATM=Y S2S=Y | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
Comment thread
DeniseWorthen marked this conversation as resolved.
#COMPILE | DATM=Y S2S=Y | standard | cheyenne.intel | fv3 |
RUN | datm_control_cfsr | standard | hera.intel orion.intel | fv3 |
RUN | datm_control_gefs | standard | hera.intel orion.intel | fv3 |
RUN | datm_control_cfsr | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
RUN | datm_restart_cfsr | standard | hera.intel orion.intel wcoss_dell_p3 | | datm_control_cfsr
RUN | datm_control_gefs | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
#RUN | datm_control_cfsr | standard | cheyenne.intel | fv3 |
#RUN | datm_control_gefs | standard | cheyenne.intel | fv3 |

RUN | datm_bulk_cfsr | standard | hera.intel orion.intel | fv3 |
RUN | datm_bulk_gefs | standard | hera.intel orion.intel | fv3 |
RUN | datm_bulk_cfsr | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
RUN | datm_bulk_gefs | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
#RUN | datm_bulk_cfsr | standard | cheyenne.intel | fv3 |
#RUN | datm_bulk_gefs | standard | cheyenne.intel | fv3 |

RUN | datm_mx025_cfsr | standard | hera.intel orion.intel | fv3 |
RUN | datm_mx025_gefs | standard | hera.intel orion.intel | fv3 |
RUN | datm_mx025_cfsr | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
RUN | datm_mx025_gefs | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
#RUN | datm_mx025_cfsr | standard | cheyenne.intel | fv3 |
#RUN | datm_mx025_gefs | standard | cheyenne.intel | fv3 |

COMPILE | DATM=Y S2S=Y DEBUG=Y | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
RUN | datm_debug_cfsr | standard | hera.intel orion.intel wcoss_dell_p3 | fv3 |
1 change: 1 addition & 0 deletions tests/tests/datm_control_cfsr
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ export DATM_SRC="CFSR"
export FILENAME_BASE='cfsr.'
export IATM=1760
export JATM=880
export RESTART_N=12
export FV3_RUN=cpld_datm_cfsr.IN
21 changes: 21 additions & 0 deletions tests/tests/datm_debug_cfsr
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# DATM_MOM6_CICE_CMEPS_CFSR debug test
#

export TEST_DESCR="DATM-MOM6-CICE-CMEPS_CFSR - debug test "

export CNTL_DIR="datm_debug_cfsr"

export LIST_FILES="RESTART/MOM.res.nc \
RESTART/iced.2011-10-01-21600.nc \
RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc"

export_datm
export DATM_SRC="CFSR"
export FILENAME_BASE='cfsr.'
export IATM=1760
export JATM=880
export DAYS="0.25"
export FHMAX="6"
export RESTART_N=${FHMAX}
export FV3_RUN=cpld_datm_cfsr.IN
26 changes: 26 additions & 0 deletions tests/tests/datm_restart_cfsr
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#
Comment thread
DeniseWorthen marked this conversation as resolved.
# DATM_MOM6_CICE_CMEPS_CFSR restart test
#

export TEST_DESCR="DATM-MOM6-CICE-CMEPS_CFSR - restart test "

export CNTL_DIR="datm_control_cfsr"

export LIST_FILES="RESTART/MOM.res.nc \
RESTART/iced.2011-10-02-00000.nc \
RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc"

export_datm
export DATM_SRC="CFSR"
export FILENAME_BASE='cfsr.'
export IATM=1760
export JATM=880
export DAYS="1"
export FHMAX="24"
export FHROT="12"
export WARM_START='.T.'
export RESTART_N=$((FHMAX-$FHROT))
export RUNTYPE='continue'
export USE_RESTART_TIME='.true.'
export MOM6_RESTART_SETTING="r"
export FV3_RUN=cpld_datm_cfsr.IN