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

Jump to bottom

Implement open water normalization for some ATM->OCN fluxes #549

Closed
wants to merge 42 commits into from
Closed

Implement open water normalization for some ATM->OCN fluxes #549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 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
8bca4fd
update CMEPS for aofrac_normaliation branch
DeniseWorthen Apr 29, 2021
9906d11
update CMEPS for compile error fix
DeniseWorthen Apr 29, 2021
52625f5
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Apr 30, 2021
ade7d6e
Merge branch 'develop' into feature/aofrac_normalization
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
f04ab60
Merge branch 'develop' into feature/aofrac_normalization
DeniseWorthen May 5, 2021
2ad32ab
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 5, 2021
460a939
update CMEPS
DeniseWorthen May 5, 2021
62b1078
Merge branch 'develop' into feature/aofrac_normalization
DeniseWorthen May 5, 2021
258dc4e
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 7, 2021
325f091
Merge branch 'develop' into feature/aofrac_normalization
DeniseWorthen May 7, 2021
20210f7
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 10, 2021
7e9843d
Merge branch 'develop' into feature/aofrac_normalization
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
83d6e9e
Merge branch 'develop' into feature/aofrac_normalization
DeniseWorthen May 13, 2021
a3fd6ad
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 14, 2021
c217b27
Merge branch 'develop' into feature/aofrac_normalization
DeniseWorthen May 14, 2021
4a082c0
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 18, 2021
473ec5f
Merge branch 'develop' into feature/aofrac_normalization
DeniseWorthen May 18, 2021
8ff5a46
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen May 21, 2021
7927db4
Merge branch 'develop' into feature/aofrac_normalization
DeniseWorthen May 21, 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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@
branch = develop
[submodule "CMEPS"]
path = CMEPS-interface/CMEPS
url = https://github.com/NOAA-EMC/CMEPS.git
branch = emc/develop
#url = https://github.com/NOAA-EMC/CMEPS.git
#branch = emc/develop
url = https://github.com/DeniseWorthen/CMEPS.git
branch = feature/aofrac_normalization
[submodule "MOM6"]
path = MOM6-interface/MOM6
url = https://github.com/NOAA-EMC/MOM6
Expand Down
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Open in desktop
Submodule CMEPS updated 4 files
+19 −17 mediator/esmFlds.F90
+7 −4 mediator/esmFldsExchange_nems_mod.F90
+32 −9 mediator/med_fraction_mod.F90
+27 −3 mediator/med_map_mod.F90