-
Notifications
You must be signed in to change notification settings - Fork 371
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'darincomeau/cpl/add-cryo-cpl-budgets' into next (PR #6229)
Adding cryo fields to coupler budget accounting Adds new o2x coupling fields and terms to coupler budget for polar configurations: * Foxo_ismw - water from ice shelf basal melting (either prognostic or data) * Foxo_rrofl - water removed from Antarctica liquid runoff * Foxo_rrofi - water removed from Antarctica solid runoff * Foxo_ismh - heat from ice shelf basal melting * Foxo_rrofih - heat from removed ice runoff * Foxo_frazil_li - frazil ice formed in ice-shelf cavities ('land ice frazil') * Foxo_frazil_q - latent heat associated with land ice frazil These new fields are used to calculate wpolar and hpolar, which are Antarctic Ice Sheet imbalances in polar configurations. These coupler budget terms replace the existing iceberg wberg and hberg entries in the budget table, which are included in the wpolar and hpolar totals. Adds a driver namelist option (flds_polar) to only send these coupling fields in polar configurations. Changes to ocean conservation analysis member: * Turns on terms in ocean conservation analysis member when data ice-shelf melt fluxes are used. * Removes landIceFreshwaterFluxesOn conditional on writing land ice frazil terms * Removes accumulated land ice frazil salinity terms for salt conservation, since land ice frazil is assumed to have 0 salinity. [NML] [BFB]
- Loading branch information
Showing
16 changed files
with
462 additions
and
74 deletions.
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
Oops, something went wrong.