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.

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

update CMEPS to allow bilinear ATM<->WAV mapping for global coupled application; utilize custom restart names for WW3 (was #1684) #1692

Merged
merged 15 commits into from
Apr 3, 2023
Merged

update CMEPS to allow bilinear ATM<->WAV mapping for global coupled application; utilize custom restart names for WW3 (was #1684) #1692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
23cf566
utilize custom restart names for WW3
DeniseWorthen Mar 28, 2023
f50ef0d
Merge branch 'ufs-community:develop' into feature/ww3restartname
DeniseWorthen Mar 29, 2023
e1bd598
update CMEPS
DeniseWorthen Apr 1, 2023
e1e2985
Merge remote-tracking branch 'origin/feature/ww3restartname' into fea…
DeniseWorthen Apr 1, 2023
629c3ee
add new BL_DATE
jkbk2004 Apr 1, 2023
1096ea5
Acorn Intel RT Log
BrianCurtis-NOAA Apr 3, 2023
afc4c4d
turn off two tests on jet.intel
DeniseWorthen Apr 3, 2023
8c63a16
add hera intel.gnu RT logs: passed
jkbk2004 Apr 3, 2023
76f81f3
add orion.intel RT log: passed
jkbk2004 Apr 3, 2023
745e559
add cheyenne intel.gnu RT logs: passed
jkbk2004 Apr 3, 2023
0773ace
add gaea.intel RT log: passed
jkbk2004 Apr 3, 2023
7e6d526
WCOSS2 Intel RT Log
BrianCurtis-NOAA Apr 3, 2023
38ac4c8
remove additional regional tests from jet.intel
DeniseWorthen Apr 3, 2023
45fe8c0
add jet.intel RT log: passed
jkbk2004 Apr 3, 2023
7efcc16
update gitmodules
DeniseWorthen Apr 3, 2023
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
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Open in desktop
Submodule CMEPS updated 1 files
+2 −2 mediator/esmFldsExchange_nems_mod.F90
1,338 changes: 669 additions & 669 deletions tests/RegressionTests_acorn.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

440 changes: 220 additions & 220 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,506 changes: 754 additions & 752 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,739 changes: 1,064 additions & 675 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

436 changes: 218 additions & 218 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,396 changes: 698 additions & 698 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,970 changes: 1,120 additions & 850 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,406 changes: 703 additions & 703 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,158 changes: 579 additions & 579 deletions tests/RegressionTests_wcoss2.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion tests/fv3_conf/cpld_control_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ else

# WAVE restart file
if [[ $CPLWAV == .true. ]]; then
cp ../${DEP_RUN}${SUFFIX}/${RESTART_FILE_PREFIX}.restart.ww3 ./restart.ww3
RFILE=ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS}
cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
fi

else
Expand Down
1 change: 1 addition & 0 deletions tests/parm/nems.configure.cpld.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ WAV_attributes::
logfile = wav.log
mesh_wav = @[MESH_WAV]
multigrid = @[MULTIGRID]
user_sets_restname = true
::

# CMEPS warm run sequence
Expand Down
1 change: 1 addition & 0 deletions tests/parm/nems.configure.cpld_esmfthreads.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ WAV_attributes::
logfile = wav.log
mesh_wav = @[MESH_WAV]
multigrid = @[MULTIGRID]
user_sets_restname = true
::

# CMEPS warm run sequence
Expand Down
1 change: 1 addition & 0 deletions tests/parm/nems.configure.cpld_noaero.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ WAV_attributes::
logfile = wav.log
mesh_wav = @[MESH_WAV]
multigrid = @[MULTIGRID]
user_sets_restname = true
::

# CMEPS warm run sequence
Expand Down
1 change: 1 addition & 0 deletions tests/parm/nems.configure.cpld_noaero_outwav.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ WAV_attributes::
logfile = wav.log
mesh_wav = @[MESH_WAV]
multigrid = @[MULTIGRID]
user_sets_restname = true
::

# CMEPS warm run sequence
Expand Down
1 change: 1 addition & 0 deletions tests/parm/nems.configure.hafs_atm_ocn_wav.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ WAV_attributes::
merge_import = .true.
mesh_wav = @[MESH_WAV]
multigrid = @[MULTIGRID]
user_sets_restname = true
::

# Run Sequence #
Expand Down
1 change: 1 addition & 0 deletions tests/parm/nems.configure.hafs_atm_wav.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ WAV_attributes::
merge_import = .true.
mesh_wav = @[MESH_WAV]
multigrid = @[MULTIGRID]
user_sets_restname = true
::

# Run Sequence #
Expand Down
10 changes: 5 additions & 5 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ RUN | regional_control_qr
RUN | regional_restart_qr | | | regional_control_qr
RUN | regional_decomp | | |
RUN | regional_2threads | | |
RUN | regional_noquilt | | fv3 |
RUN | regional_noquilt | - jet.intel | fv3 |
RUN | regional_netcdf_parallel | - acorn.intel | fv3 |
RUN | regional_2dwrtdecomp | | |
RUN | regional_wofs | | fv3 |
RUN | regional_wofs | - jet.intel | fv3 |

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0 -D32BIT=ON -DREQUIRE_IFI=ON | + acorn.intel | fv3 |
RUN | regional_ifi_control | + acorn.intel | fv3 |
Expand Down Expand Up @@ -229,7 +229,7 @@ RUN | hafs_regional_storm_following_1nest_atm_ocn_wav
COMPILE | -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON | - wcoss2.intel | fv3 |
RUN | hafs_regional_docn | - wcoss2.intel | fv3 |
RUN | hafs_regional_docn_oisst | - wcoss2.intel | fv3 |
RUN | hafs_regional_datm_cdeps | - wcoss2.intel | fv3 |
RUN | hafs_regional_datm_cdeps | - wcoss2.intel -jet.intel | fv3 |

###################################################################################################################################################################################
# CDEPS Data Atmosphere tests #
Expand Down Expand Up @@ -295,9 +295,9 @@ RUN | atmaero_control_p8_rad_micro
###################################################################################################################################################################################

COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -D32BIT=ON | | fv3 |
RUN | regional_atmaq | | fv3 |
RUN | regional_atmaq | - jet.intel | fv3 |
COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON -D32BIT=ON | | fv3 |
RUN | regional_atmaq_debug | - jet.intel gaea.intel cheyenne.intel | fv3 |

COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DFASTER=ON -D32BIT=ON | | fv3 |
RUN | regional_atmaq_faster | | fv3 |
RUN | regional_atmaq_faster | - jet.intel | fv3 |
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
fi


BL_DATE=20230329
BL_DATE=20230401

RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_atm_ocn_wav
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export LIST_FILES="atmf006.nc \
archs.2019_241_06.a \
out_grd.ww3 \
out_pnt.ww3 \
20190829.060000.restart.ww3 \
ufs.hafs.ww3.r.2019-08-29-21600 \
ufs.hafs.cpl.r.2019-08-29-21600.nc"

export_fv3
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/hafs_regional_atm_wav
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export LIST_FILES="atmf006.nc \
sfcf006.nc \
out_grd.ww3 \
out_pnt.ww3 \
20190829.060000.restart.ww3 \
ufs.hafs.ww3.r.2019-08-29-21600 \
ufs.hafs.cpl.r.2019-08-29-21600.nc"

export_fv3
Expand Down