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

Jump to bottom

GW-RT global_control.nml modifications #2425

Open
wants to merge 20 commits into
base: develop
Choose a base branch
from
+452 −262
Open

GW-RT global_control.nml modifications #2425

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5bf503b
Add namelist options to prepare for RT-GW merge
dpsarmie Aug 30, 2024
1650d9c
Merge branch 'ufs-community:develop' into fix/updateNMLforGW
dpsarmie Sep 3, 2024
5da99f8
Update and resolve conflicts
dpsarmie Sep 13, 2024
c4568a6
Add changes to cpld_control_sfs RT
dpsarmie Sep 16, 2024
41b1d6d
Merge branch 'ufs-community:develop' into fix/updateNMLforGW
dpsarmie Sep 20, 2024
c643496
Fix bug in default_vars.sh
dpsarmie Sep 20, 2024
aa3719e
Fix rewritten atm vars
dpsarmie Sep 30, 2024
7eeba49
Merge branch 'ufs-community:develop' into fix/updateNMLforGW
dpsarmie Sep 30, 2024
4655fd7
Remove debug statements
dpsarmie Oct 2, 2024
b351192
Merge branch 'ufs-community:develop' into fix/updateNMLforGW
dpsarmie Oct 2, 2024
a5b6e2d
pdlib test changes
dpsarmie Oct 7, 2024
92cd56d
Standard setting method for RTs
dpsarmie Oct 8, 2024
77b5bdb
Merge branch 'ufs-community:develop' into fix/updateNMLforGW
dpsarmie Oct 8, 2024
5943d72
Add timing checks; Rework default_vars
dpsarmie Oct 14, 2024
c783631
Merge branch 'ufs-community:develop' into fix/updateNMLforGW
dpsarmie Oct 16, 2024
2c76c4e
Merge branch 'ufs-community:develop' into fix/updateNMLforGW
dpsarmie Oct 18, 2024
d6b770e
Update cpld_control_sfs
dpsarmie Oct 18, 2024
ca95832
atm_ds2s_docn_dice dependency fix
dpsarmie Oct 25, 2024
255ac07
Merge branch 'ufs-community:develop' into fix/updateNMLforGW
dpsarmie Oct 25, 2024
796a0d0
Fixes rt.conf
dpsarmie Oct 25, 2024
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
244 changes: 190 additions & 54 deletions tests/default_vars.sh
View file
Open in desktop

Large diffs are not rendered by default.

269 changes: 151 additions & 118 deletions tests/parm/global_control.nml.IN
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions tests/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,22 @@ if [[ ${FIRE_BEHAVIOR} = 'true' ]]; then
atparse < "${PATHRT}/parm/${FIRE_NML:-namelist.fire.IN}" > namelist.fire
fi

#Namelists generated and variable definitions are finalized
#Sanity check for timesteps on ATM/OCN/ICE
if [[ -n "${DT_CICE+x}" ]]; then
if [[ ${DT_ATMOS} -ne ${DT_CICE} ]]; then
echo "Atmosphere timestep (DT_ATMOS) should be equal to CICE timestep (DT_CICE). Exiting"
exit 1
fi
fi
if [[ -n "${coupling_interval_slow_sec+x}" && -n "${coupling_interval_fast_sec+x}" ]]; then
if [[ $(( coupling_interval_slow_sec % coupling_interval_fast_sec)) -ne 0 ]]; then
echo "The slow coupling timestep (coupling_interval_slow_sec) should be divisible by"
echo "the fast coupling timestep (coupling_interval_fast_sec). Exiting"
exit 1
fi
fi

TPN=$(( TPN / THRD ))
if (( TASKS < TPN )); then
TPN=${TASKS}
Expand Down
19 changes: 19 additions & 0 deletions tests/tests/atm_ds2s_docn_dice
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,25 @@ export WRTTASK_PER_GROUP=$WPG_cpl_dflt

export WAV_tasks=0

# UGWP1
export GWD_OPT=2
export KNOB_UGWP_NSLOPE=1
export DO_GSL_DRAG_LS_BL=.true.
export DO_GSL_DRAG_SS=.true.
export DO_UGWP_V1_OROG_ONLY=.false.
export DO_UGWP_V0_NST_ONLY=.false.
export LDIAG_UGWP=.false.

export DO_GSL_DRAG_TOFD=.false.
export CDMBWD=${CDMBWD_c96}

# UGWD
export DO_UGWP_V0=.true.
export DO_UGWP_V1=.false.
export DO_GSL_DRAG_LS_BL=.false.
export KNOB_UGWP_VERSION=0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this different than the cpld_control_nowave_noaero_p8 test it depends on?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

atm_ds2s_docn_dice settings should now reflect the cpld_control_nowave_noaero_p8 settings.



#CDEPS settings
export ocn_datamode=cplhist
export DOCN_IN_CONFIGURE=global_docn_in.IN
Expand Down
6 changes: 6 additions & 0 deletions tests/tests/control_p8_mynn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,12 @@ export NSTF_NAME=2,1,0,0,0
export LHEATSTRG=.false.
export LSEASPRAY=.true.

export FAST_TAU_W_SEC=0.2
export RF_CUTOFF=10.
export ISATMEDMF=1
export LRADAR=.false.
export LTAEROSOL=.false.

# UGWP1
export GWD_OPT=2
export DO_UGWP_V1=.false.
Expand Down
5 changes: 2 additions & 3 deletions tests/tests/cpld_2threads_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,10 @@ export LIST_FILES="sfcf024.tile1.nc \
20210323.060000.out_pnt.ww3 \
20210323.060000.out_grd.ww3 "

export DT_ATMOS=720
export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export RESTART_N=12
Expand Down Expand Up @@ -95,8 +96,6 @@ if [[ $MACHINE_ID = derecho ]]; then
TPN=96
fi

export DT_INNER=720
export DT_ATMOS=720
export K_SPLIT=4
export N_SPLIT=5

Expand Down
4 changes: 2 additions & 2 deletions tests/tests/cpld_bmark_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@ export LIST_FILES="sfcf006.nc \
RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc \
20130401.060000.out_pnt.ww3 \
20130401.060000.out_grd.ww3 "
export ATMRES=C384

export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export SYEAR=2013
Expand Down Expand Up @@ -89,7 +90,6 @@ export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
export wav_omp_num_threads=$WAV_thrds_cpl_bmrk

# atm/ocn/ice resolution
export ATMRES=C384
export NPX=385
export NPY=385
export IMO=1536
Expand Down
3 changes: 2 additions & 1 deletion tests/tests/cpld_bmark_p8_35d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ export CNTL_DIR=cpld_bmark_p8

export LIST_FILES=""

export ATMRES=C384

export_fv3
export_cpl

Expand Down Expand Up @@ -43,7 +45,6 @@ export ice_omp_num_threads=$ICE_thrds_cpl_bmrk
export wav_omp_num_threads=$WAV_thrds_cpl_bmrk

# atm/ocn/ice resolution
export ATMRES=C384
export NPX=385
export NPY=385
export IMO=1536
Expand Down
7 changes: 4 additions & 3 deletions tests/tests/cpld_control_c192_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,13 @@ export LIST_FILES="sfcf030.tile1.nc \
20210323.120000.out_grd.ww3 \
20210323.120000.out_pnt.ww3 "

export ATMRES=C192
export_fv3
export_ugwpv1
export_cpl

export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export DAYS=1.25
export FHMAX=30
export RESTART_N=15
Expand All @@ -82,7 +86,6 @@ export chm_omp_num_threads=$atm_omp_num_threads
export med_omp_num_threads=$atm_omp_num_threads

# atm/ocn/ice resolution
export ATMRES=C192
export NPX=193
export NPY=193
export IMO=768
Expand Down Expand Up @@ -134,8 +137,6 @@ export FNVMXC="'C192.vegetation_greenness.tileX.nc'"
export FNSLPC="'C192.slope_type.tileX.nc'"
export FNABSC="'C192.maximum_snow_albedo.tileX.nc'"

export CDMBWD=${CDMBWD_c192}

export FV3_RUN=cpld_control_run.IN

if [[ $MACHINE_ID = derecho ]]; then
Expand Down
5 changes: 2 additions & 3 deletions tests/tests/cpld_control_c48
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ export LIST_FILES="sfcf024.tile1.nc \
RESTART/20210323.060000.MOM.res.nc \
RESTART/iced.2021-03-23-21600.nc \
RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"
export ATMRES=C48

export_fv3
export_cpl
export_ugwpv1

export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export RESTART_N=12
Expand All @@ -74,7 +74,6 @@ OCN_tasks=$OCN_tasks_cpl_c48
ICE_tasks=$ICE_tasks_cpl_c48

# atm/ocn/ice resolution
export ATMRES=C48
export NPX=49
export NPY=49
export IMO=192
Expand Down
6 changes: 2 additions & 4 deletions tests/tests/cpld_control_ciceC_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ export LIST_FILES="sfcf021.tile1.nc \
RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
20210323.060000.out_pnt.ww3 \
20210323.060000.out_grd.ww3 "

export DT_ATMOS=720
export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export RESTART_N=12
Expand All @@ -86,8 +86,6 @@ export CICE_GRIDICE=C

export FV3_RUN=cpld_control_run.IN

export DT_INNER=720
export DT_ATMOS=720
export K_SPLIT=4
export N_SPLIT=5

Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_control_gfsv17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ export LIST_FILES="sfcf021.tile1.nc \
20210323.060000.out_grd.ww3 "

export_fv3
export_cpl
export_ugwpv1
export_cpl

export CPLCHM=.false.
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_control_gfsv17_iau
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ export LIST_FILES="sfcf024.nc \
20210323.120000.out_grd.ww3 "

export_fv3
export_cpl
export_ugwpv1
export_cpl

export CPLCHM=.false.
export DNATS=0
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_control_noaero_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ export LIST_FILES="sfcf021.tile1.nc \
20210323.060000.out_grd.ww3 "

export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export RESTART_N=12
Expand Down
5 changes: 3 additions & 2 deletions tests/tests/cpld_control_nowave_noaero_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,11 @@ export LIST_FILES="sfcf021.tile1.nc \
RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc"

#TODO: add comparison of CA restart files?
export DT_ATMOS=720

export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export RESTART_N=12
Expand Down Expand Up @@ -107,7 +108,7 @@ export UFS_CONFIGURE=ufs.configure.s2s_esmf.IN

export FV3_RUN=cpld_control_run.IN

export K_SPLIT=2
export K_SPLIT=4
export N_SPLIT=5

# HR4 GFSv17 GWD update
Expand Down
6 changes: 2 additions & 4 deletions tests/tests/cpld_control_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ export LIST_FILES="sfcf021.tile1.nc \
RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
20210323.060000.out_pnt.ww3 \
20210323.060000.out_grd.ww3 "

export DT_ATMOS=720
export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export RESTART_N=12
Expand All @@ -88,8 +88,6 @@ if [[ $MACHINE_ID = derecho ]]; then
TPN=96
fi

export DT_INNER=720
export DT_ATMOS=720
export K_SPLIT=4
export N_SPLIT=5

Expand Down
5 changes: 2 additions & 3 deletions tests/tests/cpld_control_p8.v2.sfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ export LIST_FILES="sfcf021.tile1.nc \
20210323.060000.out_pnt.ww3 \
20210323.060000.out_grd.ww3 "

export DT_ATMOS=720
export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export RESTART_N=12
Expand All @@ -89,8 +90,6 @@ if [[ $MACHINE_ID = derecho ]]; then
TPN=96
fi

export DT_INNER=720
export DT_ATMOS=720
export K_SPLIT=4
export N_SPLIT=5

Expand Down
5 changes: 2 additions & 3 deletions tests/tests/cpld_control_p8_faster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ export LIST_FILES="sfcf021.tile1.nc \
20210323.060000.out_pnt.ww3 \
20210323.060000.out_grd.ww3 "

export DT_ATMOS=720
export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export RESTART_N=12
Expand All @@ -84,8 +85,6 @@ export eps_imesh=2.5e-1

export FV3_RUN=cpld_control_run.IN

export DT_INNER=720
export DT_ATMOS=720
export K_SPLIT=4
export N_SPLIT=5

Expand Down
5 changes: 2 additions & 3 deletions tests/tests/cpld_control_p8_mixedmode
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,10 @@ export LIST_FILES="sfcf021.tile1.nc \
20210323.060000.out_pnt.ww3 \
20210323.060000.out_grd.ww3 "

export DT_ATMOS=720
export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export RESTART_N=12
Expand All @@ -84,8 +85,6 @@ export eps_imesh=2.5e-1

export FV3_RUN=cpld_control_run.IN

export DT_INNER=720
export DT_ATMOS=720
export K_SPLIT=4
export N_SPLIT=5

Expand Down
9 changes: 4 additions & 5 deletions tests/tests/cpld_control_pdlib_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ export LIST_FILES="sfcf021.tile1.nc \
20210323.060000.out_pnt.ww3 \
20210323.060000.out_grd.ww3 "

export DT_ATMOS=720
export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export RESTART_N=12
Expand Down Expand Up @@ -104,12 +105,10 @@ export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN

export FV3_RUN=cpld_control_run.IN

if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
WLCLK=40
if [[ $RT_COMPILER = gnu ]]; then
WLCLK=50
fi

export DT_INNER=720
export DT_ATMOS=720
export K_SPLIT=4
export N_SPLIT=5

Expand Down
6 changes: 2 additions & 4 deletions tests/tests/cpld_control_qr_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ export LIST_FILES="sfcf021.tile1.nc \
RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc \
20210323.060000.out_pnt.ww3 \
20210323.060000.out_grd.ww3 "

export DT_ATMOS=720
export_fv3
export_cpl
export_ugwpv1
export_cpl
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1

export QUILTING_RESTART=.true.
Expand All @@ -85,8 +85,6 @@ export eps_imesh=2.5e-1

export FV3_RUN=cpld_control_run.IN

export DT_INNER=720
export DT_ATMOS=720
export K_SPLIT=4
export N_SPLIT=5

Expand Down
Loading