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

Fixcommit #14

Merged
merged 19 commits into from
Aug 13, 2020
Merged

Fixcommit #14

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d6a1d80
CICE addition of fswthru by components. (#479)
dabail10 Jul 9, 2020
15a884c
Update README.md
apcraig Jul 13, 2020
78b7a12
move Ktens out of basalstress conditional in diagnostic output (#488)
eclare108213 Jul 13, 2020
c22c6d5
clarify CICE citation info in doc (#487)
eclare108213 Jul 13, 2020
9bdb9ad
Merge remote-tracking branch 'CICE-Consortium/master' into emc/develop
DeniseWorthen Jul 15, 2020
ee5a0e9
Update README.md
apcraig Jul 15, 2020
86b8dab
Merge remote-tracking branch 'upstream/emc/develop' into HEAD
DeniseWorthen Jul 17, 2020
b055c7f
Add restart_coszen namelist option (#480)
dabail10 Jul 17, 2020
c084de4
Merge remote-tracking branch 'upstream/master' into emc/develop
DeniseWorthen Jul 17, 2020
819eedd
Update CPP implementation (#490)
apcraig Jul 31, 2020
06b3be5
Remove "coupled" CPP flag, add ssh_stress namelist (#496)
apcraig Jul 31, 2020
9e8a300
Add support for .cice_set, git clone --depth=1, atmbndy namelist outp…
apcraig Jul 31, 2020
6a3e60c
Send swpen by category (#495)
dabail10 Jul 31, 2020
003aae0
Add sw_redist option to CICE (#497)
dabail10 Jul 31, 2020
88cc2fd
Merge remote-tracking branch 'upstream/master' into emc/develop
DeniseWorthen Aug 5, 2020
12d16ed
Update Icepack to 4c42a82, non bit-for-bit changes (#499)
apcraig Aug 8, 2020
5ecde75
Merge remote-tracking branch 'upstream/emc/develop' into emc/develop
DeniseWorthen Aug 12, 2020
eb77517
Latest NUOPC caps (#500)
dabail10 Aug 12, 2020
fe89e19
Merge remote-tracking branch 'upstream/master' into fixcommit
DeniseWorthen Aug 13, 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

These merge commits were added into this branch cleanly.

There are no new changes to show.