-
Notifications
You must be signed in to change notification settings - Fork 152
Updates for CMIP7 #1066
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
Merged
Merged
Updates for CMIP7 #1066
Changes from all commits
Commits
Show all changes
48 commits
Select commit
Hold shift + click to select a range
ee3602a
Commit ice_history changes before merge main
dabail10 80ca1d3
Merge branch 'main' of https://github.com/ESCOMP/CICE
dabail10 b6b59c1
This is a big commit. I have gone through and updated the SIMIP
dabail10 30ec758
Forgot a couple broadcasts
dabail10 bd9cf20
Add sidragbot and change concentrations to percent
dabail10 9f429b8
Line up some ampersands and change mask_ice_free_points where appropr…
dabail10 1dcff41
Another sizable commit.
dabail10 5dad94a
Another big commit on this.
dabail10 f2a463e
Fix siitd variables
dabail10 1d15438
Add documentation on CMIP7 updates and f_CICE flag
dabail10 d9ef7d8
Fix lwout bug for coupler and revert change for history
dabail10 a724928
Remove some of the worka accumulation where it is not necessary.
dabail10 9219a55
Change sidmasslat to sidmassmeltlat. Fix the signs on the melt terms.
dabail10 845c4eb
Another big commit. Here the f_CMIP option has been completely
dabail10 c390f09
Add turning off the CICE variables and add SIMIP variables to the def…
dabail10 f663518
Fix some typos and make sure aice and aice_init are also accumulated
dabail10 d435464
Fill in comment using CMIP table description
dabail10 13bd7e5
Make the comment field longer
dabail10 d369966
Add 'n' option for instantaneous output for a particular day in
dabail10 e88b3c7
Syntax error with filenames
dabail10 6b7cd82
- Add long name to bounds variables.
dabail10 fa475da
Fix some more issues in the ice_history_write.F90 modules
dabail10 0cdee8d
Fix comment syntax error
dabail10 2760117
Add all attributes for bounds variables
dabail10 a05e3b4
- Do the calculation of rho_ice, rho_ocn, and salt_ice once.
dabail10 da28d22
Clean up some comments and add f_icespd and f_icedir
dabail10 3e41855
Fix some comments and input namelists
dabail10 27b72ce
Fix computation of sirdgthick
dabail10 2640432
Add minimimum to freeboard and fix meltpond thicknesses
dabail10 7e64142
Compute pond and ridge thicknesses more correctly
dabail10 9a7c17b
Some more changes to meltpond and ridge thicknesses
dabail10 3947550
Some additional fixes. Make sure that f_apond, f_ardg, and f_alvl are…
dabail10 ceefabd
Fix sirdgthick averaging
dabail10 ab7614f
Some formatting in code and documentation. Make sure f_aicen is turne…
dabail10 3de1656
A bug with the denominator for simpthick and simprefrozen
dabail10 3454a14
Code and documentation cleanup
dabail10 ad78c48
- Add the avg_ice_present and mask_ice_points arguments to all CMIP
dabail10 71b53ec
Change attribute text in the lat_bounds and lon_bounds variables
dabail10 436b972
- Fix the computation of siflswutop
dabail10 f76775b
Add fswup to be computed before scale_fluxes for history.
dabail10 16baf4e
Forgot one driver mct/cesm1
dabail10 64cf79b
- Fix some language in the documentation
dabail10 f4505f5
Fix conditionals for abort when computing ravgp quantities
dabail10 d0455f6
Further refine abort condition
dabail10 f222ad1
Fix comment for snowfrac
dabail10 5abb957
Fix aborts for accumulation variables
dabail10 b653260
One more comment change
dabail10 3a220fa
Merge branch 'CICE-Consortium:main' into cmip7
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
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.