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 total land-ice freshwater flux in data mode #6729

Merged
merged 1 commit into from
Nov 8, 2024

Conversation

xylar
Copy link
Contributor

@xylar xylar commented Nov 1, 2024

Previously, the total was only being computed when thermodynamics below ice shelves are actively computed, whereas we need to compute the total of the interface flux and the frazil flux when the interface flux comes from a data file as well. While we expect the frazil flux to be zero, these code modifications do not assume or require this to be true.

This change is BFB. The only affected variable is purely diagnostic.

Relevant discussion is in E3SM-Ocean-Discussion#114

Fixes #6719

Previously, the total was only being computed when thermodynamics
below ice shelves are actively computed, whereas we need to
compute the total of the interface flux and the frazil flux
when the interface flux comes from a data file as well.  While we
expect the frazil flux to be zero, these code modifications do not
assume or require this to be true.
@xylar
Copy link
Contributor Author

xylar commented Nov 1, 2024

I am currently verifying that the e3sm_cryo_developer suite is BFB as expected.

@xylar
Copy link
Contributor Author

xylar commented Nov 1, 2024

Yep, I ran the e3sm_cryo_developer suite and all 7 tests passed and are BFB with master.

@xylar
Copy link
Contributor Author

xylar commented Nov 1, 2024

@darincomeau, ready for your review when you can.

@xylar xylar requested a review from darincomeau November 4, 2024 19:06
Copy link
Member

@darincomeau darincomeau left a comment

Choose a reason for hiding this comment

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

Approved based on developer testing and discussion in Ocean-Discussion PR.

Thanks for the fix @xylar !

jonbob added a commit that referenced this pull request Nov 7, 2024
Fix total land-ice freshwater flux in data mode

Previously, the total was only being computed when thermodynamics below
ice shelves are actively computed, whereas we need to compute the total
of the interface flux and the frazil flux when the interface flux comes
from a data file as well. While we expect the frazil flux to be zero,
these code modifications do not assume or require this to be true.

Fixes #6719
[BFB] purely diagnostic.
@jonbob
Copy link
Contributor

jonbob commented Nov 7, 2024

Passes:

  • ERP_Ld3.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.chrysalis_intel.allactive-pioroot1

merged to next

@jonbob jonbob merged commit 043f357 into E3SM-Project:master Nov 8, 2024
5 checks passed
@jonbob
Copy link
Contributor

jonbob commented Nov 8, 2024

merged to master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BFB PR leaves answers BFB bug fix PR mpas-ocean
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The total land-ice freshwater flux is zero in simulations with data ice-shelf melt fluxes (DISMF)
3 participants