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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ismf to pismf
irenavankova committed Mar 26, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit f9c58967ddfa117b57115fddfe44a3d995b9676d
10 changes: 10 additions & 0 deletions components/mpas-ocean/cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
@@ -72,6 +72,11 @@
<lname>2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>GMPAS-JRA1p5-DIB-PISMF-TMIX</alias>
<lname>2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV</lname>
</compset>

Comment on lines +75 to +79
Copy link
Collaborator

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.

Copy link
Author

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

<compset>
<alias>GMPAS-JRA1p4</alias>
<lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p4-2018_SGLC_SWAV</lname>
@@ -112,6 +117,11 @@
<lname>2000_DATM%IAF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%IAFAIS45_SGLC_SWAV</lname>
</compset>

<compset>
<alias>GMPAS-JRA1p4-DIB-PISMF-TMIX</alias>
<lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>GMPAS-DIB-NYF</alias>
<lname>2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%NYFAIS55_SGLC_SWAV</lname>