Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…r-model into cleanup-ccpp-test-gfdlmp-split-clw
  • Loading branch information
climbfuji committed Nov 10, 2021
2 parents 6517a41 + ad73e8a commit 28c4df3
Show file tree
Hide file tree
Showing 32 changed files with 2,352 additions and 2,354 deletions.
2 changes: 1 addition & 1 deletion FV3
2 changes: 1 addition & 1 deletion stochastic_physics
216 changes: 108 additions & 108 deletions tests/RegressionTests_cheyenne.gnu.log

Large diffs are not rendered by default.

642 changes: 321 additions & 321 deletions tests/RegressionTests_cheyenne.intel.log

Large diffs are not rendered by default.

632 changes: 316 additions & 316 deletions tests/RegressionTests_gaea.intel.log

Large diffs are not rendered by default.

214 changes: 107 additions & 107 deletions tests/RegressionTests_hera.gnu.log

Large diffs are not rendered by default.

644 changes: 322 additions & 322 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

586 changes: 293 additions & 293 deletions tests/RegressionTests_jet.intel.log

Large diffs are not rendered by default.

626 changes: 313 additions & 313 deletions tests/RegressionTests_orion.intel.log

Large diffs are not rendered by default.

396 changes: 198 additions & 198 deletions tests/RegressionTests_wcoss_cray.log

Large diffs are not rendered by default.

638 changes: 319 additions & 319 deletions tests/RegressionTests_wcoss_dell_p3.log

Large diffs are not rendered by default.

13 changes: 3 additions & 10 deletions tests/default_vars.sh
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
export NSEED=1
export NFRACSEED=0.5
export CA_TRIGGER=.true.
Expand Down
2 changes: 1 addition & 1 deletion tests/detect_machine.sh
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
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
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
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
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
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
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
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=20211110
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 @@ -576,9 +576,11 @@ if [[ $ECFLOW == true ]]; then
ECF_TRIES=1
fi

# 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
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
export NSEED=1
export NFRACSEED=0.5
export CA_TRIGGER=.true.
Expand Down
10 changes: 5 additions & 5 deletions tests/tests/control_ca_restart
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
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit 28c4df3

Please sign in to comment.