E3SM-Project / E3SM

Energy Exascale Earth System Model source code. NOTE: use "maint" branches for your work. Head of master is not validated.
https://docs.e3sm.org/E3SM
Other
353 stars 365 forks source link

Fix total land-ice freshwater flux in data mode #6729

Closed xylar closed 2 weeks ago

xylar commented 3 weeks ago

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 https://github.com/E3SM-Ocean-Discussion/E3SM/pull/114

Fixes #6719

xylar commented 3 weeks ago

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

xylar commented 3 weeks ago

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

xylar commented 3 weeks ago

@darincomeau, ready for your review when you can.

jonbob commented 2 weeks ago

Passes:

merged to next

jonbob commented 2 weeks ago

merged to master