Skip to content

Update to CA scale parameters for better scaling across resolutions; Fix regression testing and throttled builds on S4 (was #896) #888

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

Merged
DeniseWorthen merged 23 commits into from
Nov 10, 2021
Merged

Update to CA scale parameters for better scaling across resolutions; Fix regression testing and throttled builds on S4 (was #896) #888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9ff5c2f
updates to FV3 and stochastic_physics submodules
lisa-bengtsson Oct 25, 2021
e713294
update test cases with new namelist settings
lisa-bengtsson Oct 25, 2021
3c88c5a
merge with FV3 and stochastic physics develop branch
lisa-bengtsson Oct 25, 2021
a36a356
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
lisa-bengtsson Oct 25, 2021
a537991
merge with develop
lisa-bengtsson Nov 8, 2021
56efdfd
update ncells specification
lisa-bengtsson Nov 8, 2021
89b5a66
update hafs namelists
lisa-bengtsson Nov 8, 2021
91ceced
revert rt.conf rt.sh
lisa-bengtsson Nov 8, 2021
c4d25bb
update default_vars.sh
lisa-bengtsson Nov 9, 2021
2954bdf
merge with develop
lisa-bengtsson Nov 9, 2021
ed9104b
merge with PR 894
lisa-bengtsson Nov 9, 2021
5112904
Update BL_DATE to 20211109
lisa-bengtsson Nov 9, 2021
5727523
default_vars.sh updated
lisa-bengtsson Nov 9, 2021
7218212
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA Nov 9, 2021
4641163
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Nov 9, 2021
717b72a
add wcoss_cray log
DeniseWorthen Nov 9, 2021
2440477
RT JOBS PASSED: orion.intel. Log file uploaded.
BrianCurtis-NOAA Nov 9, 2021
8fc1650
RT JOBS PASSED: hera.intel. Log file uploaded.
BrianCurtis-NOAA Nov 9, 2021
062175d
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA Nov 9, 2021
8277cbc
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Nov 10, 2021
d55f19e
add wcoss_dell_p3 log
DeniseWorthen Nov 10, 2021
6f9b1a4
RT JOBS PASSED: jet.intel. Log file uploaded.
BrianCurtis-NOAA Nov 10, 2021
12d721f
update FV3 and stochastic_physics, revert submodules
DeniseWorthen Nov 10, 2021
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 FV3
Open in desktop
Submodule FV3 updated from 699d1e to b5bdf4
2 changes: 1 addition & 1 deletion stochastic_physics
Open in desktop
Submodule stochastic_physics updated from f98578 to 4e8a7c
216 changes: 108 additions & 108 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

642 changes: 321 additions & 321 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

632 changes: 316 additions & 316 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

644 changes: 322 additions & 322 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

586 changes: 293 additions & 293 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

626 changes: 313 additions & 313 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

396 changes: 198 additions & 198 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

638 changes: 319 additions & 319 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 3 additions & 10 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,16 +531,8 @@ export CDMBWD_c192='0.23,1.5,1.0,1.0'
export CDMBWD_c384='1.1,0.72,1.0,1.0'
export CDMBWD_c768='4.0,0.15,1.0,1.0'

# CA tunable parameter
export RCELL_c48=0.1
export RCELL_c96=0.1
export RCELL_c192=0.2
export RCELL_c384=0.72
export RCELL_c768=0.72

# set default
export CDMBWD=${CDMBWD_c96}
export RCELL=${RCELL_c96}

# PBL
export SATMEDMF=.false.
Expand Down Expand Up @@ -821,8 +813,9 @@ export DO_CA=.true.
export CA_SGS=.true.
export CA_GLOBAL=.false.
export NCA=1
export SCELLS=2600
export TLIVES=1800
export NCELLS=5
export NLIVES=12
export NTHRESH=18
Comment thread
DeniseWorthen marked this conversation as resolved.
export NSEED=1
export NFRACSEED=0.5
export CA_TRIGGER=.true.
Expand Down
2 changes: 1 addition & 1 deletion tests/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ MACHINE_ID=${RT_MACHINE:-${MACHINE_ID}}

# Append compiler
if [ $MACHINE_ID = orion ] || [ $MACHINE_ID = hera ] || [ $MACHINE_ID = cheyenne ] || [ $MACHINE_ID = jet ] || \
[ $MACHINE_ID = gaea ] || [ $MACHINE_ID = stampede ] || [ $MACHINE_ID = s4] || [ $MACHINE_ID = expanse ] ; then
[ $MACHINE_ID = gaea ] || [ $MACHINE_ID = stampede ] || [ $MACHINE_ID = s4 ] || [ $MACHINE_ID = expanse ] ; then
MACHINE_ID=${MACHINE_ID}.${RT_COMPILER}
fi

Expand Down
6 changes: 3 additions & 3 deletions tests/parm/control_ca.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ deflate_level=1
ca_sgs = @[CA_SGS]
ca_global = @[CA_GLOBAL]
nca = 1
scells = 2600
tlives = 1800
ncells = 5
nlives = 12
nseed = 100
nfracseed = 0.5
rcell = @[RCELL]
nthresh = 18
ca_trigger = .True.
ca_entr = .False.
ca_closure = .False.
Expand Down
6 changes: 3 additions & 3 deletions tests/parm/cpld_control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,11 @@ deflate_level=1
ca_global = @[CA_GLOBAL]
ca_sgs = @[CA_SGS]
nca = @[NCA]
scells = @[SCELLS]
tlives = @[TLIVES]
ncells = @[NCELLS]
nlives = @[NLIVES]
nseed = @[NSEED]
nfracseed = @[NFRACSEED]
rcell = @[RCELL]
nthresh = @[NTHRESH]
ca_trigger = @[CA_TRIGGER]
nspinup = @[NSPINUP]
iseed_ca = @[ISEED_CA]
Expand Down
4 changes: 2 additions & 2 deletions tests/parm/input_global_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@
do_ca = .false.
ca_sgs = .false.
nca = 1
scells = 2600
tlives = 1800
ncells = 5
Comment thread
MinsukJi-NOAA marked this conversation as resolved.
nlives = 12
nseed = 1
nfracseed = 0.5
ca_trigger = .false.
Expand Down
5 changes: 3 additions & 2 deletions tests/parm/input_nest_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,9 @@
do_ca = .false.
ca_sgs = .false.
nca = 1
scells = 2600
tlives = 1800
ncells = 5
nlives = 12
nthresh = 18
nseed = 1
nfracseed = 0.5
ca_trigger = .false.
Expand Down
4 changes: 2 additions & 2 deletions tests/parm/input_regional_hafs.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@
do_ca = .false.
ca_sgs = .false.
nca = 1
scells = 2600
tlives = 1800
ncells = 5
nlives = 12
nseed = 1
nfracseed = 0.5
ca_trigger = .false.
Expand Down
6 changes: 4 additions & 2 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
TEST_35D=true
fi

BL_DATE=20211108
BL_DATE=20211109
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
else
Expand Down Expand Up @@ -570,9 +570,11 @@ if [[ $ECFLOW == true ]]; then
MAX_BUILDS=10
MAX_JOBS=30

# Reduce maximum number of compile jobs on jet.intel because of licensing issues
# Reduce maximum number of compile jobs on jet.intel and s4.intel because of licensing issues
if [[ $MACHINE_ID = jet.intel ]]; then
MAX_BUILDS=5
elif [[ $MACHINE_ID = s4.intel ]]; then
MAX_BUILDS=1
fi

if [[ $MACHINE_ID = hera.* ]] && [[ ! $HOSTNAME = hecflow* ]]; then
Expand Down
5 changes: 3 additions & 2 deletions tests/tests/control_2threads_p7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,9 @@ export DO_CA=.true.
export CA_SGS=.true.
export CA_GLOBAL=.false.
export NCA=1
export SCELLS=2600
export TLIVES=1800
export NCELLS=5
export NLIVES=12
export NTHRESH=18
Comment thread
DeniseWorthen marked this conversation as resolved.
export NSEED=1
export NFRACSEED=0.5
export CA_TRIGGER=.true.
Expand Down
10 changes: 5 additions & 5 deletions tests/tests/control_ca_restart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ export NA_INIT=0
export DO_CA=.true.
export CA_SGS=.true.
export CA_GLOBAL=.true.
export NLIVES=24
export NSEED=100
export NTHRESH=8
export NCELLS=5
export NLIVES=12
export NSEED=1
export NTHRESH=18
export CA_SMOOTH=.true.
export NSPINUP=100
export NSPINUP=1
export ISEED_CA=12345
export NSMOOTH=100
export CA_AMPLITUDE=0.35
export RCELL=${RCELL_c96}
export LNDP_VAR_LIST="'XXX'"
export LNDP_PRT_LIST=-9999
export RESTART_FILE_PREFIX="${SYEAR}${SMONTH}${SDAY}.$(printf "%02d" $(( ${SHOUR} + ${FHROT} )))0000"
5 changes: 3 additions & 2 deletions tests/tests/control_debug_p7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ export DO_CA=.true.
export CA_SGS=.true.
export CA_GLOBAL=.false.
export NCA=1
export SCELLS=2600
export TLIVES=1800
export NCELLS=5
export NLIVES=12
export NTHRESH=18
export NSEED=1
export NFRACSEED=0.5
export CA_TRIGGER=.true.
Expand Down
5 changes: 3 additions & 2 deletions tests/tests/control_decomp_p7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ export DO_CA=.true.
export CA_SGS=.true.
export CA_GLOBAL=.false.
export NCA=1
export SCELLS=2600
export TLIVES=1800
export NCELLS=5
export NLIVES=12
export NTHRESH=18
export NSEED=1
export NFRACSEED=0.5
export CA_TRIGGER=.true.
Expand Down
11 changes: 6 additions & 5 deletions tests/tests/control_lndp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@ export INPUT_NML=control_ca.nml.IN
export DO_CA=.false.
export CA_SGS=.false.
export CA_GLOBAL=.false.
export NLIVES=30
export NSEED=1000000
export NTHRESH=0
export NLIVES=12
export NCELLS=5
export NSEED=1
export NTHRESH=18
export CA_SMOOTH=.false.
export NSPINUP=100
export NSPINUP=1
export ISEED_CA=1
export NSMOOTH=1
export CA_AMPLITUDE=0.5
export CA_AMPLITUDE=0.35
export LNDP_TYPE=2
export N_VAR_LNDP=2
export LNDP_VAR_LIST="'smc' , 'vgf',"
Expand Down
11 changes: 6 additions & 5 deletions tests/tests/control_lndp_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ export INPUT_NML=control_ca.nml.IN
export DO_CA=.false.
export CA_SGS=.false.
export CA_GLOBAL=.false.
export NLIVES=30
export NSEED=1000000
export NTHRESH=0
export NLIVES=12
export NCELLS=5
export NSEED=1
export NTHRESH=18
export CA_SMOOTH=.false.
export NSPINUP=100
export NSPINUP=1
export ISEED_CA=1
export NSMOOTH=1
export CA_AMPLITUDE=0.5
export CA_AMPLITUDE=0.35
export LNDP_TYPE=2
export N_VAR_LNDP=2
export LNDP_VAR_LIST="'smc' , 'vgf',"
Expand Down
5 changes: 3 additions & 2 deletions tests/tests/control_p7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,9 @@ export DO_CA=.true.
export CA_SGS=.true.
export CA_GLOBAL=.false.
export NCA=1
export SCELLS=2600
export TLIVES=1800
export NCELLS=5
export NLIVES=12
export NTHRESH=18
export NSEED=1
export NFRACSEED=0.5
export CA_TRIGGER=.true.
Expand Down
5 changes: 3 additions & 2 deletions tests/tests/control_restart_p7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ export DO_CA=.true.
export CA_SGS=.true.
export CA_GLOBAL=.false.
export NCA=1
export SCELLS=2600
export TLIVES=1800
export NCELLS=5
export NLIVES=12
export NTHRESH=18
export NSEED=1
export NFRACSEED=0.5
export CA_TRIGGER=.true.
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_bmark_p7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ export BLCKY=`expr $NY_GLB / 2`

# resolution dependent setting
export CDMBWD=${CDMBWD_c384}
export RCELL=${RCELL_c384}

# set component and coupling timesteps
export DT_ATMOS=300
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_control_c192_p7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ export BLCKY=`expr $NY_GLB / 2`

# resolution dependent setting
export CDMBWD=${CDMBWD_c192}
export RCELL=${RCELL_c192}

# set component and coupling timesteps
export DT_ATMOS=600
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_control_c384_p7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ export BLCKY=`expr $NY_GLB / 2`

# resolution dependent setting
export CDMBWD=${CDMBWD_c384}
export RCELL=${RCELL_c384}

# set component and coupling timesteps
export DT_ATMOS=300
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_restart_c192_p7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ export BLCKY=`expr $NY_GLB / 2`

# resolution dependent setting
export CDMBWD=${CDMBWD_c192}
export RCELL=${RCELL_c192}

# set component and coupling timesteps
export DT_ATMOS=600
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_restart_c384_p7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ export BLCKY=`expr $NY_GLB / 2`

# resolution dependent setting
export CDMBWD=${CDMBWD_c384}
export RCELL=${RCELL_c384}

# set component and coupling timesteps
export DT_ATMOS=300
Expand Down