Ice dynamics #80
Merged
Ice dynamics #80
Conversation
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
…nd calc_shelf_driving_stress() to account for an irregular quadrilateral grid. In MOM_ice_shelf_initialize.F90 changes are made to initialize_ice_thickness_from_file() to correct masks at initialization.
…elocity derivatives rotation-invariant. Changes in `update_ice_shelf()` utilize G%IareaT(:,:) instead of 1/G%areaT(:,:).
Ice shelf dynamic sfc accum
Conditional allocation of ice shelf fluxes and data override call
call data override init for ice shelves
…kness in response to the atmospheric mass flux
- Introduces a new flag: DATA_OVERRIDE_SHELF_FLUXES, which
if set to True, and ACTIVE_SHELF_DYNAMICS is also True, will
enable data_override capability for the surface mass deposition
(only avaialble for MOSAIC grid types)
Conditional calls to data_override
…o avoid negative values at the southern boundary of the domain. This is done for grids extending over Antarctica.
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #80 +/- ##
============================================
- Coverage 28.98% 28.96% -0.03%
============================================
Files 245 245
Lines 72193 72240 +47
============================================
- Hits 20927 20925 -2
- Misses 51266 51315 +49
Continue to review full report at Codecov.
|
Hallberg-NOAA
requested changes
Mar 21, 2022
…e_shelf_initialize.F90 and modified the four halo updates in MOM_ice_shelf.F90.
|
This PR should be ready to go once Matt's PR back to OlgaSergienko:ice_dynamics at OlgaSergienko#10 is accepted. |
Ice dynamics patch matt
|
Matt's PR has been merged and all requested changes have been addressed. |
Hallberg-NOAA
approved these changes
Mar 21, 2022
|
@OlgaSergienko @MJHarrison-GFDL Is a squash-merge ok here? It will wipe out your commit histories. Otherwise, one of you will need to clean up the rebase conflicts. |
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/15042 ✔️ |
This was referenced May 16, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR includes major changes that enable a new flux with ocean_only runs - the surface mass flux over Antarctica (
shelf_sfc_mass_flux). Changes have been made to MOM_forcing_type.F90 and MOM_ice_shelf.F90.