Skip to content

Passing shelf_sfc_mass_flux to ice shelf#818

Merged
Hallberg-NOAA merged 10 commits into
NOAA-GFDL:dev/gfdlfrom
gfdl-cryosphere:dev/cryo
Feb 18, 2025
Merged

Passing shelf_sfc_mass_flux to ice shelf#818
Hallberg-NOAA merged 10 commits into
NOAA-GFDL:dev/gfdlfrom
gfdl-cryosphere:dev/cryo

Conversation

@OlgaSergienko
Copy link
Copy Markdown

This is the first PR from gfdl-cryopshere group. It includes several changes related to the surface mass flux from the land to the ice sheet, shelf_sfc_mass_flux. It is now defined in MOM_surface_forcing_gfdl.F90 and its values are passed to fluxes%shelf_sfc_mass_flux. This field can be used in configurations with a static ice sheet. To accommodate that it is now registered as a diagnostic field with CS%active_shelf_dynamics=.false..

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

There are a few issues that I would to see addressed before we could merge in this useful new field.

@codecov
Copy link
Copy Markdown

codecov Bot commented Feb 13, 2025

Codecov Report

Attention: Patch coverage is 0% with 6 lines in your changes missing coverage. Please review.

Project coverage is 38.17%. Comparing base (a645328) to head (f1be797).
Report is 28 commits behind head on dev/gfdl.

Files with missing lines Patch % Lines
src/ice_shelf/MOM_ice_shelf.F90 0.00% 6 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##           dev/gfdl     #818      +/-   ##
============================================
+ Coverage     38.15%   38.17%   +0.01%     
============================================
  Files           296      296              
  Lines         87254    87471     +217     
  Branches      16288    16389     +101     
============================================
+ Hits          33296    33388      +92     
- Misses        47971    48076     +105     
- Partials       5987     6007      +20     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

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.

I am convinced that this updated PR is correctly implemented.

@Hallberg-NOAA Hallberg-NOAA added the enhancement New feature or request label Feb 18, 2025
@Hallberg-NOAA
Copy link
Copy Markdown
Member

This PR has passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/mom6ci/MOM6/-/pipelines/26435.

@Hallberg-NOAA Hallberg-NOAA merged commit 9924a19 into NOAA-GFDL:dev/gfdl Feb 18, 2025
kshedstrom pushed a commit to ESMG/MOM6 that referenced this pull request Mar 17, 2025
* Commit for coupling of land to ocean adot

* Remove unused ice sheet enabled flag

* add adot to Shelf restart

* Register sfc mass flux outside of initialize fluxes

* Gfdl cryo merge (NOAA-GFDL#3)

* Removed second registration of sfc_mass_flux with register_diag_field.

* Registered sfc_mass_flux to runs with static and dynamic ice sheets.

* This commit removed the second registration of 'sfc_mass_flux' in 'register_diag_field()'

* Testing shelf_sfc_mass_flux restart.

* The earlier removed 'register_diag_field()' for 'mass_flux' has been added back and 'register_restart_field()' of 'fluxes_in%shelf_sfc_mass_flux' is moved before 'restore_state()'

* Corrected the line length error.

* Added back 'CS%id_mass_flux = register_diag_field()'

---------

Co-authored-by: NJSchlegel <nschlegel@gmail.com>
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.

3 participants