-
Notifications
You must be signed in to change notification settings - Fork 362
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
Add subglacial discharge at grounding line #6508
Merged
jonbob
merged 73 commits into
E3SM-Project:master
from
irenavankova:ocn/add-subglacial-runoff
Aug 29, 2024
Merged
Changes from all commits
Commits
Show all changes
73 commits
Select commit
Hold shift + click to select a range
d56618a
resolved: registry topodrag
irenavankova f57b015
resolved: gitignore
irenavankova b4198e8
subglacial runoff for tracers, part 1
irenavankova 5cb8a57
subglacial runoff for tracers, part 2 - registry
irenavankova b8f6d4f
subglacial runoff freezing temperature at landicepressure
irenavankova cf5c31a
resolved: compsets tmix
irenavankova 0fccd70
typo
irenavankova f820afb
more compsets
irenavankova 71dc2ee
typo: remainingFluxSubglacialRunoff
irenavankova 2637229
updated sg units
irenavankova 98dc48b
change config_flux_attenuation_coefficient_subglacial_runoff default …
irenavankova 2396978
add namelist option to include some parts of runoff only: config_use_…
irenavankova c52d123
more basic compsets
irenavankova 9b786dd
forgotten bld
irenavankova de04001
no sg in kpp option
irenavankova 0ab2384
config_use_SGR_opt -1 correction
irenavankova 81d9488
config read in forcing
irenavankova 4745779
sgr_flux_vertical_location and SGR to sgr
irenavankova e55b516
more sgr testing options for TS separation
irenavankova 9179ab0
resolved: conservation check
irenavankova af89287
removed redundant removedSubglacialRunoffFlux
irenavankova fe631c5
correct sgr units in flux add up
irenavankova 957d8b2
energy conservation check
irenavankova ecb0658
resolved: conservation check #2
irenavankova a430272
salt: added tracersSurfaceFluxPool definition
irenavankova 7c404b9
typo in print sgheatflux
irenavankova e89e854
add subglacial to kpp in diagnostics
irenavankova 52a4758
resolved: fris meshes
irenavankova c6a0104
cleanup
irenavankova 0c70aab
resolved: fris meshes #2
irenavankova cdc60af
changed sgr kpp default to 1 = use
irenavankova 1664002
change config_sgr_flux_vertical_location default to bottom
irenavankova f0e802d
rmv conservation check on sgr
irenavankova ea8bb59
rmv conservation check on sgr buildnml
irenavankova e969c31
rmv conservation check on sgr buildnml #2
irenavankova 800961c
pkg change in bld
irenavankova fa7849c
pkg in driver and registry
irenavankova b07587b
fix group for sgr in namelist_definition_mpaso
irenavankova f1b13ba
sgr pkg in shared folder, add loops
irenavankova 9b3e339
pkg dataSubglacialRunoffFluxPKG into registry variables
irenavankova 5ea51b2
add conservation registry and streams
irenavankova 3619001
try copy mpas_ocn_conservation_check.F
irenavankova 26720b5
update dsgr files
irenavankova 21a593e
remove redundant compsets
irenavankova fe4380c
fix typo in dsgr filename
irenavankova 8f147f9
fix omp and acc added loops
irenavankova 43c3190
fix omp in tendency
irenavankova 89c14b8
add sgr fail if bad string option
irenavankova 7491a83
add line
irenavankova a4209e4
Update components/mpas-ocean/src/Registry.xml description
irenavankova c8f15f5
rename config_sgr_salinity to config_sgr_salinity_prescribed
irenavankova 307b4d0
change config_use_sgr_opt_property from character to logical
irenavankova f6cbc38
change config_use_sgr_opt_kpp to logical variable
irenavankova 387e9f2
Move checking for valid string in config_sgr_flux_vertical_location t…
irenavankova c1616dd
set config_sgr_flux_vertical_location to bottom in namelist_defaults_…
irenavankova b452495
Change subglacialRunoffFlux into mass flux from volume flux for consi…
irenavankova 3b0dca4
introduce separate subroutine ocn_diagnostic_solve_surfaceLayer_subgl…
irenavankova 7fa3a50
correct extra delete
irenavankova 579e3dd
remove &
irenavankova f78062d
make separate subroutines whenever subglacial needs to be in subrouti…
irenavankova 9ff4253
fix function call typos
irenavankova 476908c
more new subrutines with _subglacial_runoff
irenavankova 5a54e97
fix function call typo _subglacial_runoff
irenavankova bdd8761
fix timer for sgr
irenavankova 0b72d75
corrected subglacialRunoffFlux add up in conservation check so that i…
irenavankova 00fc261
Change if statement for config_sgr_flux_vertical_location init check
irenavankova 77feb92
change author on new subroutines
irenavankova 0288938
Make bld files consistent with Registry
jonbob 48cee50
Correct DSGR file name
irenavankova 5a0f284
Corrected authorship
irenavankova 9ddd011
Added DSGR to stealth feature tests
irenavankova 24f24b8
added package condition in tendency tracers
irenavankova 624d9ac
Revert changes to .gitignore
xylar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perfect! This is nearly identical to the test I ran:
It just brings in one year of JRA forcing and runs for only 5 days, not a month. So I'm sure it will work great!