-
Notifications
You must be signed in to change notification settings - Fork 131
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
NUOPC/CMEPS cap updates #670
Merged
Merged
Changes from 89 commits
Commits
Show all changes
90 commits
Select commit
Hold shift + click to select a range
183218a
updated orbital calculations needed for cesm
10e7c20
fixed problems in updated orbital calculations needed for cesm
ce8e5a9
update CICE6 to support coupling with UFS
apcraig 8f0b5ee
Merge pull request #2 from apcraig/ufs01
dabail10 7ac0e3d
Merge pull request #1 from ESCOMP/nuopc
DeniseWorthen 80c9e6e
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 53715ea
put in changes so that both ufsatm and cesm requirements for potentia…
7e43703
Merge pull request #3 from mvertens/mvertens/nuopc
dabail10 f41f1e9
Merge remote-tracking branch 'upstream/nuopc' into HEAD
DeniseWorthen e70d1ab
update icepack submodule
DeniseWorthen 308a1d4
Revert "update icepack submodule"
DeniseWorthen 7848fdf
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 6982ee4
Merge remote-tracking branch 'upstream/nuopc' into HEAD
DeniseWorthen 089f60f
update comp_ice.backend with temporary ice_timers fix
DeniseWorthen 6affdcf
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 b5a6058
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 415df0e
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 b4da8a6
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 239c7de
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 ad03424
Fix threading problem in init_bgc
dabail10 73e7774
Fix additional OMP problems
dabail10 46fcfba
changes for coldstart running
DeniseWorthen c762336
Move the forapps directory
dabail10 6bccf71
remove cesmcoupled ifdefs
DeniseWorthen 902e883
Fix logging issues for NUOPC
dabail10 178693a
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 b4afd2e
removal of many cpp-ifdefs
3a1b88b
fix compile errors
DeniseWorthen 41855fd
fixes to get cesm working
aea1aa8
update to latest nuopc changes
e4c989c
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 30a81cc
fixed white space issue
8ebdda9
Merge pull request #4 from mvertens/nuopc
dabail10 27dd3b7
Add restart_coszen namelist option
dabail10 6b4a277
Merge branch 'nuopc' into coszen
dabail10 93f0e86
Merge pull request #5 from ESCOMP/coszen
dabail10 7211bc1
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 148ab08
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 aa9ef50
Update NUOPC cap to work with latest CICE6 master
dabail10 793e7ce
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 7fc1c30
nuopc,cmeps or s2s build updates
DeniseWorthen 1802396
fixes for dbug_flag
DeniseWorthen 964c860
Merge pull request #6 from DeniseWorthen/escomp/nuopc
dabail10 1cf95cf
Update nuopc2 to latest CICE master
dabail10 adbff47
Merge latest CICE master
dabail10 b52362e
Fix some merge problems
dabail10 f106591
Fix dbug variable
dabail10 64c5569
Manual merge of UFS changes
dabail10 f6040e1
Merge pull request #7 from ESCOMP/nuopc2
dabail10 5a0c13d
Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc
dabail10 3e4d1e7
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 c360dc2
fixes to get CESM B1850 compset working
1a32f3e
refactored ice_prescribed_mod.F90 to work with cdeps rather than the …
e48dd38
Fix use_restart_time
dabail10 f59b5c3
changes for creating masks at runtime
66356cb
added ice_mesh_mod
6ff987c
implemented area correction factors as option
0f90ce1
more cleanup
d78c3a3
Fix dragio
dabail10 1139e7f
Merge pull request #8 from ESCOMP/mvertens/nuopc_updates
dabail10 68132e7
Fix mushy bug
dabail10 ff3783a
updates to nuopc cap to resolve inconsistency between driver inputs a…
718a75d
changed error message
3ee6fe2
added icepack_warnings_flush
3bdc07b
updates to get ice categories working
508e9b9
updates to have F compset almost working with cice6 - still problems …
a2ddbd9
changed tolerance of mesh/grid comparison
56e1a83
added issues raised in PR
8b5ac3a
Merge pull request #9 from ESCOMP/nuopc_updates
dabail10 82d5d51
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 6faa645
Merge CICE Consortium main to nuopc
dabail10 f6f2e33
Update to latest Consortium main
dabail10 a026050
Update CESM-CICE sync with new time manager
dabail10 380045b
Add back in latlongrid
dabail10 874274a
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 a41a9dd
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 5ed5734
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 35e47f0
Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…
dabail10 72e7ad3
Merge branch 'main' of https://github.com/CICE-Consortium/CICE into n…
dabail10 c896dc6
Add new advanced snow physics to driver
dabail10 9fbb188
Fix restart issue with land blocks
dabail10 cbefb7a
Update mesh check in cap
dabail10 ecbd0a2
fix scam problems
cf5f6d9
Merge tag 'cice6_20211028' into feature/fix_scam
364961c
reintroduced imesh_eps check
79ccb3d
Update CICE_InitMod.F90
dabail10 545906e
Put dragio in the namelist instead
dabail10 5296481
Merge branch 'feature/fix_scam' of https://github.com/mvertens/CICE i…
dabail10 6db265a
Remove redundant code
dabail10 5e6a27c
Fix some indents
dabail10 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could remove the extra spaces, otherwise looks good.