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

Update MOM6 #175

Merged
merged 313 commits into from
Sep 9, 2020
Merged

Update MOM6 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
313 commits
Select commit Hold shift + click to select a range
f5cc7d3
update CICE submodule
DeniseWorthen Mar 29, 2020
82910d9
Merge pull request #18 from ufs-community/develop
DeniseWorthen Mar 30, 2020
641d3d5
update CMEPS, MOM6
DeniseWorthen Mar 31, 2020
a0fbd13
update NEMS
DeniseWorthen Apr 2, 2020
8e366f5
update compsets and parm to bring cmeps into s2s
DeniseWorthen Apr 2, 2020
bcde627
two more cmeps related changes
DeniseWorthen Apr 2, 2020
3ff7652
update FV3, NEMS, compsets, conf, modulefiles and
DeniseWorthen Apr 2, 2020
82b06f6
Merge pull request #19 from ufs-community/develop
DeniseWorthen Apr 2, 2020
a28f9cc
update FV3
DeniseWorthen Apr 3, 2020
e5b54c1
switched to new FV3 branch w/ correct ccpp submods
DeniseWorthen Apr 3, 2020
2bfbaf2
updates for compsets using testsize
DeniseWorthen Apr 3, 2020
292ce02
update compsets
DeniseWorthen Apr 3, 2020
a0f4f15
update compsets for trying to use testsize and fixes
DeniseWorthen Apr 4, 2020
4143b7f
reverted to batch queues; all tests pass for nems; restart
DeniseWorthen Apr 4, 2020
1f127a8
update to punyswrad branch of CICE
DeniseWorthen Apr 5, 2020
400377b
update 2 parm files for reproducibility; update compsets
DeniseWorthen Apr 6, 2020
65dc5cf
give extra time for comparisons
DeniseWorthen Apr 6, 2020
3a6d026
update MOM6
DeniseWorthen Apr 7, 2020
3654806
update MOM6 for restart_mode = nems
DeniseWorthen Apr 8, 2020
6826e99
update MOM6
DeniseWorthen Apr 8, 2020
ffb55bc
update MOM6
DeniseWorthen Apr 8, 2020
69d3706
update MOM6 after log cleanup; comment out sfc_tile
DeniseWorthen Apr 9, 2020
b952713
begin modifying ufs-s2s w/ optional ccpp to be default
DeniseWorthen Apr 10, 2020
3e6db40
updates for compsets
DeniseWorthen Apr 13, 2020
4d230fe
more incremental compset changes
DeniseWorthen Apr 13, 2020
f9dc07e
update FV3 for tsfl fix for restart repro testing
DeniseWorthen Apr 15, 2020
779a7ee
Merge branch 'feature/addccpp' of https://github.com/DeniseWorthen/uf…
DeniseWorthen Apr 15, 2020
5058920
Merge pull request #20 from ufs-community/develop
DeniseWorthen Apr 16, 2020
69e77ad
update gitmodules to point to master at ESCOMP for
DeniseWorthen Apr 17, 2020
7d4cfe3
update submodules
DeniseWorthen Apr 24, 2020
db588a0
add WW3 as component and associated parm files. Update
DeniseWorthen Apr 24, 2020
23c22b8
update FV3,NEMS submodules
DeniseWorthen Apr 24, 2020
0fe7fca
update FV3
DeniseWorthen Apr 24, 2020
1a8c02d
Merge pull request #22 from ufs-community/develop
DeniseWorthen Apr 27, 2020
9827916
Merge pull request #23 from ufs-community/develop
DeniseWorthen Apr 29, 2020
72f53ed
start building alt compset run version of cmeps/nems
DeniseWorthen Apr 29, 2020
fa848e5
changes consistent w/ Minsuk's altcompset branch
DeniseWorthen Apr 29, 2020
6a9f5f5
add tests; ccpp prod only
DeniseWorthen Apr 29, 2020
dd01c90
modifications for cmeps
DeniseWorthen Apr 29, 2020
d13f9cf
Merge pull request #24 from ufs-community/develop
DeniseWorthen May 1, 2020
e4882ad
updating to current s2s where applicable
DeniseWorthen May 1, 2020
994b6bb
updating compsets
DeniseWorthen May 1, 2020
5381fc4
Merge pull request #25 from ufs-community/develop
DeniseWorthen May 4, 2020
7d96f6f
update MOM6 and CICE5 submodules for porting to
DeniseWorthen May 4, 2020
81ebc55
building tests for cmeps
DeniseWorthen May 4, 2020
9e9aea9
Merge pull request #26 from ufs-community/develop
DeniseWorthen May 6, 2020
3e500b0
update to match current ufs-s2s w/ rt.sh tests
DeniseWorthen May 7, 2020
4d50946
Merge branch 'develop' into feature/cmeps_altrt
DeniseWorthen May 7, 2020
c954a94
Add CICE6 appbuilder and CICE6 submodule
DeniseWorthen May 11, 2020
fb77e16
Merge pull request #27 from ufs-community/develop
DeniseWorthen May 12, 2020
021180a
changing compile.sh and updating before_components.mk, configure.fv3.…
SMoorthi-emc May 14, 2020
4fbe93b
fixing missed logic in before_components.mk and adding fv3_debug modu…
SMoorthi-emc May 14, 2020
04a5bd4
updating before_components.mk
SMoorthi-emc May 14, 2020
ff8701a
updating compile.sh
SMoorthi-emc May 14, 2020
2ad955e
Merge pull request #31 from ufs-community/develop
DeniseWorthen May 19, 2020
7348f88
Merge latest develop into Moorthi's PR93
MinsukJi-NOAA May 27, 2020
ddbaa0f
Merge pull request #33 from ufs-community/develop
DeniseWorthen May 28, 2020
ad61814
Merge pull request #34 from ufs-community/develop
DeniseWorthen Jun 1, 2020
067834a
Modify Moorthi's compile.sh
MinsukJi-NOAA Jun 3, 2020
d2f46be
Update to the latest develop branch of s2s
MinsukJi-NOAA Jun 4, 2020
f40dda2
Add CMEPS to compile.sh and rt.conf. Attach hera RT results
MinsukJi-NOAA Jun 4, 2020
27ad512
Modify Orion-related module and configure files. Bug fixes
MinsukJi-NOAA Jun 4, 2020
ae02adf
Add Orion RT results
MinsukJi-NOAA Jun 4, 2020
f542289
Remove INTEL16=Y in before_components
MinsukJi-NOAA Jun 4, 2020
bcc681b
Remove CUST_POST. Add CICE6
MinsukJi-NOAA Jun 4, 2020
f4be461
Add CICE6_MAKEOPT in the make call
MinsukJi-NOAA Jun 4, 2020
b9d0c86
Add latest Orion RT results
MinsukJi-NOAA Jun 4, 2020
da06a94
Add latest Hera RT results
MinsukJi-NOAA Jun 4, 2020
208df8c
Merge pull request #35 from ufs-community/develop
DeniseWorthen Jun 5, 2020
5c900df
update components to match ufs-s2s cmeps commit
DeniseWorthen Jun 5, 2020
761239b
Merge branch 'develop' into feature/cice6
DeniseWorthen Jun 5, 2020
b1627d1
Switch all appbuilder files to CICE6
DeniseWorthen Jun 5, 2020
ff8d752
Merge remote-tracking branch 'remotes/MS/s2s-compile' into feature/cice6
DeniseWorthen Jun 5, 2020
6de1348
add cice6 ice_in_template
DeniseWorthen Jun 5, 2020
08d80cd
Merge pull request #36 from ufs-community/develop
DeniseWorthen Jun 5, 2020
67b46b4
Merge pull request #37 from DeniseWorthen/develop
DeniseWorthen Jun 5, 2020
ade7ea2
update w/ nuopc branch of escomp/cice6
DeniseWorthen Jun 5, 2020
63ab6a7
update FV3 for frac grid work
DeniseWorthen Jun 5, 2020
c3968ad
Revert "update FV3 for frac grid work"
DeniseWorthen Jun 5, 2020
2330838
add ccpp cice6 cmeps appbuilder
DeniseWorthen Jun 9, 2020
c8adf05
point to my fork of cice6 for hera,orion build macros
DeniseWorthen Jun 9, 2020
8f9373c
update CICE6 submodule
DeniseWorthen Jun 10, 2020
a04c97e
update cice6 submodule for my fork
DeniseWorthen Jun 11, 2020
9271356
Merge pull request #38 from ufs-community/develop
DeniseWorthen Jun 13, 2020
0bf3e97
update configure file for cheyenne
DeniseWorthen Jun 15, 2020
1751f89
Merge branch 'feature/cice6' of https://github.com/DeniseWorthen/ufs-…
DeniseWorthen Jun 15, 2020
4d89900
update CMEPS submodule
DeniseWorthen Jun 15, 2020
ebe5094
Merge pull request #40 from ufs-community/develop
DeniseWorthen Jun 16, 2020
328ffce
Enable rt.sh dependency relations
MinsukJi-NOAA Jun 17, 2020
b3b28c5
Change how DEP_RUN is exported. Change fv3_mom6_cice to fcst in the m…
MinsukJi-NOAA Jun 17, 2020
d232a5d
Merge remote-tracking branch 'origin/develop' into feature/cice6
DeniseWorthen Jun 17, 2020
eced533
update default_vars for cice6
DeniseWorthen Jun 17, 2020
7dac41b
add orion RT result logs
MinsukJi-NOAA Jun 18, 2020
5d4c978
add Hera RT result logs
MinsukJi-NOAA Jun 18, 2020
dafadf4
add dependencies for 35d tests
MinsukJi-NOAA Jun 19, 2020
318ffd4
remove temporary file fv3_slurm.IN
MinsukJi-NOAA Jun 19, 2020
226b885
Merge pull request #41 from MinsukJi-NOAA/feature/rt-dependency
DeniseWorthen Jun 19, 2020
52c3ecf
update CMEPS and NEMS submodules
DeniseWorthen Jun 19, 2020
5035dd9
update CICE6 submodule
DeniseWorthen Jun 22, 2020
7d74004
update NEMS submodule
DeniseWorthen Jun 25, 2020
8dc3713
update CICE6, CMEPS submodules
DeniseWorthen Jun 25, 2020
3ca67bc
Merge pull request #42 from ufs-community/develop
DeniseWorthen Jun 25, 2020
18c0b06
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jun 26, 2020
5d27b4a
Merge branch 'develop' into feature/cice6
DeniseWorthen Jun 26, 2020
b8ff6d4
update CMEPS, FV3
DeniseWorthen Jun 30, 2020
ee190c5
update CMEPS submodule
DeniseWorthen Jul 1, 2020
7c880cf
update CICE6 submodule
DeniseWorthen Jul 2, 2020
bf53adc
update CMEPS submodule
DeniseWorthen Jul 4, 2020
12c1472
changes to parm and default_vars for cice6
DeniseWorthen Jul 5, 2020
633a469
defaults for cice6 in RT
DeniseWorthen Jul 5, 2020
175d90b
update CICE6, CMEPS
DeniseWorthen Jul 7, 2020
d0da9c8
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 7, 2020
da6cdd8
update copying in mesh file for cice when running with cmeps
DeniseWorthen Jul 7, 2020
c184699
Merge branch 'develop' into feature/cice6
DeniseWorthen Jul 7, 2020
6e574db
update CICE to point to NOAA-EMC
DeniseWorthen Jul 7, 2020
25779e5
add restart_coszen to namelist; default true
DeniseWorthen Jul 7, 2020
838989c
fixed directory for mesh ice file
DeniseWorthen Jul 7, 2020
6c6481c
update NEMS for correct path to forapps/ufs in
DeniseWorthen Jul 8, 2020
c9fed74
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 10, 2020
376911c
update to CMEPS
DeniseWorthen Jul 10, 2020
cdc93b7
Merge branch 'develop' into feature/cice6
DeniseWorthen Jul 10, 2020
118d985
update NEMS
DeniseWorthen Jul 10, 2020
b1b4e1c
update CICE5
DeniseWorthen Jul 10, 2020
03e63c0
remove CICE5 and nems RT tests
DeniseWorthen Jul 13, 2020
534baa8
remove cached CICE_SRC
DeniseWorthen Jul 13, 2020
02aa062
start adding variables to allow configurable resolution in for ice an…
DeniseWorthen Jul 13, 2020
f9a62f1
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 15, 2020
96d8f29
more resolution variables for tests
DeniseWorthen Jul 15, 2020
5d5ff85
more files
DeniseWorthen Jul 15, 2020
c03fcde
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 15, 2020
0a7abee
update CICE for latest Consortium master
DeniseWorthen Jul 15, 2020
e9040f8
update NEMS submodule for mom6 and cice6 interfaces
DeniseWorthen Jul 16, 2020
d6914ca
feature/cice6-cmake (#43)
aerorahul Jul 16, 2020
8378674
remove appBuilder files and compsets subdirectory
DeniseWorthen Jul 16, 2020
fc0571c
remove nems.configure files used with NEMS mediator; add CPLMODE
DeniseWorthen Jul 16, 2020
2acadbe
remove create_baseline.py
DeniseWorthen Jul 16, 2020
f5be3b8
remove nems tests; add wcoss_dell_p3 compile
DeniseWorthen Jul 16, 2020
52ac982
more mods for cice6
DeniseWorthen Jul 16, 2020
e3441b2
add wcoss_phase3 files
DeniseWorthen Jul 16, 2020
1f941bf
fix use of NIGLOBAL in templates
DeniseWorthen Jul 16, 2020
53b4781
update CICE6 w/ compile fix for fswthru
DeniseWorthen Jul 16, 2020
186f489
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 16, 2020
97898d9
fix some variables in tests
DeniseWorthen Jul 16, 2020
b37ab5f
changes to mom_input templates
DeniseWorthen Jul 16, 2020
c64b075
set restart_ext false by default
DeniseWorthen Jul 17, 2020
96f505a
update CICE-interface for comp_ice.backend fixes
DeniseWorthen Jul 17, 2020
bab0180
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 21, 2020
1f221fe
cherry pick updates
DeniseWorthen Jul 21, 2020
337751e
update CICE
DeniseWorthen Jul 21, 2020
f95696f
fails at resource allocation
DeniseWorthen Jul 21, 2020
99a93c1
two fixes for 1/2 deg
DeniseWorthen Jul 21, 2020
38c5a6e
updates for mx050 tests
DeniseWorthen Jul 23, 2020
3e6178c
update CICE
DeniseWorthen Jul 24, 2020
de109c9
Merge branch 'feature/rt050' of https://github.com/DeniseWorthen/ufs-…
DeniseWorthen Jul 24, 2020
4a8e03a
cherry pick updates from rt050 feature branch
DeniseWorthen Jul 24, 2020
3fe4565
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 27, 2020
623d6e1
update FMS,FV3,stoch
DeniseWorthen Jul 27, 2020
9bd40bf
update NEMS
DeniseWorthen Jul 27, 2020
3c18150
Merge branch 'develop' into feature/cice6
DeniseWorthen Jul 27, 2020
efd9a3c
update submodules
DeniseWorthen Jul 27, 2020
eb88f88
Merge branch 'develop' into feature/rt050
DeniseWorthen Jul 28, 2020
d5812c3
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Jul 29, 2020
07f979e
Merge branch 'develop' into feature/rt050
DeniseWorthen Jul 30, 2020
de4421c
adding c96/1deg ocean test
DeniseWorthen Jul 31, 2020
307bc82
remove unfixed conflict in ice_in_template
DeniseWorthen Jul 31, 2020
eedab59
Merge remote-tracking branch 'origin/feature/rt050' into feature/cice6
DeniseWorthen Jul 31, 2020
cc68a58
remove 35 day tests (old form)
DeniseWorthen Jul 31, 2020
593eced
update MOM for statediagnose branch
DeniseWorthen Aug 1, 2020
6954df5
update mom6
DeniseWorthen Aug 2, 2020
d699570
update MOM
DeniseWorthen Aug 2, 2020
901705d
update cice for new develop branch
DeniseWorthen Aug 3, 2020
793e222
Revert "update cice for new develop branch"
DeniseWorthen Aug 3, 2020
3bf5e6d
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 4, 2020
2364d3b
Merge remote-tracking branch 'upstream/develop' into feature/cice6
DeniseWorthen Aug 4, 2020
1a5deed
update MOM6 for statediagnose w/ setting dbug flag in nems.configure
DeniseWorthen Aug 6, 2020
20a389b
update parm w/ cap debug flags
DeniseWorthen Aug 6, 2020
8a5dabc
update CICE submodule, add new namelist variables
DeniseWorthen Aug 6, 2020
24d12c2
update mesh file name; update cice submodule
DeniseWorthen Aug 6, 2020
fc867cc
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 7, 2020
6a94b54
point back to NOAA-EMC MOM6
DeniseWorthen Aug 7, 2020
832fd23
use MOM6 dev/emc
DeniseWorthen Aug 7, 2020
006018a
fix MOM6 branch
DeniseWorthen Aug 7, 2020
fb9f6f4
add setting for coldstart restart reading
DeniseWorthen Aug 7, 2020
2c58dcf
remove unused tests, fix mesh name
DeniseWorthen Aug 7, 2020
630e72c
re-set 35d conf and tests to defaults
DeniseWorthen Aug 7, 2020
6d2b2c1
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 7, 2020
1138ca1
Merge remote-tracking branch 'origin/develop' into feature/cice6
DeniseWorthen Aug 7, 2020
c89a04f
specify special baseline area for cice6 tests
DeniseWorthen Aug 7, 2020
1bb3cf4
move resolution dependent items to new branch
DeniseWorthen Aug 9, 2020
d004686
update CICE submodule
DeniseWorthen Aug 10, 2020
f9e9a1d
Merge branch 'feature/cice6' of https://github.com/DeniseWorthen/ufs-…
DeniseWorthen Aug 10, 2020
2d8eb3b
update ice_in_template for cice6
DeniseWorthen Aug 11, 2020
a8042fc
relocate restart_coszen
DeniseWorthen Aug 12, 2020
f1aa1f5
update CICE
DeniseWorthen Aug 12, 2020
33f4d1f
update CICE submodule and move dbug flag settings
DeniseWorthen Aug 12, 2020
cd179f4
update the emc/develop for CICE
DeniseWorthen Aug 13, 2020
9615e34
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 14, 2020
bf59c89
update to latest FV3
DeniseWorthen Aug 14, 2020
2ceb0ab
update parm
DeniseWorthen Aug 14, 2020
7b50765
Merge remote-tracking branch 'upstream/develop' into feature/cice6
DeniseWorthen Aug 15, 2020
35fed1a
back to compilefix branch w/ debug fix icepack and dell-p3 macro
DeniseWorthen Aug 17, 2020
52d1523
add git templates (#46)
DeniseWorthen Aug 17, 2020
0c340df
Merge branch 'develop' into feature/cice6
DeniseWorthen Aug 17, 2020
533bfbd
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 18, 2020
2c3eef7
Merge branch 'develop' into feature/cice6
DeniseWorthen Aug 18, 2020
c7b9e79
update CICE to test machine_id and wcoss compiler
DeniseWorthen Aug 18, 2020
7827fcb
update CICE
DeniseWorthen Aug 18, 2020
8841530
update to NEMS branch w/ compile change
DeniseWorthen Aug 19, 2020
403447d
update CICE, temp baseline areas in rt.sh
DeniseWorthen Aug 19, 2020
7f1c95b
update CICE
DeniseWorthen Aug 19, 2020
610f8fc
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 20, 2020
8eed6ff
Merge remote-tracking branch 'upstream/develop' into feature/cice6
DeniseWorthen Aug 20, 2020
61d1a2d
update CMEPS to updcmeps branch
DeniseWorthen Aug 24, 2020
674cb5c
remove 050 template
DeniseWorthen Aug 25, 2020
88e5918
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Aug 27, 2020
0d53bd0
update CMEPS with Makefile change
DeniseWorthen Aug 27, 2020
1f837d6
update FV3
DeniseWorthen Aug 27, 2020
b8b9c8d
update NEMS
DeniseWorthen Aug 27, 2020
92a83d9
Merge branch 'develop' into feature/cice6
DeniseWorthen Aug 27, 2020
f6bd5f8
update NEMS for MOM directory location
DeniseWorthen Aug 27, 2020
3238e21
update wave-bmark test PE count and share across ICE and WAV
DeniseWorthen Aug 28, 2020
9210361
update orion and p3 default PEs for wav-bmark RT
DeniseWorthen Aug 28, 2020
8684123
update CICE
DeniseWorthen Aug 31, 2020
6108980
update CICE to emc/develop
DeniseWorthen Aug 31, 2020
3490f00
update .IN files for cmeps only
DeniseWorthen Sep 1, 2020
448b60a
remove MEDCOMP instances
DeniseWorthen Sep 1, 2020
0c3f006
point to temporary cice6 baseline on orion
DeniseWorthen Sep 1, 2020
2bc43d2
fix typo in wave pets for orion
DeniseWorthen Sep 1, 2020
20f3878
commit logs from Orion test-baseline creation
DeniseWorthen Sep 2, 2020
f86d0e1
fix existing cold run sequence to give non-zero values for
DeniseWorthen Sep 3, 2020
80df79c
update esmf to 8.1bs27; revert sharing of ice-wave pes
DeniseWorthen Sep 3, 2020
ca1ff36
fix esmf module name on orion
DeniseWorthen Sep 4, 2020
6b7552e
new baselines created on orion; develop-20200904
DeniseWorthen Sep 4, 2020
4a3dadd
baselines created on hera; develop 20200904
DeniseWorthen Sep 4, 2020
200f12b
new baselines created on wcoss-dell-p3, develop-20200904
DeniseWorthen Sep 4, 2020
e855c64
update WW3 after merge of z0 fix over ice
DeniseWorthen Sep 4, 2020
b3e8060
update to NEMS develop
DeniseWorthen Sep 5, 2020
ed14c53
Merge remote-tracking branch 'upstream/develop' into feature/cice6
DeniseWorthen Sep 7, 2020
7c0f411
point to new baseline
DeniseWorthen Sep 7, 2020
8a25930
add dell-p3 logs
DeniseWorthen Sep 8, 2020
3912f5a
add hera logs
DeniseWorthen Sep 8, 2020
4c10016
add orion logs
DeniseWorthen Sep 8, 2020
4cf9b77
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 8, 2020
8a78c60
update MOM6
DeniseWorthen Sep 8, 2020
b3cd62f
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Sep 8, 2020
8ac5278
Merge branch 'develop' into feature/updmom6
DeniseWorthen Sep 8, 2020
2d7694d
add orion logs
DeniseWorthen Sep 8, 2020
282412e
add hera logs
DeniseWorthen Sep 8, 2020
04f75cf
add dell-p3 logs
DeniseWorthen Sep 9, 2020
6363095
update MOM6 submodule
DeniseWorthen Sep 9, 2020
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 MOM6-interface/MOM6
Open in desktop
Submodule MOM6 updated 5 files
+92 −83 config_src/nuopc_driver/mom_cap.F90
+4 −4 config_src/nuopc_driver/mom_cap_methods.F90
+3 −2 config_src/nuopc_driver/mom_ocean_model_nuopc.F90
+1 −1 config_src/nuopc_driver/mom_surface_forcing_nuopc.F90
+3 −1 src/framework/MOM_restart.F90
9,419 changes: 4,649 additions & 4,770 deletions tests/Compile_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

8,538 changes: 4,269 additions & 4,269 deletions tests/Compile_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

8,568 changes: 4,284 additions & 4,284 deletions tests/Compile_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Tue Sep 8 11:08:14 UTC 2020
Tue Sep 8 20:05:44 UTC 2020
Start Regression test


baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_cold_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/MEDIATOR_ccpp_cmeps
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_mom6_cice_cmeps_cold_atm_flux
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_mom6_cice_cmeps_cold_atm_flux
Checking test 001 cpld_fv3_ccpp_mom6_cice_cmeps_cold_atm_flux results ....
Comparing phyf001.tile1.nc .........OK
Comparing phyf001.tile2.nc .........OK
Expand Down Expand Up @@ -56,7 +56,7 @@ Test 001 cpld_fv3_ccpp_mom6_cice_cmeps_cold_atm_flux PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_cold_satmedmf_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/MEDIATOR_satmedmf_ccpp_cmeps
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_mom6_cice_cmeps_cold_satmedmf
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_mom6_cice_cmeps_cold_satmedmf
Checking test 002 cpld_fv3_ccpp_mom6_cice_cmeps_cold_satmedmf results ....
Comparing phyf001.tile1.nc .........OK
Comparing phyf001.tile2.nc .........OK
Expand Down Expand Up @@ -108,7 +108,7 @@ Test 002 cpld_fv3_ccpp_mom6_cice_cmeps_cold_satmedmf PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_cold384_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/MEDIATOR384_ccpp_cmeps
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_atm_flux
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_atm_flux
Checking test 003 cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_atm_flux results ....
Comparing phyf001.tile1.nc .........OK
Comparing phyf001.tile2.nc .........OK
Expand Down Expand Up @@ -160,7 +160,7 @@ Test 003 cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_atm_flux PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_cold_bmrt_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/MEDIATOR_bmrt_ccpp_cmeps
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_bmark_rt
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_bmark_rt
Checking test 004 cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_bmark_rt results ....
Comparing phyf001.tile1.nc .........OK
Comparing phyf001.tile2.nc .........OK
Expand Down Expand Up @@ -212,7 +212,7 @@ Test 004 cpld_fv3_ccpp_384_mom6_cice_cmeps_cold_bmark_rt PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_2d_warm_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_2d_warm_ccpp_cmeps/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux
Checking test 005 cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux results ....
Comparing phyf048.tile1.nc .........OK
Comparing phyf048.tile2.nc .........OK
Expand Down Expand Up @@ -269,7 +269,7 @@ Test 005 cpld_fv3_ccpp_mom6_cice_cmeps_2d_atm_flux PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_3d_warm_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_3d_warm_ccpp_cmeps/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux
Checking test 006 cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux results ....
Comparing phyf072.tile1.nc .........OK
Comparing phyf072.tile2.nc .........OK
Expand Down Expand Up @@ -326,7 +326,7 @@ Test 006 cpld_fv3_ccpp_mom6_cice_cmeps_3d_atm_flux PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_3d_warm_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_3d_warm_ccpp_cmeps/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_mom6_cice_cmeps_restart
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_mom6_cice_cmeps_restart
Checking test 007 cpld_fv3_ccpp_mom6_cice_cmeps_restart results ....
Comparing phyf072.tile1.nc .........OK
Comparing phyf072.tile2.nc .........OK
Expand Down Expand Up @@ -383,7 +383,7 @@ Test 007 cpld_fv3_ccpp_mom6_cice_cmeps_restart PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_2d_warm_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_2d_warm_ccpp_cmeps/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_mom6_cice_cmeps_2d_2threads
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_mom6_cice_cmeps_2d_2threads
Checking test 008 cpld_fv3_ccpp_mom6_cice_cmeps_2d_2threads results ....
Comparing phyf048.tile1.nc .........OK
Comparing phyf048.tile2.nc .........OK
Expand Down Expand Up @@ -440,7 +440,7 @@ Test 008 cpld_fv3_ccpp_mom6_cice_cmeps_2d_2threads PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_2d_warm_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_2d_warm_ccpp_cmeps/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_mom6_cice_cmeps_2d_decomp
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_mom6_cice_cmeps_2d_decomp
Checking test 009 cpld_fv3_ccpp_mom6_cice_cmeps_2d_decomp results ....
Comparing phyf048.tile1.nc .........OK
Comparing phyf048.tile2.nc .........OK
Expand Down Expand Up @@ -497,7 +497,7 @@ Test 009 cpld_fv3_ccpp_mom6_cice_cmeps_2d_decomp PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_1d_warm_satmedmf_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_1d_warm_satmedmf_ccpp_cmeps/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf
Checking test 010 cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf results ....
Comparing phyf024.tile1.nc .........OK
Comparing phyf024.tile2.nc .........OK
Expand Down Expand Up @@ -554,7 +554,7 @@ Test 010 cpld_fv3_ccpp_mom6_cice_cmeps_1d_satmedmf PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_2d_warm_ccpp384_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_2d_warm_ccpp384_cmeps/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux
Checking test 011 cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux results ....
Comparing phyf048.tile1.nc .........OK
Comparing phyf048.tile2.nc .........OK
Expand Down Expand Up @@ -611,7 +611,7 @@ Test 011 cpld_fv3_ccpp_384_mom6_cice_cmeps_2d_atm_flux PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_1d_bmrt_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_1d_bmrt_ccpp_cmeps/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt
Checking test 012 cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt results ....
Comparing phyf024.tile1.nc .........OK
Comparing phyf024.tile2.nc .........OK
Expand Down Expand Up @@ -706,7 +706,7 @@ Test 012 cpld_fv3_ccpp_384_mom6_cice_cmeps_1d_bmark_rt PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_cold_bmwav_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/MEDIATOR_bmwav_ccpp_cmeps
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_cold_bmark_rt
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_cold_bmark_rt
Checking test 013 cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_cold_bmark_rt results ....
Comparing phyf001.tile1.nc .........OK
Comparing phyf001.tile2.nc .........OK
Expand Down Expand Up @@ -758,7 +758,7 @@ Test 013 cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_cold_bmark_rt PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_1d_bmwav_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_1d_bmwav_ccpp_cmeps/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt
Checking test 014 cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt results ....
Comparing phyf024.tile1.nc .........OK
Comparing phyf024.tile2.nc .........OK
Expand Down Expand Up @@ -818,7 +818,7 @@ Test 014 cpld_fv3_ccpp_384_mom6_cice_cmeps_ww3_1d_bmark_rt PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_cold_debug_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/MEDIATOR_debug_ccpp_cmeps
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_mom6_cice_cmeps_cold_debug
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_mom6_cice_cmeps_cold_debug
Checking test 015 cpld_fv3_ccpp_mom6_cice_cmeps_cold_debug results ....
Comparing phyf001.tile1.nc .........OK
Comparing phyf001.tile2.nc .........OK
Expand Down Expand Up @@ -870,7 +870,7 @@ Test 015 cpld_fv3_ccpp_mom6_cice_cmeps_cold_debug PASS

baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_6h_warm_debug_ccpp_cmeps
mediator baseline dir = /scratch1/NCEPDEV/nems/emc.nemspara/RT/FV3-MOM6-CICE5/develop-20200907/RT-Baselines_6h_warm_debug_ccpp_cmeps/RESTART
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_86637/cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug
working dir = /scratch1/NCEPDEV/stmp2/Denise.Worthen/S2S_RT/rt_66763/cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug
Checking test 016 cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug results ....
Comparing phyf006.tile1.nc .........OK
Comparing phyf006.tile2.nc .........OK
Expand Down Expand Up @@ -926,5 +926,5 @@ Test 016 cpld_fv3_ccpp_mom6_cice_cmeps_6h_debug PASS


REGRESSION TEST WAS SUCCESSFUL
Tue Sep 8 12:32:30 UTC 2020
Elapsed time: 01h:24m:17s. Have a nice day!
Tue Sep 8 21:34:56 UTC 2020
Elapsed time: 01h:29m:13s. Have a nice day!
Loading