Skip to content

Ice dynamics#35

Merged
Hallberg-NOAA merged 6 commits into
NOAA-GFDL:dev/gfdlfrom
OlgaSergienko:ice_dynamics
Dec 17, 2021
Merged

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

Conversation

@OlgaSergienko
Copy link
Copy Markdown

@OlgaSergienko OlgaSergienko commented Dec 9, 2021

In this PR major changes are made in MOM_ice_shelf_dynamics.F90 to calc_shelf_visc() and calc_shelf_driving_stress() to make them work properly on an irregular quadrilateral grid. In MOM_ice_shelf_initialize.F90 changes are made to initialize_ice_thickness_from_file() to correct masks at initialization.

…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.
@codecov
Copy link
Copy Markdown

codecov Bot commented Dec 10, 2021

Codecov Report

Merging #35 (4d8d93c) into dev/gfdl (bbb9753) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##           dev/gfdl      #35      +/-   ##
============================================
- Coverage     28.97%   28.96%   -0.02%     
============================================
  Files           240      240              
  Lines         71185    71212      +27     
============================================
  Hits          20623    20623              
- Misses        50562    50589      +27     
Impacted Files Coverage Δ
src/ice_shelf/MOM_ice_shelf_dynamics.F90 0.00% <0.00%> (ø)
src/ice_shelf/MOM_ice_shelf_initialize.F90 0.00% <0.00%> (ø)

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 bbb9753...4d8d93c. Read the comment docs.

Comment thread src/ice_shelf/MOM_ice_shelf_dynamics.F90 Outdated
Comment thread src/ice_shelf/MOM_ice_shelf_dynamics.F90 Outdated
Comment thread src/ice_shelf/MOM_ice_shelf_dynamics.F90 Outdated
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.

Thank you for these updates. Overall they look like significant improvements. I would be happy to approve these, but first there are a handful of specific comments (already added to the conversation that I would like you to consider. Each of these changes should be easy enough to make, and they should not adversely impact any working test cases, but they will avoid possible problems later and facilitate more extensive testing.

…elocity derivatives rotation-invariant. Changes in `update_ice_shelf()` utilize G%IareaT(:,:) instead of 1/G%areaT(:,:).
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.

Thanks for making the updates. These code changes now look good to me, and they should be merged in once the pipeline and TC tests have passed.

@Hallberg-NOAA
Copy link
Copy Markdown
Member

This PR has passed TC testing and passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/14370.

@Hallberg-NOAA Hallberg-NOAA merged commit 50df270 into NOAA-GFDL:dev/gfdl Dec 17, 2021
@Hallberg-NOAA Hallberg-NOAA added bug Something isn't working enhancement New feature or request labels Feb 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants