forked from E3SM-Project/E3SM
-
Notifications
You must be signed in to change notification settings - Fork 0
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 prescribed tidal effect on ice shelf basal melting #76
Closed
irenavankova
wants to merge
62
commits into
E3SM-Ocean-Discussion:master
from
irenavankova:ocn/add-tidal-mixing-to-ice-shelf-melt
+3,027
−473
Closed
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit
Hold shift + click to select a range
057c4f3
Change F90 defaults
tcclevenger 046a080
Remove m_adjust_ps from ForcingFunctor class
tcclevenger 2913989
Use adjusted dp for compute_hydrostatic_p in Cxx
tcclevenger f61f055
Re-order member initialization
tcclevenger 0e3acbb
Add back m_adjust_ps=true code, condition on dt_remap_factor==0
tcclevenger a659a3f
change forcing ut to use dt_remap_factor = 1
tcclevenger 9cafd9e
randomize ps, compute dp for forcing ut
tcclevenger c768be3
Always allocate interface tmp view
tcclevenger c8776bd
update sbetr to fix issue 5832
jinyuntang 39c2d73
Correct hybrid computation for forcing UT
tcclevenger 8b58dcc
Switch data ice-shelf melt rates to Paolo et al 2023
xylar 48e9c0c
Update performance tests with v3 low res mesh
amametjanov 3d31877
Disable slow archiving of old tests on all ANL LCRC machines
amametjanov 3b45c0b
Add 3x32x2 PEs for ne4 I-cases on Chrysalis to match test-cases
amametjanov c7a6e54
Disable netcdf output
amametjanov 5263736
Implement FB_LTS local time-stepping scheme for single layer MPAS-O
jeremy-lilly 4faf908
add fblts to cmake for E3SM
mark-petersen e5110cc
change freq of tapes to write more frequently in wcprod
mahf708 b20409d
Add ANL Improv to E3SM machines
amametjanov 5e3052c
Fix e3sm_integration tests with gnu
amametjanov 52b88bb
Cleanup
amametjanov 66e2731
Use ne4pg2_oQU480 grid for EAM non-bit-for-bit tests
mkstratos 817d65a
Remove retired LANL machines grizzly and badger.
mark-petersen 66d445d
Add explanation of standalone flags to description
mark-petersen f5f808f
Merge branch 'xylar/ocn/update-icos30-dismf-to-paolo' (PR #6256)
jonbob 264b13b
Update allactive wcprod testmods with v3 settings
rljacob 79cb609
Merge branch 'azamat/machines/add-improv' (PR #6205)
amametjanov eba2ee0
Force adjust_ps=true only if CAM is defined and SCREAM is not defined
tcclevenger 1ecd7d4
Update CIME submodule
jgfouca b9cc7f8
Merge branch 'mark-petersen/machinefiles/remove-grizzly-badger' (PR #…
jonbob 1ac8b77
Switch wcprodssp back to v2
rljacob b10c126
Merge branch 'azamat/tests/v3res-update' (PR #6271)
amametjanov 8ceb81d
Update bld files to match Registry
jonbob 2cfa5f1
Merge branch 'jeremy-lilly/mpaso/fb-lts' (PR #6224)
jonbob b4ce2b2
Merge 'CONRAD/investigate_adjust_ps' (PR #6063)
oksanaguba 8781ab8
Merge branch 'mahf708/testing/wcprod-mods-fix' (PR #6284)
rljacob 923a738
Merge branch 'jgfouca/update_cime_subm_2024_03_20' into master (PR #6…
jgfouca 269b784
Merge branch 'mkstratos/tests/nbfb-grid-update' into master (PR #6289)
jgfouca 53d12d1
Merge branch 'jinyuntang/lnd/fix5832' (PR #6214)
bishtgautam 8f06124
replace with new name for landIceTopDragCoeff
irenavankova 67fe232
Resolved - keep ocn_ismf and tidal cahnges in buildnml
irenavankova 391a09b
Resolved - keep both date change and tidal file name change
irenavankova 9f0abcd
typo fix
irenavankova 7b07d25
Resolved: again replace with new name for landIceTopDragCoeff
irenavankova 9cc0187
Resolved: kept both
irenavankova 81d1e38
Resolved: kept both
irenavankova 4b782c3
add jourdain constants to namelist_definition_mpaso.xml
irenavankova 95089a2
more forgotten namelist stuff
irenavankova f9c5896
ismf to pismf
irenavankova 53d2d69
more TMIX compsets - NYF and IAF
irenavankova 6d21bb0
Resolved - keep both date change and tidal file name change
irenavankova 8514710
tell mpaso to read tidal file at init
irenavankova a5502c4
>
irenavankova 3acfac5
remove > on jb backup
irenavankova 8484f31
added compsets for C cases
irenavankova e78c974
corrected compsets for C cases
irenavankova 5b79866
add Jourdain defaults for TMIX, remove redundant variables, correct a…
irenavankova 42f2e2e
resolve
irenavankova 26889a2
add velocityTidalRMS to monthly output
irenavankova 517e2c2
Add CRYO1850-TMIX and CRYO1950-TMIX compsets
xylar cb760bf
Updated tidal mixing files and filenames that were regenerated with c…
irenavankova 4d22b59
remove short names compsets
irenavankova 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
ismf to pismf
commit f9c58967ddfa117b57115fddfe44a3d995b9676d
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
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.
@irenavankova, is this the configuration you're actually using for your runs? If so, let's keep this particular short name for now and remove all the other
-TMIX
short names.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 kept this one and deleted all the rest