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

Flux through static ice-shelf to icebergs/new diagnostics #622

Merged
merged 6 commits into from
Jun 2, 2024

Conversation

alex-huth
Copy link

Added variables for the accumulated iceberg mass and heat flux due to calving from ice shelves (flux through the static ice front). These variables will be passed to the coupler and SIS2/iceberg module to initialize bergs.
See related changes in:
Coupler: alex-huth/FMScoupler@3e80bbc
SIS2: NOAA-GFDL/SIS2#209

It was easiest to tag a few other changes onto this PR as well:
-fixed the ice-shelf SMB override
-reorganized ice-shelf post data calls so that they do not strictly have to be called at multiples of the ice velocity time step.
-Added ice-shelf scalar diagnostics related to volume-above-floatation and surface/basal mass balance.

@marshallward
Copy link
Member

This PR has a compile-time error:

  /home/runner/work/MOM6/MOM6/src/ice_shelf/MOM_ice_shelf.F90:2501:54:
  
   2501 |                               time_step=time_interval)
        |                                                      1
  Error: Type mismatch in argument ‘day’ at (1); passed REAL(8) to TYPE(time_type)

which needs to be addressed.

Copy link

codecov bot commented May 30, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 36.92%. Comparing base (70bfe8f) to head (2e978a6).

Current head 2e978a6 differs from pull request most recent head f6e237c

Please upload reports for the commit f6e237c to get more accurate results.

Additional details and impacted files
@@             Coverage Diff              @@
##           dev/gfdl     #622      +/-   ##
============================================
- Coverage     37.04%   36.92%   -0.13%     
============================================
  Files           271      271              
  Lines         81267    81416     +149     
  Branches      15162    15221      +59     
============================================
- Hits          30109    30064      -45     
- Misses        45517    45724     +207     
+ Partials       5641     5628      -13     

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

Copy link
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.

This updated pull request looks to me like it is ready to go.

alex-huth added 6 commits June 2, 2024 11:43
Added variables for the accumulated iceberg mass and heat flux due to
calving from ice shelves (flux through the static ice front). These
will be passed to the coupler and SIS2/iceberg module to initialize
bergs. Also fixed the ice-shelf SMB override and reorganized
ice-shelf post data calls so that they do not strictly have to be
called at multiples of the ice velocity time step.
Added ice-shelf scalar diagnostics related to volume-above-floatation
and surface/basal mass balance. Had to modify ice-shelf diag mediator
to allow scalar diagnostics.
…lf so that it is passing the correct arguments
@Hallberg-NOAA
Copy link
Member

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

@Hallberg-NOAA Hallberg-NOAA merged commit b610226 into NOAA-GFDL:dev/gfdl Jun 2, 2024
10 checks passed
Wendazhang33 pushed a commit to Wendazhang33/MOM6-GFDL that referenced this pull request Jun 3, 2024
)

* Added option to convert flux through static ice front into icebergs

Added variables for the accumulated iceberg mass and heat flux due to
calving from ice shelves (flux through the static ice front). These
will be passed to the coupler and SIS2/iceberg module to initialize
bergs. Also fixed the ice-shelf SMB override and reorganized
ice-shelf post data calls so that they do not strictly have to be
called at multiples of the ice velocity time step.

* Added ice-shelf scalar diagnostics

Added ice-shelf scalar diagnostics related to volume-above-floatation
and surface/basal mass balance. Had to modify ice-shelf diag mediator
to allow scalar diagnostics.

* Fixed units for volume-above-floatation and Cp_ice. Renamed volume-above-floatation variable from 'vab' to 'vaf'

* Fixed write_ice_shelf_energy call within subroutine solo_step_ice_shelf so that it is passing the correct arguments

* Fixed syntax of calving units

* Fixed units for ice shelf calving and scalar diagnostics
c2xu pushed a commit to c2xu/MOM6 that referenced this pull request Jun 11, 2024
)

* Added option to convert flux through static ice front into icebergs

Added variables for the accumulated iceberg mass and heat flux due to
calving from ice shelves (flux through the static ice front). These
will be passed to the coupler and SIS2/iceberg module to initialize
bergs. Also fixed the ice-shelf SMB override and reorganized
ice-shelf post data calls so that they do not strictly have to be
called at multiples of the ice velocity time step.

* Added ice-shelf scalar diagnostics

Added ice-shelf scalar diagnostics related to volume-above-floatation
and surface/basal mass balance. Had to modify ice-shelf diag mediator
to allow scalar diagnostics.

* Fixed units for volume-above-floatation and Cp_ice. Renamed volume-above-floatation variable from 'vab' to 'vaf'

* Fixed write_ice_shelf_energy call within subroutine solo_step_ice_shelf so that it is passing the correct arguments

* Fixed syntax of calving units

* Fixed units for ice shelf calving and scalar diagnostics
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.

3 participants