Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
294 commits
Select commit Hold shift + click to select a range
3d86e14
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 1, 2021
89d6a02
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 7, 2021
c69e4a2
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 12, 2021
f540c3c
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 14, 2021
006d9cb
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 16, 2021
141df40
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 16, 2021
fb985c4
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 20, 2021
a6a1291
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 21, 2021
5cf0645
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 22, 2021
85d3a67
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 23, 2021
3f07e19
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 26, 2021
8c60f22
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 27, 2021
d1cf180
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 28, 2021
4fe664a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jul 30, 2021
37864a5
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 2, 2021
3e84f3f
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 5, 2021
3059f0d
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 6, 2021
2469f43
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 10, 2021
1ec3109
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 12, 2021
21e9efd
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 13, 2021
ea726bb
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 16, 2021
b8a72e9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 18, 2021
b8226c7
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 18, 2021
14c1b23
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 20, 2021
a986b47
update tests from v16bs2 branch
DeniseWorthen Aug 22, 2021
4fb5fd1
update default vars and new tests
DeniseWorthen Aug 22, 2021
819becc
remove new defaults from tests
DeniseWorthen Aug 22, 2021
24867df
test against baseline created using cpld_v16bs2 branch
DeniseWorthen Aug 22, 2021
8e39fd0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 23, 2021
cd890ed
Merge branch 'ufs-community:develop' into feature/cpld_v16
DeniseWorthen Aug 23, 2021
1fcb4be
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 25, 2021
2d2eb27
Merge branch 'ufs-community:develop' into feature/cpld_v16
DeniseWorthen Aug 25, 2021
e8b761f
update CMEPS/CMakeLists
DeniseWorthen Aug 25, 2021
a5f9971
add path to frac-grid input for atm ics
DeniseWorthen Aug 25, 2021
e925adb
add input directory path for cheyenne
DeniseWorthen Aug 25, 2021
3002b69
decomp,2threads and c384 restart fail, all others pass against test b…
DeniseWorthen Aug 26, 2021
63866ec
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 27, 2021
08d4c20
initial setup of cpld c48 mx400
DeniseWorthen Aug 30, 2021
81e28cc
changes for c48
DeniseWorthen Aug 30, 2021
5359a09
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 30, 2021
5969cac
fix error in 400 MOM input template
DeniseWorthen Aug 30, 2021
a6834c9
fix tasking for c48 coupled
DeniseWorthen Aug 31, 2021
64e91a8
reduce eps_imesh for the 4deg case, fix tasking
DeniseWorthen Aug 31, 2021
c0904c9
current testing setup
DeniseWorthen Aug 31, 2021
b8a2f24
switch more mom 400 for consistency w/ 100 template
DeniseWorthen Sep 1, 2021
2d5f500
update template_400
DeniseWorthen Sep 1, 2021
7da4a41
Merge branch 'develop' into feature/cpld_v16
DeniseWorthen Sep 1, 2021
00ab05f
Merge branch 'develop' into feature/addc48cpld
DeniseWorthen Sep 1, 2021
545bf59
try reverting cpld c48 to p6 configuration
DeniseWorthen Sep 1, 2021
c34b2ae
add c48 resources on cheyenne
DeniseWorthen Sep 1, 2021
ed28401
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 3, 2021
6f0a7d9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 3, 2021
ce809dd
Merge branch 'develop' into feature/cpld_v16
DeniseWorthen Sep 3, 2021
1a4fa22
Merge branch 'develop' into feature/addc48cpld
DeniseWorthen Sep 3, 2021
7ccadf0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 7, 2021
64c66da
Merge branch 'ufs-community:develop' into feature/cpld_v16
DeniseWorthen Sep 7, 2021
6c99fec
Merge branch 'ufs-community:develop' into feature/addc48cpld
DeniseWorthen Sep 7, 2021
2e1a39e
Merge branch 'develop' into feature/cpld_v16
DeniseWorthen Sep 7, 2021
ca5fa34
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 10, 2021
636dbed
Merge branch 'ufs-community:develop' into feature/cpld_v16
DeniseWorthen Sep 10, 2021
68907ae
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 13, 2021
80992b3
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 13, 2021
12adc19
Merge branch 'ufs-community:develop' into feature/cpld_v16
DeniseWorthen Sep 13, 2021
e3507ee
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 15, 2021
8850f2d
Merge branch 'develop' into feature/cpld_v16
DeniseWorthen Sep 17, 2021
9b635bf
fix ice decomp settings
DeniseWorthen Sep 17, 2021
6e2307b
Merge branch 'feature/cpld_v16' into feature/addc48cpld
DeniseWorthen Sep 18, 2021
e2e42e5
Merge branch 'feature/cpld_v16' into feature/addc48cpld
DeniseWorthen Sep 18, 2021
9be0b60
add cicedecomp fix for datm mx025
DeniseWorthen Sep 18, 2021
7f2f592
Merge branch 'feature/cpld_v16' into feature/addc48cpld
DeniseWorthen Sep 18, 2021
8236e7f
fix 400 template for parse
DeniseWorthen Sep 18, 2021
095eb9a
add c48 p7 test
DeniseWorthen Sep 19, 2021
2370742
switch to low res fix files
DeniseWorthen Sep 19, 2021
aba1051
add changes for bringing in control_p7 test
DeniseWorthen Sep 19, 2021
8748914
add changes for atm p7 test
DeniseWorthen Sep 19, 2021
1b4abcd
add control_p7
DeniseWorthen Sep 19, 2021
6ac2852
add secs to ice_in_template
DeniseWorthen Sep 19, 2021
2e3682a
update comment in control_p7
DeniseWorthen Sep 20, 2021
d2aa73a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 20, 2021
01d758a
Merge branch 'ufs-community:develop' into feature/cpld_v16
DeniseWorthen Sep 20, 2021
58019f3
set frac_grid true and fix fv3_conf/control_run
DeniseWorthen Sep 20, 2021
e607ab5
add tests and fix resources for wave test
DeniseWorthen Sep 21, 2021
fcb2067
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 21, 2021
19fa289
fix tests for non-global coupled
DeniseWorthen Sep 21, 2021
a2dc9c1
switch inputdata on hera
DeniseWorthen Sep 21, 2021
08ca4ab
Merge branch 'develop' into feature/cpld_v16
DeniseWorthen Sep 21, 2021
35df49f
switch to CICE branch containing icepack master
DeniseWorthen Sep 22, 2021
ff98419
point to FV3 branch with unused suites removed
DeniseWorthen Sep 22, 2021
947e293
remove compile_slurm.IN
DeniseWorthen Sep 22, 2021
26680f6
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 22, 2021
051fe98
Merge branch 'develop' into feature/cpld_v16
DeniseWorthen Sep 22, 2021
88850a4
remove temporary baseline path and fv3_slurm.IN
DeniseWorthen Sep 22, 2021
41d16df
fix tasking for low res wave test
DeniseWorthen Sep 22, 2021
5dd1313
remove old settings for low res wave tasks
DeniseWorthen Sep 22, 2021
54d97a9
revert ca settings in standalone p7 tests
DeniseWorthen Sep 22, 2021
852ce87
add p7 gnu test file
DeniseWorthen Sep 22, 2021
4dee404
update FV3 for additional suite removal
DeniseWorthen Sep 23, 2021
316f300
branch for testing whole atm test suite
DeniseWorthen Sep 23, 2021
d209554
add standalone p7 test suite
DeniseWorthen Sep 23, 2021
8477d2d
remove old ozone options in cpld_control_run
DeniseWorthen Sep 23, 2021
9990327
use Jun's restart fix for noahmp and ca
DeniseWorthen Sep 23, 2021
f712aa3
turn ca off for atm p7 tests
DeniseWorthen Sep 24, 2021
0dff574
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 24, 2021
a13397d
put temp fix for control_p7 restart
DeniseWorthen Sep 24, 2021
0fd65fa
switch fv3 to noahmp fix+mytoy decomp fix
DeniseWorthen Sep 24, 2021
361ffbf
Merge branch 'feature/cpld_v16bs5' of https://github.com/DeniseWorthe…
DeniseWorthen Sep 24, 2021
9de7a0a
fix control_run.IN for restart tests
DeniseWorthen Sep 24, 2021
96c8d6b
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 24, 2021
8075f97
update fv3
DeniseWorthen Sep 24, 2021
4cca3ad
update stoc physics
DeniseWorthen Sep 24, 2021
4f50630
Merge branch 'develop' into feature/cpld_v16bs5
DeniseWorthen Sep 24, 2021
37679c4
fix nst in control restart test
DeniseWorthen Sep 25, 2021
bd16e27
update to combined fixes
DeniseWorthen Sep 25, 2021
0b733cd
revert to just decomp fixes
DeniseWorthen Sep 26, 2021
e4e3a6c
add missing column in cpld wave test
DeniseWorthen Sep 26, 2021
fbbd781
all tests pass with CA turned off
DeniseWorthen Sep 26, 2021
0894eb2
Tests for gnu.p7 pass against a test baseline
DeniseWorthen Sep 27, 2021
1172ca1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 27, 2021
0ff76df
update to test decomp+ca fixes
DeniseWorthen Sep 28, 2021
e76ede9
update to match phil's pr
DeniseWorthen Sep 28, 2021
9ce13f5
add MOM6 build changes
DeniseWorthen Sep 28, 2021
a117000
add default settings for ocn stoch
DeniseWorthen Sep 28, 2021
7ce61a6
all p7 tests pass intel and gnu with ca turned on
DeniseWorthen Sep 28, 2021
244d96f
Merge branch 'feature/cpld_v16bs5' into feature/addc48cpld
DeniseWorthen Sep 28, 2021
d363525
c48 fixes
DeniseWorthen Sep 28, 2021
1f5fa8a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 29, 2021
7832c73
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 30, 2021
88e2814
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 1, 2021
50509d9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 6, 2021
3a6a419
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 7, 2021
2b89ec8
update to current develop
DeniseWorthen Oct 13, 2021
4b2dd5e
update
DeniseWorthen Oct 13, 2021
ab262be
Merge branch 'develop' into feature/addc48cpld
DeniseWorthen Oct 13, 2021
ff24740
updates
DeniseWorthen Oct 14, 2021
d29a0b8
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 18, 2021
c2b7b0c
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 19, 2021
674d882
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 22, 2021
168e54e
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 25, 2021
52c7e63
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 28, 2021
ea54384
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 28, 2021
d736817
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Oct 29, 2021
bf073a1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 2, 2021
b2de769
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 3, 2021
0f8f692
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 4, 2021
fd312b5
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 5, 2021
6425a09
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 5, 2021
80502fd
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 9, 2021
800273e
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 10, 2021
77fead6
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 12, 2021
40056b0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 17, 2021
de10ac9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 18, 2021
bb5ccb7
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 23, 2021
733fa3f
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 24, 2021
9295d8d
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 1, 2021
eee804b
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 2, 2021
293d786
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 6, 2021
b4062ca
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 9, 2021
e5ffaee
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 10, 2021
e01ffe8
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 13, 2021
ee7bcf1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 14, 2021
bec1fe4
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 15, 2021
eb19d61
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 17, 2021
6066dd5
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 17, 2021
d8853f1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 20, 2021
114520b
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 22, 2021
fe22fc5
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 27, 2021
cb913e0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Dec 28, 2021
b995195
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 3, 2022
a94b7a2
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 3, 2022
bfd08b1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 5, 2022
739a42b
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 7, 2022
2ea842d
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 10, 2022
32508cc
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 11, 2022
cbaddad
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 13, 2022
a84dab6
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 18, 2022
2d988ab
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 20, 2022
93dabe5
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 21, 2022
df6139c
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 24, 2022
eb94f97
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 25, 2022
81d7fd1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 26, 2022
2fccf25
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 27, 2022
a486179
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jan 28, 2022
c41a0dc
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Feb 1, 2022
4e29335
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Feb 2, 2022
0c7a70c
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Feb 3, 2022
bb0735a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Feb 4, 2022
9d5bcd5
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Feb 9, 2022
2e03e0f
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Feb 11, 2022
11aa114
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Feb 15, 2022
f654bad
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Feb 21, 2022
d1aae57
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Feb 22, 2022
c8347b7
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Feb 24, 2022
392d106
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 2, 2022
c3ad6eb
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 7, 2022
12c2924
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 11, 2022
c350ac3
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 14, 2022
b7f2a65
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 16, 2022
a756587
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 17, 2022
3adb9a8
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 18, 2022
0465fc5
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 18, 2022
cbefc4d
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 22, 2022
9f98cb4
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 25, 2022
2ae6dcf
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 27, 2022
f0fc10e
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 30, 2022
9f85bb4
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 30, 2022
e3b19c1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Mar 31, 2022
904df1b
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Apr 7, 2022
98d8b22
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Apr 8, 2022
3e204da
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Apr 11, 2022
e811115
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Apr 12, 2022
fca55bb
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Apr 18, 2022
7f1a81e
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Apr 20, 2022
f0af514
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Apr 23, 2022
9f4cbbf
update CMEPS
DeniseWorthen Apr 24, 2022
2391e4b
Revert "update CMEPS"
DeniseWorthen Apr 25, 2022
8353b9c
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Apr 28, 2022
f0b490f
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Apr 29, 2022
5caf30e
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 2, 2022
4f931a1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 3, 2022
29f451b
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 5, 2022
917f55d
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 9, 2022
7a9a5f1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 10, 2022
f546530
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 11, 2022
77d0651
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 18, 2022
dcd6ac7
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 19, 2022
b15a473
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 20, 2022
f2d4424
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 23, 2022
7211a4f
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 25, 2022
8b213b3
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 26, 2022
9cd72ad
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 29, 2022
8ebfbdd
Merge branch 'ufs-community:develop' into develop
DeniseWorthen May 31, 2022
80e511b
Merge branch 'develop' into feature/addc48cpld
DeniseWorthen Jun 1, 2022
115aaeb
Merge branch 'ufs-community:develop' into feature/addc48cpld
DeniseWorthen Jul 11, 2022
d7e962c
update cpld_c48 test
DeniseWorthen Jul 11, 2022
ce5f224
fix script errors
DeniseWorthen Jul 12, 2022
e51bf78
Merge branch 'ufs-community:develop' into feature/addc48cpld
DeniseWorthen Jul 14, 2022
755d8e4
update test to use 500 instead of 400
DeniseWorthen Jul 14, 2022
8422b07
add c48 restart; remove blank lines
DeniseWorthen Jul 14, 2022
8a8a5e3
add optional input for c48mx500
DeniseWorthen Jul 15, 2022
f6b582b
all cpld p8 control/restart tests pass
DeniseWorthen Jul 15, 2022
a70e8b7
Merge branch 'ufs-community:develop' into feature/addc48cpld
DeniseWorthen Jul 18, 2022
2141bf0
add missing warmstart c48 test
DeniseWorthen Jul 18, 2022
e9db039
update restart test
DeniseWorthen Jul 18, 2022
09e4fae
update restart test for c48mx500; point to input-data
DeniseWorthen Jul 18, 2022
a335da5
all existing orion.intel baselines are b4b
DeniseWorthen Jul 19, 2022
e17f46f
Merge branch 'ufs-community:develop' into feature/addc48cpld
DeniseWorthen Jul 20, 2022
3f5c02e
Merge branch 'ufs-community:develop' into feature/addc48cpld
DeniseWorthen Jul 21, 2022
1489996
remove rt.test, blank lines in ciceC test
DeniseWorthen Jul 21, 2022
3d97dd6
all baselines b4b except for added c48 tests
DeniseWorthen Jul 22, 2022
4d62975
point to default input-data directory
DeniseWorthen Jul 22, 2022
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
5 changes: 5 additions & 0 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
INPES_cpl_atmw=3; JNPES_cpl_atmw=8; WPG_cpl_atmw=6
WAV_tasks_atmw=30

TASKS_cpl_c48=20; THRD_cpl_c48=1
INPES_cpl_c48=1; JNPES_cpl_c48=1; WPG_cpl_c48=6
OCN_tasks_cpl_c48=4
ICE_tasks_cpl_c48=4

TASKS_cpl_dflt=200; THRD_cpl_dflt=1
INPES_cpl_dflt=3; JNPES_cpl_dflt=8; WPG_cpl_dflt=6
OCN_tasks_cpl_dflt=20
Expand Down
112 changes: 66 additions & 46 deletions tests/fv3_conf/cpld_control_run.IN
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@ if [[ $BMIC == .true. ]]; then
MOM_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/mom6_da
ICE_IC=@[INPUTDATA_ROOT_BMIC]/${SYEAR}${SMONTH}${SDAY}${SHOUR}/cpc
else
FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}
MOM_IC=@[INPUTDATA_ROOT]/MOM6_IC
ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}
if [[ $ATMRES == C48 ]]; then
FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
MOM_IC=@[INPUTDATA_ROOT]/MOM6_IC/${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}
else
FV3_IC=@[INPUTDATA_ROOT]/${FV3_DIR}/INPUT_L127_mx${OCNRES}
MOM_IC=@[INPUTDATA_ROOT]/MOM6_IC
ICE_IC=@[INPUTDATA_ROOT]/CICE_IC/${OCNRES}
fi
fi

# FV3 fixed input
Expand Down Expand Up @@ -72,53 +78,67 @@ if [ $WARM_START = .false. ]; then
cp ${MOM_IC}/MOM*.nc ./INPUT
cp ${ICE_IC}/cice5_model_@[ICERES].res_${SYEAR}${SMONTH}${SDAY}00.nc ./cice_model.res.nc
else
cp ${MOM_IC}/MOM6_IC_TS_${SYEAR}${SMONTH}${SDAY}${SHOUR}.nc ./INPUT/MOM6_IC_TS.nc
cp ${ICE_IC}/cice_model_@[ICERES].cpc.res_${SYEAR}${SMONTH}${SDAY}.nc ./cice_model.res.nc
if [[ $ATMRES == C48 ]]; then
cp ${MOM_IC}/MOM.res.nc ./INPUT
cp ${ICE_IC}/cice_model_@[ICERES].cpc.res_* ./cice_model.res.nc
else
cp ${MOM_IC}/MOM6_IC_TS_${SYEAR}${SMONTH}${SDAY}${SHOUR}.nc ./INPUT/MOM6_IC_TS.nc
cp ${ICE_IC}/cice_model_@[ICERES].cpc.res_${SYEAR}${SMONTH}${SDAY}.nc ./cice_model.res.nc
fi
fi
#Restart
else
if [[ ${OPNREQ_TEST} == true ]]; then
SUFFIX=${BL_SUFFIX}
fi
#Restart from checkpoint restart
if [[ "Q${DEP_RUN:-}" != Q ]] ; then
if [[ ${OPNREQ_TEST} == true ]]; then
SUFFIX=${BL_SUFFIX}
fi

# Restart files
cp -r ../${DEP_RUN}${SUFFIX}/INPUT/* ./INPUT
cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
for RFILE in INPUT/${RESTART_FILE_PREFIX}.*; do
[ -e $RFILE ] || exit 1
RFILE_OLD=$(basename $RFILE)
mv -f $RFILE INPUT/"${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
done

#if not mx025, then mom6 restart is a single file
if [[ $OCNRES == 025 ]]; then
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_1.nc ./INPUT/MOM.res_1.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_2.nc ./INPUT/MOM.res_2.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_3.nc ./INPUT/MOM.res_3.nc
else
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
fi

# CMEPS restart and pointer files
RFILE=ufs.cpld.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} .
ls -1 ${RFILE}>rpointer.cpl

# CMEPS/CCPP restart file
if [[ $CPLMODE =~ 'nems_frac_aoflux' ]]; then
RFILE_CCPP=ufs.cpld.cpl.ccpp.${RESTART_FILE_SUFFIX_SECS}.nc
cp ../${DEP_RUN}${SUFFIX}/${RFILE_CCPP} .
fi

# CICE restart and pointer files
RFILE=iced.${RESTART_FILE_SUFFIX_SECS}.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} ./INPUT
ls -1 ./INPUT/${RFILE}>ice.restart_file

# WAVE restart file
if [[ $CPLWAV == .true. ]]; then
cp ../${DEP_RUN}${SUFFIX}/${RESTART_FILE_PREFIX}.restart.ww3 ./restart.ww3
fi

# Restart files
cp -r ../${DEP_RUN}${SUFFIX}/INPUT/* ./INPUT
cp -r ../${DEP_RUN}${SUFFIX}/RESTART/${RESTART_FILE_PREFIX}.* ./INPUT
for RFILE in INPUT/${RESTART_FILE_PREFIX}.*; do
[ -e $RFILE ] || exit 1
RFILE_OLD=$(basename $RFILE)
mv -f $RFILE INPUT/"${RFILE_OLD//${RESTART_FILE_PREFIX}./}"
done

#if not mx025, then mom6 restart is a single file
if [[ $OCNRES == 025 ]]; then
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_1.nc ./INPUT/MOM.res_1.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_2.nc ./INPUT/MOM.res_2.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00_3.nc ./INPUT/MOM.res_3.nc
else
cp ../${DEP_RUN}${SUFFIX}/RESTART/MOM.res.${RESTART_FILE_SUFFIX_HRS}-00-00.nc ./INPUT/MOM.res.nc
fi

# CMEPS restart and pointer files
RFILE=ufs.cpld.cpl.r.${RESTART_FILE_SUFFIX_SECS}.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} .
ls -1 ${RFILE}>rpointer.cpl

# CMEPS/CCPP restart file
if [[ $CPLMODE =~ 'nems_frac_aoflux' ]]; then
RFILE_CCPP=ufs.cpld.cpl.ccpp.${RESTART_FILE_SUFFIX_SECS}.nc
cp ../${DEP_RUN}${SUFFIX}/${RFILE_CCPP} .
fi

# CICE restart and pointer files
RFILE=iced.${RESTART_FILE_SUFFIX_SECS}.nc
cp ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} ./INPUT
ls -1 ./INPUT/${RFILE}>ice.restart_file

# WAVE restart file
if [[ $CPLWAV == .true. ]]; then
cp ../${DEP_RUN}${SUFFIX}/${RESTART_FILE_PREFIX}.restart.ww3 ./restart.ww3
# C48mx500 warm start from ICs
cp ${FV3_IC}/*.nc ./INPUT
cp ${MOM_IC}/MOM.res.nc ./INPUT
cp ${ICE_IC}/* .
cp @[INPUTDATA_ROOT]/CMEPS_IC/${ATMRES}mx${OCNRES}/${SYEAR}${SMONTH}${SDAY}${SHOUR}/* .
fi
fi

Expand Down
Loading