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.

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

Update CICE cap for optional features; use UPP as submodule (was #904) #910

Merged
merged 145 commits into from
Nov 22, 2021
Merged
Show file tree
Hide file tree
Changes from 121 commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
7b826d4
update FV3
DeniseWorthen Mar 27, 2021
cea6fc6
update hera.intel modulefiles for testing
DeniseWorthen Mar 27, 2021
071275b
Revert "update hera.intel modulefiles for testing"
DeniseWorthen Mar 27, 2021
4db2ff2
Revert "update FV3"
DeniseWorthen Mar 27, 2021
5a8d4b6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 30, 2021
09716fe
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 31, 2021
f778ec2
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 5, 2021
3ae6d69
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 9, 2021
f187e64
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 10, 2021
94f5e67
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 12, 2021
4100179
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 15, 2021
42d1a64
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 16, 2021
8a5575b
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 19, 2021
9a06325
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 20, 2021
6ba165f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 21, 2021
1602558
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 22, 2021
2208dea
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 26, 2021
217e3f0
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 27, 2021
c553a61
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 28, 2021
52625f5
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 30, 2021
a248612
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 30, 2021
9a80b95
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 3, 2021
2ad32ab
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 5, 2021
258dc4e
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 7, 2021
20210f7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 10, 2021
750b914
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 12, 2021
4f02568
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 13, 2021
a3fd6ad
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 14, 2021
4a082c0
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 18, 2021
8ff5a46
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 21, 2021
a66de98
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 21, 2021
9d13add
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 25, 2021
41e1e70
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 26, 2021
a04c704
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 29, 2021
2c312c6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 2, 2021
ceaf7ea
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 3, 2021
e32547f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 4, 2021
128a986
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 8, 2021
9666be5
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 9, 2021
cf494c7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 10, 2021
2e74cf4
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 11, 2021
2718b15
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jun 14, 2021
c00af41
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jun 17, 2021
7102b14
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Jun 17, 2021
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
8e39fd0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 23, 2021
1fcb4be
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 25, 2021
63866ec
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 27, 2021
5359a09
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Aug 30, 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
7ccadf0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 7, 2021
ca5fa34
Merge branch 'ufs-community:develop' into develop
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
e3507ee
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 15, 2021
d2aa73a
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 20, 2021
fcb2067
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 21, 2021
26680f6
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 22, 2021
0dff574
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 24, 2021
96c8d6b
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 24, 2021
1172ca1
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Sep 27, 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
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
8553d9e
Update FV3
DusanJovic-NOAA Nov 5, 2021
eaac7d2
Use upp as a submodule
DusanJovic-NOAA 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
095bfc7
Merge remote-tracking branch 'origin/develop' into upp_submodule
DusanJovic-NOAA Nov 9, 2021
8158766
Do not load upp module on wcoss_cray
DusanJovic-NOAA Nov 9, 2021
33cac39
Update FV3
DusanJovic-NOAA Nov 10, 2021
800273e
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 10, 2021
71b51d6
update CICE submodule
DeniseWorthen Nov 10, 2021
16b0a5a
update CICE submodule
DeniseWorthen Nov 12, 2021
77fead6
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 12, 2021
d3d4981
Merge branch 'ufs-community:develop' into feature/updcicecap
DeniseWorthen Nov 12, 2021
11f46e6
update ca-namelist variables
DeniseWorthen Nov 12, 2021
e795527
Merge branch 'feature/updcicecap' of https://github.com/DeniseWorthen…
DeniseWorthen Nov 12, 2021
e2baeb2
clean up ca settings
DeniseWorthen Nov 16, 2021
f631647
Merge remote-tracking branch 'origin/develop' into upp_submodule
DusanJovic-NOAA Nov 16, 2021
292d099
Merge remote-tracking branch 'DusanJovic/upp_submodule' into feature/…
DeniseWorthen Nov 16, 2021
c58a111
cpld bmark p7 35d test (#21)
MinsukJi-NOAA Nov 16, 2021
5d4f139
update days,fhmax and wlclk for 35d run
DeniseWorthen Nov 16, 2021
0136d26
All baselines pass on hera.intel
DeniseWorthen Nov 16, 2021
40056b0
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 17, 2021
e2f8528
Merge branch 'ufs-community:develop' into feature/updcicecap
DeniseWorthen Nov 17, 2021
435fe4c
Fix CI. Run cpld_control_c96_p7 instead of cpld_control_p7 (#22)
MinsukJi-NOAA Nov 17, 2021
de10ac9
Merge branch 'ufs-community:develop' into develop
DeniseWorthen Nov 18, 2021
6b624e6
update FV3 submodule
DeniseWorthen Nov 19, 2021
3ad3eee
Merge branch 'develop' into feature/updcicecap
DeniseWorthen Nov 19, 2021
eb271e3
add wcoss_cray log
DeniseWorthen Nov 19, 2021
e440c22
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
1776f5b
RT JOBS PASSED: hera.intel. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
4321225
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
9612021
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
1bb5baa
RT JOBS PASSED: orion.intel. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
2d66ffe
RT JOBS PASSED: jet.intel. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
d6466ff
update BL date
DeniseWorthen Nov 19, 2021
a45e9e2
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
372f4ce
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
c258aee
RT JOBS PASSED: orion.intel. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
371f0ef
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
f5b9326
RT JOBS PASSED: hera.intel. Log file uploaded.
BrianCurtis-NOAA Nov 19, 2021
05cf51b
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Nov 20, 2021
b095fea
RT JOBS PASSED: jet.intel. Log file uploaded.
BrianCurtis-NOAA Nov 20, 2021
1bd1aa9
add wcoss logs
DeniseWorthen Nov 20, 2021
fb04cdf
update CICE and revert gitmodule
DeniseWorthen Nov 22, 2021
2dcc809
update FV3 and revert gitmodules
DeniseWorthen Nov 22, 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
10 changes: 6 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
url = https://github.com/DusanJovic-NOAA/fv3atm
branch = upp_submodule
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down Expand Up @@ -32,8 +32,10 @@
branch = dev/emc
[submodule "CICE"]
path = CICE-interface/CICE
url = https://github.com/NOAA-EMC/CICE
branch = emc/develop
#url = https://github.com/NOAA-EMC/CICE
#branch = emc/develop
url = https://github.com/DeniseWorthen/CICE
branch = feature/updatecap
[submodule "CDEPS"]
path = CDEPS-interface/CDEPS
url = https://github.com/NOAA-EMC/CDEPS
Expand Down
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ endif()
find_package(bacio REQUIRED)
find_package(sp REQUIRED)
find_package(w3nco REQUIRED)
if(INLINE_POST)
find_package(upp REQUIRED)
endif()

# Configure Python
find_package(Python 3 REQUIRED COMPONENTS Interpreter)
Expand Down
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 3 files
+4 −0 .gitmodules
+2 −0 CMakeLists.txt
+1 −0 upp
1 change: 0 additions & 1 deletion modulefiles/ufs_common
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module load g2tmpl/1.10.0
module load ip/3.3.3
module load sp/2.3.3
module load w3nco/2.4.1
module load upp/10.0.10

module load gftl-shared/v1.3.3
module load yafyaml/v0.5.1
Expand Down
1 change: 0 additions & 1 deletion modulefiles/ufs_common_debug
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module load g2tmpl/1.10.0
module load ip/3.3.3
module load sp/2.3.3
module load w3nco/2.4.1
module load upp/10.0.10

module load gftl-shared/v1.3.3
module load yafyaml/v0.5.1
Expand Down
6 changes: 0 additions & 6 deletions modulefiles/ufs_wcoss_cray
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1

module load gfsio/1.4.1
module load sfcio/1.4.1
module load sigio/2.3.2

module load upp/10.0.10

## WCOSS Cray execution prereqs:
module load rca
module load alps
Expand Down
6 changes: 0 additions & 6 deletions modulefiles/ufs_wcoss_cray_debug
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1

module load gfsio/1.4.1
module load sfcio/1.4.1
module load sigio/2.3.2

module load upp/10.0.10

## WCOSS Cray execution prereqs:
module load rca
module load alps
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
ncells = 5
nlives = 12
ncells = @[NCELLS]
nlives = @[NLIVES]
nseed = 100
nfracseed = 0.5
nthresh = 18
nthresh = @[NTHRESH]
ca_trigger = .True.
ca_entr = .False.
ca_closure = .False.
Expand Down
20 changes: 0 additions & 20 deletions tests/parm/input_global_hafs.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -228,26 +228,6 @@
do_skeb = .false.
lndp_type = 0
n_var_lndp = 0
do_ca = .false.
ca_sgs = .false.
nca = 1
ncells = 5
nlives = 12
nseed = 1
nfracseed = 0.5
ca_trigger = .false.
ca_entr = .false.
ca_closure = .false.
ca_global = .false.
nca_g = 1
ncells_g = 1
nlives_g = 100
nseed_g = 100
ca_smooth = .false.
nspinup = 1
iseed_ca = 1
nsmooth = 100
ca_amplitude = 0.35
/

&gfdl_cloud_microphysics_nml
Expand Down
21 changes: 0 additions & 21 deletions tests/parm/input_nest_hafs.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -217,27 +217,6 @@
do_skeb = .false.
lndp_type = 0
n_var_lndp = 0
do_ca = .false.
ca_sgs = .false.
nca = 1
ncells = 5
nlives = 12
nthresh = 18
nseed = 1
nfracseed = 0.5
ca_trigger = .false.
ca_entr = .false.
ca_closure = .false.
ca_global = .false.
nca_g = 1
ncells_g = 1
nlives_g = 100
nseed_g = 100
ca_smooth = .false.
nspinup = 1
iseed_ca = 1
nsmooth = 100
ca_amplitude = 0.35
/

&gfdl_cloud_microphysics_nml
Expand Down
20 changes: 0 additions & 20 deletions tests/parm/input_regional_hafs.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -232,26 +232,6 @@
do_skeb = .false.
lndp_type = 0
n_var_lndp = 0
do_ca = .false.
ca_sgs = .false.
nca = 1
ncells = 5
nlives = 12
nseed = 1
nfracseed = 0.5
ca_trigger = .false.
ca_entr = .false.
ca_closure = .false.
ca_global = .false.
nca_g = 1
ncells_g = 1
nlives_g = 100
nseed_g = 100
ca_smooth = .false.
nspinup = 1
iseed_ca = 1
nsmooth = 100
ca_amplitude = 0.35
/

&gfdl_cloud_microphysics_nml
Expand Down
27 changes: 9 additions & 18 deletions tests/rt_35d.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,12 @@
# CPLD Benchmark 35d tests #
###############################################################################################################################################################################

COMPILE | APP=S2SW SUITES=FV3_GFS_v16_coupled,FV3_GFS_v16_coupled_noahmp,FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | + hera.intel orion.intel gaea.intel | fv3 | |
#RUN | cpld_bmark_wave_v16_noahmp_35d | | fv3 | | 2012010100
#RUN | cpld_bmark_wave_v16_noahmp_35d | | fv3 | | 2012040100
#RUN | cpld_bmark_wave_v16_noahmp_35d | | fv3 | | 2012070100
#RUN | cpld_bmark_wave_v16_noahmp_35d | | fv3 | | 2012100100
#RUN | cpld_bmark_wave_v16_noahmp_35d | | fv3 | | 2013010100
#RUN | cpld_bmark_wave_v16_noahmp_35d | | fv3 | | 2013040100
#RUN | cpld_bmark_wave_v16_noahmp_35d | | fv3 | | 2013070100
#RUN | cpld_bmark_wave_v16_noahmp_35d | | fv3 | | 2013100100

RUN | cpld_bmark_wave_v16_p7b_35d | | fv3 | | 2012010100
RUN | cpld_bmark_wave_v16_p7b_35d | | fv3 | | 2012040100
RUN | cpld_bmark_wave_v16_p7b_35d | | fv3 | | 2012070100
RUN | cpld_bmark_wave_v16_p7b_35d | | fv3 | | 2012100100
RUN | cpld_bmark_wave_v16_p7b_35d | | fv3 | | 2013010100
RUN | cpld_bmark_wave_v16_p7b_35d | | fv3 | | 2013040100
RUN | cpld_bmark_wave_v16_p7b_35d | | fv3 | | 2013070100
RUN | cpld_bmark_wave_v16_p7b_35d | | fv3 | | 2013100100
COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1 | + hera.intel | fv3 | |
RUN | cpld_bmark_p7_35d | | fv3 | | 2012010100
RUN | cpld_bmark_p7_35d | | fv3 | | 2012040100
RUN | cpld_bmark_p7_35d | | fv3 | | 2012070100
RUN | cpld_bmark_p7_35d | | fv3 | | 2012100100
RUN | cpld_bmark_p7_35d | | fv3 | | 2013010100
RUN | cpld_bmark_p7_35d | | fv3 | | 2013040100
RUN | cpld_bmark_p7_35d | | fv3 | | 2013070100
RUN | cpld_bmark_p7_35d | | fv3 | | 2013100100
56 changes: 0 additions & 56 deletions tests/tests/control_ca_restart

This file was deleted.

107 changes: 107 additions & 0 deletions tests/tests/cpld_bmark_p7_35d
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
#
# cpld_bmark_p7 35 day test
#
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C384L127 MX025 - Benchmark P7 35 day test"

export CNTL_DIR="cpld_bmark_p7"

export LIST_FILES=""

export_fv3
export_cpl

export SYEAR
export SMONTH
export SDAY=01
export SHOUR=00
export SECS=`expr $SHOUR \* 3600`
export BMIC=.true.

export DAYS=35
export FHMAX=840
export RESTART_N=`expr ${FHMAX} - ${FHROT}`
export WLCLK=480

export TASKS=1700
export TPN=$TPN_cpl_thrd
export INPES=12
export JNPES=16
export THRD=2
export WRTTASK_PER_GROUP=88

export med_petlist_bounds="0 299"
export atm_petlist_bounds="0 1239"
export ocn_petlist_bounds="1240 1459"
export ice_petlist_bounds="1460 1539"
export wav_petlist_bounds="1540 1699"

# atm/ocn/ice resolution
export ATMRES=C384
export NPX=385
export NPY=385
export IMO=1536
export JMO=768
export OUTPUT_GRID="'gaussian_grid'"

export OCNRES=025
export ICERES=0.25
export NX_GLB=1440
export NY_GLB=1080
export NPROC_ICE=80
export np2=`expr $NPROC_ICE / 2`
export BLCKX=`expr $NX_GLB / $np2`
export BLCKY=`expr $NY_GLB / 2`

# resolution dependent setting
export CDMBWD=${CDMBWD_c384}

# set component and coupling timesteps
export DT_ATMOS=300
export DT_CICE=${DT_ATMOS}
export DT_DYNAM_MOM6=900
export DT_THERM_MOM6=1800

# nems.configure
export NEMS_CONFIGURE=nems.configure.cpld_wave.IN
export coupling_interval_slow_sec=${DT_THERM_MOM6}
export coupling_interval_fast_sec=${DT_ATMOS}

export CPLWAV=.true.
export CPLWAV2ATM=.true.

# resolution dependent files
export MOM_INPUT=MOM_input_template_${OCNRES}
export MESHOCN_ICE=mesh.mx${OCNRES}.nc
export CICEGRID=grid_cice_NEMS_mx${OCNRES}.nc
export CICEMASK=kmtu_cice_NEMS_mx${OCNRES}.nc
export CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc
export FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc

export FNALBC="'C384.snowfree_albedo.tileX.nc'"
export FNALBC2="'C384.facsf.tileX.nc'"
export FNTG3C="'C384.substrate_temperature.tileX.nc'"
export FNVEGC="'C384.vegetation_greenness.tileX.nc'"
export FNVETC="'C384.vegetation_type.tileX.nc'"
export FNSOTC="'C384.soil_type.tileX.nc'"
export FNVMNC="'C384.vegetation_greenness.tileX.nc'"
export FNVMXC="'C384.vegetation_greenness.tileX.nc'"
export FNSLPC="'C384.slope_type.tileX.nc'"
export FNABSC="'C384.maximum_snow_albedo.tileX.nc'"

export MOM6_USE_WAVES=True
export MOM6_RIVER_RUNOFF=True
export MOM6_RESTART_SETTING=r

export WW3GRIDLINE="'gwes_30m' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 'no' 'no' 1 1 0.00 1.00 F"
export WW3RSTDTHR=${FHMAX}
export DT_2_RST="$(printf "%02d" $(( ${WW3RSTDTHR}*3600 )))"
export RUN_BEG="${SYEAR}${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR} )))0000"
export RUN_END="2100${SMONTH}${SDAY} $(printf "%02d" $(( ${SHOUR} )))0000"
export OUT_BEG=$RUN_BEG
export OUT_END=$RUN_END
export RST_BEG=$RUN_BEG
export RST_2_BEG=$RUN_BEG
export RST_END=$RUN_END
export RST_2_END=$RUN_END

export FV3_RUN=cpld_control_run.IN