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

Fix ugwpv1 timing / remove some extended WLCLK cases #2543

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix ugwpv1 timing / remove some extended WLCLK cases #2543

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d48edf
RT changes and timing bug fix
dpsarmie Dec 19, 2024
33637ba
Fix DT_INNER setting
dpsarmie Dec 19, 2024
95673d5
Merge branch 'ufs-community:develop' into fix/ugwpv1_timing
dpsarmie Dec 27, 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
3 changes: 2 additions & 1 deletion tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,7 @@ export HWRF_SAMFDEEP=.false.
export RAS=.false.
export RANDOM_CLDS=.false.
export CNVCLD=.true.
export XR_CNVCLD=.false.
export PROGSIGMA=.false.
export BETASCU=8.0
export BETAMCU=1.0
Expand Down Expand Up @@ -1187,7 +1188,7 @@ export_ugwpv1() {
esac

if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
if [[ ${SEDI_SEMI} = .false. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think DT_ATMOS stays the same and DT_INNER changes:
if [[ ${SEDI_SEMI} = .false. ]]; then export DT_INNER=$((DT_ATMOS/2)); fi

dt_inner in ccpp is for subcycling in the Thompson MP scheme

Copy link
Collaborator

Choose a reason for hiding this comment

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

I think SEDI_SEMI=.true. for all RTs that get here so there's no need to re-test anything you've done

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

You're right, got it fixed and it doesn't affect any of the RTs. Leaving the check in even if it doesn't get triggered for GW fidelity and reference.

export DT_INNER=${DT_ATMOS}
export default_dt_atmos=0
}
Expand Down
1 change: 1 addition & 0 deletions tests/parm/global_control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
random_clds = @[RANDOM_CLDS]
trans_trac = @[TRANS_TRAC]
cnvcld = @[CNVCLD]
xr_cnvcld = @[XR_CNVCLD]
imfshalcnv = @[IMFSHALCNV]
imfdeepcnv = @[IMFDEEPCNV]
progsigma = @[PROGSIGMA]
Expand Down
3 changes: 3 additions & 0 deletions tests/tests/control_2threads_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,7 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export K_SPLIT=2
export N_SPLIT=4

export SATMEDMF=.true.
3 changes: 3 additions & 0 deletions tests/tests/control_CubedSphereGrid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,8 @@ export IOVR=3

export WRITE_DOPOST=.false.

export K_SPLIT=2
export N_SPLIT=4

export FV3_RUN=control_run.IN
export INPUT_NML=global_control.nml.IN
3 changes: 3 additions & 0 deletions tests/tests/control_CubedSphereGrid_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,8 @@ export IAER=5111
export IOVR=3
export OUTPUT_FH="0 1"

export K_SPLIT=2
export N_SPLIT=4

export FV3_RUN=control_run.IN
export INPUT_NML=global_control.nml.IN
3 changes: 3 additions & 0 deletions tests/tests/control_CubedSphereGrid_parallel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,8 @@ export IOVR=3
export HISTORY_FILE_ON_NATIVE_GRID=.true.
export WRITE_DOPOST=.true.

export K_SPLIT=2
export N_SPLIT=4

export FV3_RUN=control_run.IN
export INPUT_NML=global_control.nml.IN
3 changes: 3 additions & 0 deletions tests/tests/control_debug_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@ export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

export K_SPLIT=2
export N_SPLIT=4

if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then
ZSTANDARD_LEVEL=5
fi
3 changes: 3 additions & 0 deletions tests/tests/control_decomp_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,7 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export K_SPLIT=2
export N_SPLIT=4

export SATMEDMF=.true.
2 changes: 2 additions & 0 deletions tests/tests/control_latlon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ export IAER=5111
export IOVR=3
export OUTPUT_FH='0 24'

export K_SPLIT=2
export N_SPLIT=4

export FV3_RUN=control_run.IN
export INPUT_NML=global_control.nml.IN
3 changes: 3 additions & 0 deletions tests/tests/control_noqr_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,7 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export K_SPLIT=2
export N_SPLIT=4

export SATMEDMF=.true.
3 changes: 3 additions & 0 deletions tests/tests/control_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

export K_SPLIT=2
export N_SPLIT=4

if [[ " hera orion hercules jet " =~ " ${MACHINE_ID} " ]] ; then
ZSTANDARD_LEVEL=5
fi
3 changes: 3 additions & 0 deletions tests/tests/control_p8_lndp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,4 +114,7 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export K_SPLIT=2
export N_SPLIT=4

export SATMEDMF=.true.
3 changes: 3 additions & 0 deletions tests/tests/control_p8_ugwpv1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,6 @@ export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export SATMEDMF=.true.

export K_SPLIT=2
export N_SPLIT=4
3 changes: 3 additions & 0 deletions tests/tests/control_restart_noqr_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,7 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export K_SPLIT=2
export N_SPLIT=4

export SATMEDMF=.true.
3 changes: 3 additions & 0 deletions tests/tests/control_restart_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,7 @@ export DOGP_CLDOPTICS_LUT=.true.
export DOGP_LWSCAT=.true.
export DOGP_SGS_CNV=.true.

export K_SPLIT=2
export N_SPLIT=4

export SATMEDMF=.true.
3 changes: 3 additions & 0 deletions tests/tests/control_wrtGauss_netcdf_parallel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ export OUTPUT_FILE="'netcdf_parallel' 'netcdf_parallel'"
export IDEFLATE=1
export QUANTIZE_NSD=14

export K_SPLIT=2
export N_SPLIT=4

export FV3_RUN=control_run.IN
export INPUT_NML=global_control.nml.IN
3 changes: 3 additions & 0 deletions tests/tests/control_wrtGauss_netcdf_parallel_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,8 @@ export IDEFLATE=1
export QUANTIZE_NSD=14
export OUTPUT_FH="0 1"

export K_SPLIT=2
export N_SPLIT=4

export FV3_RUN=control_run.IN
export INPUT_NML=global_control.nml.IN
6 changes: 1 addition & 5 deletions tests/tests/cpld_control_gfsv17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,7 @@ export WW3_RSTFLDS="ice"
export PROGSIGMA=.true.
export IOPT_DIAG=2

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

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

# HR4 GFSv17 GWD update
Expand Down
5 changes: 2 additions & 3 deletions tests/tests/cpld_control_gfsv17_iau
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,8 @@ export IAU_INC_FILES="'fv_increment3.nc','fv_increment6.nc','fv_increment9.nc'"
export ODA_INCUPD="True"
export ODA_INCUPD_UV="True"

if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
WLCLK=40
fi
export K_SPLIT=4
export N_SPLIT=5

# HR4 GFSv17 GWD update
export DO_GWD_OPT_PSL=.true.
Expand Down
10 changes: 3 additions & 7 deletions tests/tests/cpld_debug_gfsv17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ export LIST_FILES="sfcf003.tile1.nc \
ufs.cpld.ww3.r.2021-03-22-32400.nc \
20210322.090000.out_pnt.ww3 \
20210322.090000.out_grd.ww3 "
export DT_ATMOS=360
export_fv3
export_ugwpv1
export_cpl
Expand Down Expand Up @@ -109,18 +108,15 @@ export FV3_RUN=cpld_control_run.IN
export K_SPLIT=2
export N_SPLIT=5

if [[ $MACHINE_ID = hera ]] && [[ $RT_COMPILER = gnu ]]; then
WLCLK=40
fi
if [[ $MACHINE_ID = gaeac5 ]] && [[ $RT_COMPILER = intelllvm ]]; then
WLCLK=40
fi
if [[ $MACHINE_ID = gaeac6 ]] && [[ $RT_COMPILER = intelllvm ]]; then
WLCLK=40
fi
if [[ $MACHINE_ID = orion ]]; then
WLCLK=40
fi

export K_SPLIT=4
export N_SPLIT=5

# HR4 GFSv17 GWD update
export DO_GWD_OPT_PSL=.true.
Expand Down
8 changes: 2 additions & 6 deletions tests/tests/cpld_debug_pdlib_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ export LIST_FILES="sfcf003.tile1.nc \
20210322.090000.out_pnt.ww3 \
20210322.090000.out_grd.ww3 "

export DT_ATMOS=720
export_fv3
export_ugwpv1
export_cpl
Expand Down Expand Up @@ -100,15 +99,12 @@ export UFS_CONFIGURE=ufs.configure.s2sw_fast_esmf.IN

export FV3_RUN=cpld_control_run.IN

if [[ $MACHINE_ID = hera ]] || [[ $MACHINE_ID = jet ]]; then
if [[ $MACHINE_ID = jet ]]; then
WLCLK=50
fi
if [[ $MACHINE_ID = hercules && $RT_COMPILER = intelllvm ]]; then
WLCLK=50
fi
if [[ $MACHINE_ID = orion ]]; then
WLCLK=50
fi
if [[ $MACHINE_ID = gaeac5 ]] && [[ $RT_COMPILER = intelllvm ]]; then
WLCLK=50
fi
Expand All @@ -121,7 +117,7 @@ fi

# set component and coupling timesteps due to long
# runtime
export K_SPLIT=2
export K_SPLIT=4
export N_SPLIT=5

# HR4 GFSv17 GWD update
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/cpld_mpi_gfsv17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,9 @@ export WW3_RSTFLDS="ice"
export PROGSIGMA=.true.
export IOPT_DIAG=2

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


# HR4 GFSv17 GWD update
export DO_GWD_OPT_PSL=.true.
export DO_GSL_DRAG_SS=.false.
2 changes: 1 addition & 1 deletion tests/tests/cpld_restart_gfsv17
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export WW3_RSTFLDS="ice"
export PROGSIGMA=.true.
export IOPT_DIAG=2

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

# HR4 GFSv17 GWD update
Expand Down
3 changes: 3 additions & 0 deletions tests/tests/cpld_s2sa_p8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ export UFS_CONFIGURE=ufs.configure.s2sa_esmf.IN

export FV3_RUN=cpld_control_run.IN

export K_SPLIT=4
export N_SPLIT=5

# HR4 GFSv17 GWD update
export DO_UGWP_V0=.false.
export DO_UGWP_V1=.true.
Expand Down
Loading