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

Rt hires #1471

Merged
merged 30 commits into from
Nov 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8b9e140
Replace low resolution regression tests with high resolution.
RatkoVasic-NOAA Oct 21, 2022
750e9a7
Rename ICs and result directory
RatkoVasic-NOAA Oct 24, 2022
dd0d109
Remove "calendar" variable from namelists.
RatkoVasic-NOAA Oct 25, 2022
da11850
Tests passed on Hera.
RatkoVasic-NOAA Oct 26, 2022
8ad0466
Rename regional tests from fv3* to FV3*
RatkoVasic-NOAA Oct 26, 2022
b475c8b
Hera - log file
RatkoVasic-NOAA Oct 26, 2022
39d8717
Merge branch 'develop' into rt-hires
RatkoVasic-NOAA Oct 26, 2022
3e95d8b
Chmod rt.sh
RatkoVasic-NOAA Oct 26, 2022
4adf449
Merge branch 'develop' into rt-hires
RatkoVasic-NOAA Oct 31, 2022
46c9b47
Remove unused scripts: gfdlmp_run.IN & gsd_run.IN
RatkoVasic-NOAA Oct 31, 2022
4fe9704
Merge
RatkoVasic-NOAA Nov 1, 2022
93e728d
Merge branch 'develop' into rt-hires
RatkoVasic-NOAA Nov 1, 2022
aa6ce36
Rename new wofs RTs
RatkoVasic-NOAA Nov 1, 2022
474b8e6
Revert WW3
RatkoVasic-NOAA Nov 1, 2022
35e2c89
Revert FV3
RatkoVasic-NOAA Nov 1, 2022
9be505d
Merge branch 'develop' into rt-hires
RatkoVasic-NOAA Nov 3, 2022
e920d43
add new BL_DATE
jkbk2004 Nov 8, 2022
e6b8d34
Merge branch 'develop' into rt-hires
RatkoVasic-NOAA Nov 8, 2022
72e9466
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Nov 8, 2022
4a0f8a4
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Nov 9, 2022
4b3c450
Test passed on WCOSS2
RatkoVasic-NOAA Nov 9, 2022
c6b9c00
add orion.intel RT log: passed
jkbk2004 Nov 9, 2022
54f9609
add orion RT log: passed
jkbk2004 Nov 9, 2022
3c65b0e
add gaea.intel RT log: passed
jkbk2004 Nov 9, 2022
d9a518c
Add '--cpus-per-task=@[THRD]' to fv3_conf/fv3_slurm.IN_jet
DusanJovic-NOAA Nov 9, 2022
d192972
Acorn Intel RT Log
BrianCurtis-NOAA Nov 9, 2022
5ee576f
add jet.intel RT log: passed
jkbk2004 Nov 9, 2022
9872bac
update INPUTDATA_ROOT: input-data-20221101
jkbk2004 Nov 10, 2022
da66a9a
add cheyenne.intel RT log: passed
jkbk2004 Nov 10, 2022
62d8eee
add omplace to cheyenne qsub script
jkbk2004 Nov 10, 2022
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
1,746 changes: 865 additions & 881 deletions tests/RegressionTests_acorn.intel.log

Large diffs are not rendered by default.

442 changes: 221 additions & 221 deletions tests/RegressionTests_cheyenne.gnu.log

Large diffs are not rendered by default.

6,714 changes: 5,791 additions & 923 deletions tests/RegressionTests_cheyenne.intel.log

Large diffs are not rendered by default.

1,830 changes: 906 additions & 924 deletions tests/RegressionTests_gaea.intel.log

Large diffs are not rendered by default.

448 changes: 224 additions & 224 deletions tests/RegressionTests_hera.gnu.log

Large diffs are not rendered by default.

1,852 changes: 917 additions & 935 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

1,704 changes: 843 additions & 861 deletions tests/RegressionTests_jet.intel.log

Large diffs are not rendered by default.

1,858 changes: 920 additions & 938 deletions tests/RegressionTests_orion.intel.log

Large diffs are not rendered by default.

1,442 changes: 706 additions & 736 deletions tests/RegressionTests_wcoss2.intel.log

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/fv3_conf/fv3_qsub.IN_cheyenne
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#PBS -N @[JBNME]
#PBS -A @[ACCNR]
#PBS -q @[QUEUE]
#PBS -l select=@[NODES]:ncpus=@[TPN]:mpiprocs=@[TPN]
#PBS -l select=@[NODES]:ncpus=@[TPN]:mpiprocs=@[TPN]:ompthreads=@[THRD]
#PBS -l walltime=00:@[WLCLK]:00

set -eux
Expand Down Expand Up @@ -34,7 +34,7 @@ export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
# Avoid job errors because of filesystem synchronization delays
sync && sleep 1

mpiexec_mpt -p %g: -np @[TASKS] ./fv3.exe
mpiexec_mpt -p %g: -np @[TASKS] omplace ./fv3.exe

echo "Model ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
2 changes: 1 addition & 1 deletion tests/fv3_conf/fv3_slurm.IN_jet
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export ESMF_RUNTIME_PROFILE_OUTPUT="SUMMARY"
# Avoid job errors because of filesystem synchronization delays
sync && sleep 1

srun --label -n @[TASKS] ./fv3.exe
srun --label -n @[TASKS] --cpus-per-task=@[THRD] ./fv3.exe

echo "Model ended: " `date`
echo -n " $( date +%s )," >> job_timestamp.txt
39 changes: 0 additions & 39 deletions tests/fv3_conf/gfdlmp_run.IN

This file was deleted.

41 changes: 0 additions & 41 deletions tests/fv3_conf/gsd_run.IN

This file was deleted.

46 changes: 0 additions & 46 deletions tests/fv3_conf/regional_3km_run.IN

This file was deleted.

2 changes: 1 addition & 1 deletion tests/fv3_conf/regional_rrfs_a_run.IN
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ rsync -arv @[INPUTDATA_ROOT]/FV3_regional_input_data/. .
rm -rf INPUT RESTART
mkdir INPUT RESTART

rsync -arv @[INPUTDATA_ROOT]/fv3_regional_rrfs_a/INPUT/. INPUT/.
rsync -arv @[INPUTDATA_ROOT]/FV3_regional_rrfs_a/INPUT/. INPUT/.

cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
Expand Down
47 changes: 31 additions & 16 deletions tests/fv3_conf/regional_run.IN
Original file line number Diff line number Diff line change
@@ -1,22 +1,41 @@
rsync -arv @[INPUTDATA_ROOT]/FV3_regional_input_data/. .

rm -rf INPUT RESTART
mkdir INPUT RESTART

rsync -arv @[INPUTDATA_ROOT]/fv3_regional_control/INPUT/. INPUT/.
rsync -arv @[INPUTDATA_ROOT]/FV3_regional/INPUT/. INPUT/.

cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .

cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m01.nc aeroclim.m01.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m02.nc aeroclim.m02.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m03.nc aeroclim.m03.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m04.nc aeroclim.m04.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m05.nc aeroclim.m05.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m06.nc aeroclim.m06.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m07.nc aeroclim.m07.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m08.nc aeroclim.m08.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m09.nc aeroclim.m09.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m10.nc aeroclim.m10.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m11.nc
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m12.nc aeroclim.m12.nc

cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat optics_SS.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat optics_SU.dat

if [ $WARM_START = .true. ]; then
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.coupler.res INPUT/coupler.res
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.nc INPUT/fv_core.res.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_core.res.tile1.nc INPUT/fv_core.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_srf_wnd.res.tile1.nc INPUT/fv_srf_wnd.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.fv_tracer.res.tile1.nc INPUT/fv_tracer.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.phy_data.nc INPUT/phy_data.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20181015.120000.sfc_data.nc INPUT/sfc_data.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.coupler.res INPUT/coupler.res
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.fv_core.res.nc INPUT/fv_core.res.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.fv_core.res.tile1.nc INPUT/fv_core.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.fv_srf_wnd.res.tile1.nc INPUT/fv_srf_wnd.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.fv_tracer.res.tile1.nc INPUT/fv_tracer.res.tile1.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.phy_data.nc INPUT/phy_data.nc
cp ../regional_control${RT_SUFFIX}/RESTART/20220824.030000.sfc_data.nc INPUT/sfc_data.nc
fi
if [ $WRITE_RESTART_WITH_BCS = .true. ]; then
cp @[INPUTDATA_ROOT]/fv3_regional_control/RESTART/fv_core.res.tile1_new.nc RESTART/fv_core.res.tile1_new.nc
cp @[INPUTDATA_ROOT]/fv3_regional_control/RESTART/fv_tracer.res.tile1_new.nc RESTART/fv_tracer.res.tile1_new.nc
cp @[INPUTDATA_ROOT]/FV3_regional/RESTART/fv_core.res.tile1_new.nc RESTART/fv_core.res.tile1_new.nc
cp @[INPUTDATA_ROOT]/FV3_regional/RESTART/fv_tracer.res.tile1_new.nc RESTART/fv_tracer.res.tile1_new.nc
fi

if [[ $POSTAPP = 'lam' ]]; then
Expand All @@ -25,7 +44,3 @@ if [[ $POSTAPP = 'lam' ]]; then
cp ${PATHRT}/parm/postxconfig-NT-fv3lam.txt postxconfig-NT_FH00.txt
cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
fi

if [ $DO_RRTMGP = .true. ]; then
cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
fi
2 changes: 1 addition & 1 deletion tests/opnReqTest
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ fi
mkdir -p ${STMP}/${USER}
NEW_BASELINE=${STMP}/${USER}/FV3_OPNREQ_TEST/OPNREQ_TEST
RTPWD=${NEW_BASELINE}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20220414}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20221101}
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20220624/
INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20220207}

Expand Down
1 change: 0 additions & 1 deletion tests/parm/datm_cdeps_configure.IN
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ start_minute: 0
start_second: 0
nhours_fcst: @[FHMAX]
dt_atmos: @[DT_ATMOS]
calendar: 'julian'
fhrot: @[FHROT]
nfhout: @[NFHOUT]
nfhmax_hf: -1
Expand Down
Loading