-
Notifications
You must be signed in to change notification settings - Fork 371
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 parametrized tidal mixing effects to ice shelf basal melt #6306
Merged
jonbob
merged 27 commits into
E3SM-Project:master
from
irenavankova:ocn/add-tidal-mixing-to-ice-shelf-melt
May 29, 2024
Merged
Changes from 25 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
5159c84
replace with new name for landIceTopDragCoeff
irenavankova 48aa754
Resolved - keep ocn_ismf and tidal cahnges in buildnml
irenavankova 350108e
Resolved - keep both date change and tidal file name change
irenavankova 71aab2f
typo fix
irenavankova 65c3a82
Resolved: again replace with new name for landIceTopDragCoeff
irenavankova 0aa76c3
resolve
irenavankova cb79214
Resolved: kept both
irenavankova 66f1bcc
add jourdain constants to namelist_definition_mpaso.xml
irenavankova 976037a
more forgotten namelist stuff
irenavankova 0c8044f
ismf to pismf
irenavankova 7627d8f
more TMIX compsets - NYF and IAF
irenavankova d9eef97
Resolved - keep both date change and tidal file name change
irenavankova e27358d
tell mpaso to read tidal file at init
irenavankova ae11914
>
irenavankova 6235dae
remove > on jb backup
irenavankova 6a74f0e
added compsets for C cases
irenavankova 3ecba56
corrected compsets for C cases
irenavankova 09cac5b
add Jourdain defaults for TMIX, remove redundant variables, correct a…
irenavankova c1c717f
resolve
irenavankova a177ec2
add velocityTidalRMS to monthly output
irenavankova 1fe8bbd
Add CRYO1850-TMIX and CRYO1950-TMIX compsets
xylar b50d180
Updated tidal mixing files and filenames that were regenerated with c…
irenavankova 70b4d72
remove short names compsets
irenavankova d4fb283
add tidal files for FRIS meshes
irenavankova 203a45e
Add a test with the TMIX compset
xylar 1ddd297
remove new registry variables from namelist_definition_mpaso.xml
bd446b2
Update bld files to match Registry
jonbob 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.
@jonbob, does this look right?
I was able to run this on Chrysalis by excluding
mpaso-jra_1958
but didn't know how to test that part.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.
I can do that when I work on this PR -- there is a bit of a trick to specifying tests that use testdefs
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.
Okay, thanks!
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.
The easiest way is to add machine_compiler to the test name.
./creat_test SMS_P480_Ld5.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF-TMIX.chrysalis_intel.mpaso-jra_1958
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.
Thanks @rljacob!