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

Allow for coupling to both nemo and hycom #474

Merged
merged 26 commits into from
Jun 24, 2020
Merged

Allow for coupling to both nemo and hycom #474

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a10d718
Updated dmi drivers according to standalone
TillRasmussen Nov 30, 2019
eceee39
Update CICE_RunMod.F90
TillRasmussen Dec 4, 2019
6c1e6f0
Delete lal.dat
TillRasmussen Dec 4, 2019
39611f3
fix of icepack issues
TillRasmussen Dec 4, 2019
41d0362
Merge branch 'master' into master
apcraig Dec 7, 2019
f6b057e
Merge branch 'master' of https://github.com/CICE-Consortium/CICE
TillRasmussen Dec 8, 2019
1239007
Merge pull request #5 from CICE-Consortium/master
TillRasmussen Dec 25, 2019
9015d4c
cosmetic change to alin dmi/nuopc with standalone
TillRasmussen Dec 25, 2019
7be12ea
Allow for read in of tlon, tlat and anglet in order to avoid differen…
TillRasmussen Jan 22, 2020
8b10874
cice cap. DMI
TillRasmussen Feb 5, 2020
3b87bb5
Merge pull request #6 from CICE-Consortium/master
TillRasmussen Apr 10, 2020
e1b0126
Merge remote-tracking branch 'upstream/master'
TillRasmussen Apr 29, 2020
46ff9af
Merge pull request #7 from CICE-Consortium/master
TillRasmussen Jun 2, 2020
fddd22c
ice_grid
TillRasmussen Jun 2, 2020
901504d
old style ice_init
TillRasmussen Jun 2, 2020
903a8ef
bugfix. not in loop that uses iblk
TillRasmussen Jun 4, 2020
faad4ff
Merge pull request #8 from CICE-Consortium/master
TillRasmussen Jun 10, 2020
bd5df3c
Read angleT if it exist in grid file
TillRasmussen Jun 11, 2020
54a1365
bug fix missing declaration in ice_step_mod.F90. Only relevant if NEM…
TillRasmussen Jun 21, 2020
57e9346
remove icebarrier
TillRasmussen Jun 21, 2020
b1c5db3
Merge remote-tracking branch 'upstream/master'
TillRasmussen Jun 23, 2020
bf78110
update to latest
TillRasmussen Jun 23, 2020
b37baf1
allow for nemo-cice coupling in same driver
TillRasmussen Jun 23, 2020
19abb16
Merge pull request #9 from CICE-Consortium/master
TillRasmussen Jun 24, 2020
668b348
Merge branch 'master' of https://github.com/CICE-Consortium/CICE
TillRasmussen Jun 24, 2020
428da28
Merge pull request #10 from TillRasmussen/hadgem
TillRasmussen Jun 24, 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
Prev Previous commit
Next Next commit
Merge pull request #6 from CICE-Consortium/master 
Merge changes from main
  • Loading branch information
@TillRasmussen
TillRasmussen authored Apr 10, 2020
commit 3b87bb5bc84969bcaba9b676c6b3b149b2f5002a

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.