Add subglacial runoff #82

irenavankova · 2024-02-29T23:27:41Z

This adds subglacial runoff output from a file (e.g. MALI output) at the grounding line as freshwater volume flux at local freezing point. It follows closely what river runoff does.

xylar

@irenavankova, this looks like excellent work, as I always expect from you.

There are some small formatting fixes in the Registry to do.

The other issue, which we should discuss, is whether we want a namelist option and a package to prevent allocating subglacial runoff variables when they aren't used.

components/mpas-ocean/src/analysis_members/Registry_conservation_check.xml

components/mpas-ocean/src/Registry.xml

xylar

One quick formatting suggestion. I think this is otherwise ready to move to E3SM

components/mpas-ocean/src/Registry.xml

components/mpas-ocean/src/analysis_members/Registry_conservation_check.xml

irenavankova · 2024-04-03T16:16:48Z

Not yet ready to move, I am on only half way putting in the packages - I introduced them but now need to add iffstatements all over the code, checking for package when using the subglacial variables

xylar · 2024-04-03T16:49:58Z

Okay, no worries. Ping me when the time is right to have another look.

irenavankova · 2024-04-29T20:06:38Z

@xylar, I made the subglacial stuff into a package now - I think it is ready for you to have a look again when you have time.

xylar

Wow, this is amazing! And nearly there. I just have a few small pieces of clean-up I'd recommend. Then, this will need to be rebased because of the TMIX PR that just went in (perhaps among other conflicts). And then it's ready to go to E3SM!

Happy to help with the rebase if you need.

xylar · 2024-05-30T13:27:34Z

components/mpas-ocean/bld/build-namelist-section

@@ -305,6 +312,7 @@ add_default($nl, 'config_land_ice_flux_ISOMIP_gammaT');
 add_default($nl, 'config_land_ice_flux_rms_tidal_velocity');
 add_default($nl, 'config_land_ice_flux_jenkins_heat_transfer_coefficient');
 add_default($nl, 'config_land_ice_flux_jenkins_salt_transfer_coefficient');
+add_default($nl, 'config_subglacial_runoff_mode');


This option got moved to the forcing namelist group in the registry so it should be moved up here as well.

xylar · 2024-05-30T13:28:10Z

components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml

+<entry id="config_subglacial_runoff_mode" type="char*1024"
+	category="land_ice_fluxes" group="land_ice_fluxes">
+Selects the mode in which subglacial runoff fluxes are computed.
+
+Valid values: 'off', 'data'
+Default: Defined in namelist_defaults.xml
+</entry>
+


This should also be moved up to the forcing group.

xylar · 2024-05-30T13:32:58Z

components/mpas-ocean/src/Registry.xml

+		<var name="fractionAbsorbedSubglacialRunoff" type="real" dimensions="nVertLevels nCells Time" units="fractional"
+			 description="Divergence of transmission through interfaces of surface fluxes below the surface layer at cell centers. These are applied only to subglacial runoff."
+			 packages="dataSubglacialRunoffFluxPKG"
+		/>


Suggested change

/>

/>

Maybe add back the blank line that was here before, just for visual separation between fields for different purposes?

xylar · 2024-05-30T13:41:22Z

components/mpas-ocean/src/shared/mpas_ocn_forcing.F

@@ -180,6 +182,48 @@ subroutine ocn_forcing_build_fraction_absorbed_array(meshPool, statePool, forcin
           end do
        end do

+!  now do subglacial runoff separately
+        if ( trim(config_subglacial_runoff_mode) == 'data' ) then
+            if ( trim(config_sgr_flux_vertical_location) == 'top' ) then


Would it make sense to add and else this this and raise an error if config_sgr_flux_vertical_location has an unexpected value? Otherwise, I worry that a typo could run fine but have weird and hard-to-explain behavior.

What is an appropriate way to do this? How to raise error and kill the run?

xylar · 2024-05-30T13:41:51Z

components/mpas-ocean/src/shared/mpas_ocn_diagnostics.F

@@ -3411,6 +3439,37 @@ subroutine ocn_compute_KPP_input_fields(statePool, forcingPool, &
                      - exp( max(-100.0_RKIND, &
                                 -layerThickness(kmin, iCell)/ &
                           config_flux_attenuation_coefficient_runoff))
+         if (trim(config_subglacial_runoff_mode) == 'data') then
+             if (config_use_sgr_opt_kpp == 1) then
+                if ( trim(config_sgr_flux_vertical_location) == 'top' ) then


Similar to diagnostics, would it make sense to add and else this this and raise an error if config_sgr_flux_vertical_location has an unexpected value? Otherwise, I worry that a typo could run fine but have weird and hard-to-explain behavior.

xylar · 2024-05-30T13:48:36Z

components/mpas-ocean/src/tracer_groups/Registry_ecosys.xml

-				<var name="FeSurfaceFluxRunoff" array_group="ecosysSurfaceFluxRunoffSurfaceFluxRunoffGRP" units="mmol Fe m^{-3} m s^{-1}"
+				<var name="FeSurfaceFluxRunoff" array_group="ecosysSurfaceFluxRunoffGRP" units="mmol Fe m^{-3} m s^{-1}"


I'm sure this is right but probably should be in its own PR. Do you want to check with Mat Maltrud about that?

I told him about it a while ago, but I think he forgot about it

…to 1 mm

…SGR_opt

irenavankova · 2024-07-11T20:53:12Z

I rebased to master and moved to E3SM Project as new branched named ocn/add-subglacial-runoff

…evelop This PR follows #82, which added subglacial hydrology (SGH) quantities to the global stats analysis member, by adding SGH quantities to the regional stats analysis member. This PR also address a bug introduced in #82 where the calculation of groundingLineFlux and groundingLineMigrationFlux were moved within an if config_SGH then condition. The bug prevents groundingLineFlux and groundingLineMigrationFlux from being calculated by global stats unless the SGH model is turned on, despite these quantities applying to simulations where SGH is not used. * MALI-Dev/andrewdnolan/mali/hydro_regional_stats: Fix registry typo Matt caught in review. Remove `regionVertexMasks` from registry to minimize file size. Apply suggestions from code review Use `regionEdgeMask` to calculate SGH regional stats defined on edges. Deallocate `regionalSumFlotationFraction`. Add missing `regionCellMasks` call from SGH regional stats terms Add grounded ice mask to `externalWaterInput` term Move reduction of `fluxAcrossGroundingLine` outside SGH condition. Add support for subglacial hydro quantities in regional stats.

irenavankova force-pushed the ocn/add-subglacialRunoff branch from f1acc50 to 2be9882 Compare March 28, 2024 22:57

xylar changed the base branch from master to alternate March 29, 2024 14:13

xylar changed the base branch from alternate to master March 29, 2024 14:13

xylar requested changes Mar 29, 2024

View reviewed changes

components/mpas-ocean/src/analysis_members/Registry_conservation_check.xml Outdated Show resolved Hide resolved

components/mpas-ocean/src/Registry.xml Show resolved Hide resolved

xylar reviewed Apr 3, 2024

View reviewed changes

components/mpas-ocean/src/Registry.xml Outdated Show resolved Hide resolved

components/mpas-ocean/src/analysis_members/Registry_conservation_check.xml Outdated Show resolved Hide resolved

irenavankova force-pushed the ocn/add-subglacialRunoff branch 2 times, most recently from 2be9882 to fbe87a7 Compare April 29, 2024 19:45

xylar changed the base branch from master to alternate May 30, 2024 13:24

xylar changed the base branch from alternate to master May 30, 2024 13:24

xylar reviewed May 30, 2024

View reviewed changes

irenavankova added 17 commits July 10, 2024 15:53

resolved: registry topodrag

d56618a

resolved: gitignore

f57b015

subglacial runoff for tracers, part 1

b4198e8

subglacial runoff for tracers, part 2 - registry

5cb8a57

subglacial runoff freezing temperature at landicepressure

b8f6d4f

resolved: compsets tmix

cf5c31a

typo

0fccd70

more compsets

f820afb

typo: remainingFluxSubglacialRunoff

71dc2ee

updated sg units

2637229

change config_flux_attenuation_coefficient_subglacial_runoff default …

98dc48b

…to 1 mm

add namelist option to include some parts of runoff only: config_use_…

2396978

…SGR_opt

more basic compsets

c52d123

forgotten bld

9b786dd

no sg in kpp option

de04001

config_use_SGR_opt -1 correction

0ab2384

config read in forcing

81d9488

irenavankova added 19 commits July 10, 2024 15:53

add subglacial to kpp in diagnostics

e89e854

resolved: fris meshes

52a4758

cleanup

c6a0104

resolved: fris meshes E3SM-Project#2

0c70aab

changed sgr kpp default to 1 = use

cdc60af

change config_sgr_flux_vertical_location default to bottom

1664002

rmv conservation check on sgr

f0e802d

rmv conservation check on sgr buildnml

ea8bb59

rmv conservation check on sgr buildnml E3SM-Project#2

e969c31

pkg change in bld

800961c

pkg in driver and registry

fa7849c

fix group for sgr in namelist_definition_mpaso

b07587b

sgr pkg in shared folder, add loops

f1b13ba

pkg dataSubglacialRunoffFluxPKG into registry variables

9b3e339

add conservation registry and streams

5ea51b2

try copy mpas_ocn_conservation_check.F

3619001

update dsgr files

26720b5

remove redundant compsets

21a593e

fix typo in dsgr filename

fe4380c

irenavankova force-pushed the ocn/add-subglacialRunoff branch from 757f8d0 to fe4380c Compare July 10, 2024 23:18

xylar changed the base branch from master to alternate July 11, 2024 15:30

xylar changed the base branch from alternate to master July 11, 2024 15:30

irenavankova added 4 commits July 11, 2024 10:44

fix omp and acc added loops

8f147f9

fix omp in tendency

43c3190

add sgr fail if bad string option

89c14b8

add line

7491a83

irenavankova closed this Jul 11, 2024

irenavankova mentioned this pull request Jul 11, 2024

Add subglacial discharge at grounding line E3SM-Project/E3SM#6508

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add subglacial runoff #82

Add subglacial runoff #82

irenavankova commented Feb 29, 2024

xylar left a comment

xylar left a comment

irenavankova commented Apr 3, 2024

xylar commented Apr 3, 2024

irenavankova commented Apr 29, 2024

xylar left a comment

xylar May 30, 2024

irenavankova Jul 11, 2024

xylar May 30, 2024

irenavankova Jul 11, 2024

xylar May 30, 2024

irenavankova Jul 11, 2024

xylar May 30, 2024

irenavankova Jul 10, 2024 •

edited

Loading

irenavankova Jul 11, 2024

xylar May 30, 2024

irenavankova Jul 11, 2024

xylar May 30, 2024

irenavankova Jul 10, 2024

irenavankova commented Jul 11, 2024

		<var name="FeSurfaceFluxRunoff" array_group="ecosysSurfaceFluxRunoffSurfaceFluxRunoffGRP" units="mmol Fe m^{-3} m s^{-1}"
		<var name="FeSurfaceFluxRunoff" array_group="ecosysSurfaceFluxRunoffGRP" units="mmol Fe m^{-3} m s^{-1}"

Add subglacial runoff #82

Add subglacial runoff #82

Conversation

irenavankova commented Feb 29, 2024

xylar left a comment

Choose a reason for hiding this comment

xylar left a comment

Choose a reason for hiding this comment

irenavankova commented Apr 3, 2024

xylar commented Apr 3, 2024

irenavankova commented Apr 29, 2024

xylar left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

irenavankova Jul 10, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

irenavankova commented Jul 11, 2024

irenavankova Jul 10, 2024 •

edited

Loading