Skip to content

Ice dynamics#80

Merged
Hallberg-NOAA merged 30 commits into
NOAA-GFDL:dev/gfdlfrom
OlgaSergienko:ice_dynamics
Mar 22, 2022
Merged

Ice dynamics#80
Hallberg-NOAA merged 30 commits into
NOAA-GFDL:dev/gfdlfrom
OlgaSergienko:ice_dynamics

Conversation

@OlgaSergienko
Copy link
Copy Markdown

@OlgaSergienko OlgaSergienko commented Feb 28, 2022

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.

OlgaSergienko and others added 17 commits December 8, 2021 18:24
…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(:,:).
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
Copy link
Copy Markdown

codecov Bot commented Feb 28, 2022

Codecov Report

Merging #80 (d720e75) into dev/gfdl (0ff0daa) will decrease coverage by 0.02%.
The diff coverage is 1.85%.

@@             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     
Impacted Files Coverage Δ
config_src/drivers/solo_driver/MOM_driver.F90 67.46% <0.00%> (-0.55%) ⬇️
src/ice_shelf/MOM_ice_shelf.F90 0.00% <0.00%> (ø)
src/ice_shelf/MOM_ice_shelf_dynamics.F90 0.00% <0.00%> (ø)
src/ice_shelf/MOM_ice_shelf_initialize.F90 0.00% <ø> (ø)
src/core/MOM_forcing_type.F90 42.68% <8.33%> (-0.41%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0ff0daa...d720e75. Read the comment docs.

Comment thread src/ice_shelf/MOM_ice_shelf_initialize.F90 Outdated
Comment thread src/core/MOM_forcing_type.F90 Outdated
Comment thread src/ice_shelf/MOM_ice_shelf.F90 Outdated
Comment thread src/ice_shelf/MOM_ice_shelf_initialize.F90 Outdated
Comment thread src/ice_shelf/MOM_ice_shelf.F90
Comment thread src/ice_shelf/MOM_ice_shelf.F90 Outdated
@Hallberg-NOAA Hallberg-NOAA added the enhancement New feature or request label Mar 15, 2022
Copy link
Copy Markdown
Member

@Hallberg-NOAA Hallberg-NOAA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, this PR looks good, but there are 4 specific outstanding conversations about this PR that will need to be addressed, almost certainly with minor specific code changes, before this PR should be accepted.

@Hallberg-NOAA
Copy link
Copy Markdown
Member

This PR should be ready to go once Matt's PR back to OlgaSergienko:ice_dynamics at OlgaSergienko#10 is accepted.

@OlgaSergienko
Copy link
Copy Markdown
Author

Matt's PR has been merged and all requested changes have been addressed.

@marshallward
Copy link
Copy Markdown
Member

@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.

@marshallward
Copy link
Copy Markdown
Member

Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/15042 ✔️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants