-
Notifications
You must be signed in to change notification settings - Fork 249
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
add cpld_control_wave with 1deg wave grid #385
Changes from 7 commits
d0c08f6
dec774a
657b941
7f29488
a56e892
acb5573
8b106a0
0cfb00a
39636ca
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,6 +25,10 @@ elif [[ $MACHINE_ID = wcoss_dell_p3 || $MACHINE_ID = wcoss2 ]]; then | |
THRD_cpl_dflt=1; WPG_cpl_dflt=6; MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149" | ||
OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191" | ||
|
||
TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8 | ||
THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6; MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149" | ||
OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203" | ||
|
||
TASKS_cpl_thrd=120; TPN_cpl_thrd=14; INPES_cpl_thrd=3; JNPES_cpl_thrd=4 | ||
THRD_cpl_thrd=2; WPG_cpl_thrd=6; MPB_cpl_thrd="0 77"; APB_cpl_thrd="0 77" | ||
OPB_cpl_thrd="78 107"; IPB_cpl_thrd="108 119" | ||
|
@@ -64,6 +68,10 @@ elif [[ $MACHINE_ID = orion.* ]]; then | |
THRD_cpl_dflt=1; WPG_cpl_dflt=6; MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149" | ||
OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191" | ||
|
||
TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8 | ||
THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6; MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149" | ||
OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203" | ||
|
||
TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4 | ||
THRD_cpl_thrd=2; WPG_cpl_thrd=6; MPB_cpl_thrd="0 77"; APB_cpl_thrd="0 77" | ||
OPB_cpl_thrd="78 107"; IPB_cpl_thrd="108 119" | ||
|
@@ -103,6 +111,10 @@ elif [[ $MACHINE_ID = hera.* ]]; then | |
THRD_cpl_dflt=1; WPG_cpl_dflt=6; MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149" | ||
OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191" | ||
|
||
TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8 | ||
THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6; MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149" | ||
OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203" | ||
|
||
TASKS_cpl_thrd=120; TPN_cpl_thrd=40; INPES_cpl_thrd=3; JNPES_cpl_thrd=4 | ||
THRD_cpl_thrd=2; WPG_cpl_thrd=6; MPB_cpl_thrd="0 77"; APB_cpl_thrd="0 77" | ||
OPB_cpl_thrd="78 107"; IPB_cpl_thrd="108 119" | ||
|
@@ -167,6 +179,10 @@ elif [[ $MACHINE_ID = cheyenne.* ]]; then | |
THRD_cpl_dflt=1; WPG_cpl_dflt=6; MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149" | ||
OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191" | ||
|
||
TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here, cheyenne is only 36/node. |
||
THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6; MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149" | ||
OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203" | ||
|
||
TASKS_cpl_thrd=120; TPN_cpl_thrd=36; INPES_cpl_thrd=3; JNPES_cpl_thrd=4 | ||
THRD_cpl_thrd=2; WPG_cpl_thrd=6; MPB_cpl_thrd="0 77"; APB_cpl_thrd="0 77" | ||
OPB_cpl_thrd="78 107"; IPB_cpl_thrd="108 119" | ||
|
@@ -205,6 +221,10 @@ elif [[ $MACHINE_ID = stampede.* ]]; then | |
THRD_cpl_dflt=1; WPG_cpl_dflt=6; MPB_cpl_dflt="0 143"; APB_cpl_dflt="0 149" | ||
OPB_cpl_dflt="150 179"; IPB_cpl_dflt="180 191" | ||
|
||
TASKS_cpl_dflt_wwav=204; TPN_cpl_dflt_wwav=40; INPES_cpl_dflt_wwav=3; JNPES_cpl_dflt_wwav=8 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and here (48) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @DeniseWorthen Done |
||
THRD_cpl_dflt_wwav=1; WPG_cpl_dflt_wwav=6; MPB_cpl_dflt_wwav="0 143"; APB_cpl_dflt_wwav="0 149" | ||
OPB_cpl_dflt_wwav="150 179"; IPB_cpl_dflt_wwav="180 191"; WPB_cpl_dflt_wwav="192 203" | ||
|
||
TASKS_cpl_thrd=120; TPN_cpl_thrd=48; INPES_cpl_thrd=3; JNPES_cpl_thrd=4 | ||
THRD_cpl_thrd=2; WPG_cpl_thrd=6; MPB_cpl_thrd="0 77"; APB_cpl_thrd="0 77" | ||
OPB_cpl_thrd="78 107"; IPB_cpl_thrd="108 119" | ||
|
@@ -555,6 +575,7 @@ export JATM=768 | |
export ATMRES='C96' | ||
export OCNRES='100' | ||
export ICERES='1.00' | ||
export WAVRES='1.00' | ||
export NX_GLB=360 | ||
export NY_GLB=320 | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -50,6 +50,12 @@ 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 . | ||
|
||
# WW3 fix/input | ||
if [[ $CPLWAV == .T. && $CPLWAV2ATM == .T. ]]; then | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We would need this only if CPLWAV is true, cplwave2atm=f would still need mod_defs and the input file |
||
cp @[INPUTDATA_ROOT_WW3]/mod_def.* . | ||
cp @[INPUTDATA_ROOT_WW3]/ww3_multi_1deg.inp ww3_multi.inp | ||
fi | ||
|
||
# No restart | ||
if [ $WARM_START = .F. ]; then | ||
# ICs | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -128,8 +128,9 @@ RUN | fv3_ccpp_esg_HAFS_v0_hwrf_thompson_debug | |
# CPLD tests # | ||
################################################################################################################################################################################### | ||
|
||
COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y | - wcoss_cray gaea.intel jet.intel | fv3 | | ||
COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled,FV3_GFS_v16beta_coupled S2S=Y WW3=Y | - wcoss_cray gaea.intel jet.intel | fv3 | | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This makes the compile the same as line 162, which makes me wonder if we should either move the new test w/waves under that compile or just remove the second compile? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @JessicaMeixner-NOAA I fixed them. Thanks. |
||
RUN | cpld_control | - wcoss_cray gaea.intel jet.intel | fv3 | | ||
RUN | cpld_control_wave | - wcoss_cray gaea.intel jet.intel | fv3 | | ||
RUN | cpld_restart | - wcoss_cray gaea.intel jet.intel | | cpld_control | ||
RUN | cpld_controlfrac | - wcoss_cray gaea.intel jet.intel | fv3 | | ||
RUN | cpld_restartfrac | - wcoss_cray gaea.intel jet.intel | | cpld_controlfrac | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
# | ||
# cpld_control_wave test | ||
# | ||
|
||
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 with waves" | ||
|
||
export CNTL_DIR="cpld_control_wave" | ||
|
||
export LIST_FILES="phyf024.tile1.nc \ | ||
phyf024.tile2.nc \ | ||
phyf024.tile3.nc \ | ||
phyf024.tile4.nc \ | ||
phyf024.tile5.nc \ | ||
phyf024.tile6.nc \ | ||
dynf024.tile1.nc \ | ||
dynf024.tile2.nc \ | ||
dynf024.tile3.nc \ | ||
dynf024.tile4.nc \ | ||
dynf024.tile5.nc \ | ||
dynf024.tile6.nc \ | ||
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 \ | ||
RESTART/fv_core.res.tile4.nc \ | ||
RESTART/fv_core.res.tile5.nc \ | ||
RESTART/fv_core.res.tile6.nc \ | ||
RESTART/fv_srf_wnd.res.tile1.nc \ | ||
RESTART/fv_srf_wnd.res.tile2.nc \ | ||
RESTART/fv_srf_wnd.res.tile3.nc \ | ||
RESTART/fv_srf_wnd.res.tile4.nc \ | ||
RESTART/fv_srf_wnd.res.tile5.nc \ | ||
RESTART/fv_srf_wnd.res.tile6.nc \ | ||
RESTART/fv_tracer.res.tile1.nc \ | ||
RESTART/fv_tracer.res.tile2.nc \ | ||
RESTART/fv_tracer.res.tile3.nc \ | ||
RESTART/fv_tracer.res.tile4.nc \ | ||
RESTART/fv_tracer.res.tile5.nc \ | ||
RESTART/fv_tracer.res.tile6.nc \ | ||
RESTART/phy_data.tile1.nc \ | ||
RESTART/phy_data.tile2.nc \ | ||
RESTART/phy_data.tile3.nc \ | ||
RESTART/phy_data.tile4.nc \ | ||
RESTART/phy_data.tile5.nc \ | ||
RESTART/phy_data.tile6.nc \ | ||
RESTART/sfc_data.tile1.nc \ | ||
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 \ | ||
RESTART/MOM.res.nc \ | ||
RESTART/iced.2016-10-04-00000.nc \ | ||
RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc \ | ||
20161004.000000.out_grd.glo_1deg \ | ||
20161004.000000.out_pnt.points \ | ||
20161004.000000.restart.glo_1deg" | ||
|
||
export_fv3 | ||
export_cpl | ||
|
||
export TASKS=$TASKS_cpl_dflt_wwav | ||
export TPN=$TPN_cpl_dflt_wwav | ||
export INPES=$INPES_cpl_dflt_wwav | ||
export JNPES=$JNPES_cpl_dflt_wwav | ||
export THRD=$THRD_cpl_dflt_wwav | ||
export WRTTASK_PER_GROUP=$WPG_cpl_dflt_wwav | ||
|
||
export med_petlist_bounds=$MPB_cpl_dflt_wwav | ||
export atm_petlist_bounds=$APB_cpl_dflt_wwav | ||
export ocn_petlist_bounds=$OPB_cpl_dflt_wwav | ||
export ice_petlist_bounds=$IPB_cpl_dflt_wwav | ||
export wav_petlist_bounds=$WPB_cpl_dflt_wwav | ||
|
||
# nems.configure | ||
export NEMS_CONFIGURE="nems.configure.cpld_wave.IN" | ||
|
||
export CPLWAV='.T.' | ||
export CPLWAV2ATM='.T.' | ||
export FV3_RUN=cpld_control_run.IN |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be TPN_cpl_dfld_wwav=28 (same as cpl_dflt). This is the nodes/processor which varies across machines.