forked from E3SM-Project/E3SM
-
Notifications
You must be signed in to change notification settings - Fork 9
Update 2 Adds new ocean to ice coupling fields for frazil ice formation #559
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
Open
njeffery
wants to merge
26
commits into
E3SM-Project:seaice-coupling
Choose a base branch
from
njeffery:njeffery/frazil-coupling
base: seaice-coupling
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
6fbd75f
add index_x2i_Fioo_frazils (frazil salt flux) to ice_comp_mct.F,mpass…
erinethomas 1fa040f
Add additional frazil coupler fields.
karapeterson 4b63826
adding o2x_Fioo_frazilh/o2x_Fioo_frazils to mpaso
erinethomas 543f448
Enable variable salinity coupling inputs for sea ice
proteanplanet 97550f5
Updating icepack submodule 9.2.26
darincomeau 9a4de09
Add budgeting in mct coupler for new coupling fields.
karapeterson 833ae50
Fix bugs leading to build errors.
karapeterson 810fe58
Adds omega-fluxes option for frazil coupling in sea ice
njeffery 13db738
Update sea ice config checks
njeffery 961366e
Corrects update sea ice config options
njeffery a142bc4
Fixes salt flux units error
njeffery 6c686e7
Make frazil energy consistent with the ocean energy change
njeffery f292121
fixed type introduced in last commit
njeffery ba610a2
Corrections to ensure BFB
njeffery 540ebe4
Clean up ocean frazil routine
njeffery 7754efc
corrects typo in frazil routine
njeffery cbe81bf
Remove redundant newFrazilEnergy
njeffery 9ecd1da
Added copilot suggestions
njeffery 15d3cb4
Splits ocean coupling of freezemelt potential into frazil heat and melt
njeffery 51d8b83
Clean up coupler diagnostics for frazil
njeffery b3dc930
Adds index checks for perrWith indices
njeffery 3bf13b6
Update components/mpas-ocean/src/Registry.xml
njeffery 661ebaf
Changed registry field name and description
njeffery 893e102
Removes space
njeffery 19f2d6d
Adds coupling diagnostics for moab
njeffery 69b15d1
Renamed frazil mass coupling fluxes
njeffery 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 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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1083,6 +1083,10 @@ | |
| description="maximum fraction of layer thickness than can be used or created at an instant by frazil." | ||
| possible_values="Any positive real number between 0 and 1." | ||
| /> | ||
| <nml_option name="config_use_accumulated_frazil_energy" type="logical" default_value=".false." | ||
| description="If true, send the total energy accumulated from frazil ice formation to the sea ice model, otherwise use the latent heat." | ||
| possible_values=".true. or .false." | ||
| /> | ||
|
Comment on lines
+1086
to
+1089
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Updated the PR description |
||
| <nml_option name="config_specific_heat_sea_water" type="real" default_value="3985.0" units="J kg^-1 C^-1" | ||
| description="Energy per kilogram per C needed to raise ocean temperature 1 C. NOTE: test and make consistent with E3SM." | ||
| possible_values="Any positive real number." | ||
|
|
@@ -2146,6 +2150,7 @@ | |
| <var_struct name="ecosysAuxiliary"/> | ||
| <var name="accumulatedFrazilIceMass"/> | ||
| <var name="accumulatedFrazilIceSalinity"/> | ||
| <var name="accumulatedFrazilIceEnergy"/> | ||
| <var name="accumulatedLandIceMass"/> | ||
| <var name="accumulatedLandIceHeat"/> | ||
| <var name="accumulatedLandIceFrazilMass"/> | ||
|
|
@@ -2517,6 +2522,10 @@ | |
| description="Mass per unit area of frazil ice produced. Reset to zero at each coupling interval" | ||
| packages="frazilIce" | ||
| /> | ||
| <var name="accumulatedFrazilIceEnergy" type="real" dimensions="nCells Time" units="J m^-2" | ||
| description="Accumulated frazil ice energy per unit area. Reset to zero at each coupling interval" | ||
| packages="frazilIce" | ||
| /> | ||
| <var name="accumulatedFrazilIceSalinity" type="real" dimensions="nCells Time" units="kg m^-2" | ||
| description="Salinity associated with accumulatedFrazilIceMass. Reset to zero at each coupling interval" | ||
| packages="frazilIce" | ||
|
|
||
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
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.