Skip to content
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

Fix initialize_ice_thickness_from_file for ISOMIP #1498

Merged
merged 1 commit into from
Sep 24, 2021

Conversation

Hallberg-NOAA
Copy link
Collaborator

Adds a test and warning message to avoid a fatal error when the ISOMIP (or
other ice-shelf) test case ice shelf thicknesses are initialized from a file
that has the ice thickness but not a mask variable, correcting the behavior that
was recently changed back to its previous behavior. If the mask variable exists
it is read, but if not it is set based on the thicknesses. All answers are
bitwise identical in test cases that worked before, and the ISOMIP test cases
once again work with the input files that they used previously.

  Adds a test and warning message to avoid a fatal error when the ISOMIP (or
other ice-shelf) test case ice shelf thicknesses are initialized from a file
that has the ice thickness but not a mask variable, correcting the behavior that
was recently changed back to its previous behavior.  If the mask variable exists
it is read, but if not it is set based on the thicknesses.  All answers are
bitwise identical in test cases that worked before, and the ISOMIP test cases
once again work with the input files that they used previously.
@codecov
Copy link

codecov bot commented Sep 16, 2021

Codecov Report

Merging #1498 (3df34af) into dev/gfdl (233f982) will decrease coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##           dev/gfdl    #1498      +/-   ##
============================================
- Coverage     29.01%   29.01%   -0.01%     
============================================
  Files           237      237              
  Lines         71776    71784       +8     
============================================
  Hits          20826    20826              
- Misses        50950    50958       +8     
Impacted Files Coverage Δ
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 233f982...3df34af. Read the comment docs.

@OlgaSergienko
Copy link
Contributor

These changes work for me. Thank you, Bob.

@marshallward
Copy link
Collaborator

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

@marshallward marshallward merged commit c937208 into mom-ocean:dev/gfdl Sep 24, 2021
@Hallberg-NOAA Hallberg-NOAA deleted the repair_ISOMIP branch November 22, 2021 09:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants