forked from mom-ocean/MOM6
-
Notifications
You must be signed in to change notification settings - Fork 81
Ice dynamics #80
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
Merged
Hallberg-NOAA
merged 30 commits into
NOAA-GFDL:dev/gfdl
from
OlgaSergienko:ice_dynamics
Mar 22, 2022
+139
−26
Merged
Ice dynamics #80
Changes from 23 commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
47c3e1e
In MOM_ice_shelf_dynamics.F90 changes are made to calc_shelf_visc() …
OlgaSergienko 74c4c45
Changed indentation
OlgaSergienko 65b02de
Merge branch 'dev/gfdl' into ice_dynamics
Hallberg-NOAA 918cec0
Changes are made to 'calc_shelf_visc()` to make computations of the v…
OlgaSergienko 9559c14
Merge branch 'ice_dynamics' of github.com:OlgaSergienko/MOM6 into ice…
OlgaSergienko 4d8d93c
Merge branch 'dev/gfdl' into ice_dynamics
marshallward c1a9131
Allocate shelf_sfc_mass_flux for dynamic ice shelf configurations
MJHarrison-GFDL c1358f2
Merge pull request #5 from MJHarrison-GFDL/ice_shelf_dynamic_sfc_accum
OlgaSergienko 65bb92e
Conditional allocation of ice shelf fluxes and data override call for…
MJHarrison-GFDL f5adcf9
get rid of excessive line length
MJHarrison-GFDL 755bfac
Merge pull request #7 from MJHarrison-GFDL/ice_dynamics
OlgaSergienko 1c6e308
call data override init for ice shelves
MJHarrison-GFDL ea87ce7
Merge pull request #8 from MJHarrison-GFDL/ice_dynamics
OlgaSergienko 4434e90
A new subroutine change_thickness_using_precip() changes the ice thic…
OlgaSergienko 0e80801
Conditional calls to data_override
MJHarrison-GFDL ac3a30b
Merge pull request #9 from MJHarrison-GFDL/ice_dynamics
OlgaSergienko cc2a2f8
Changes are made to extrapolate_metric() in MOM_grid_initialize.F90 t…
OlgaSergienko 42e142e
Reversed changes in MOM_grid_initialize.F90 to debug a regression test.
OlgaSergienko 0c4ac8e
Merge branch 'dev/gfdl' into ice_dynamics
Hallberg-NOAA f129fb8
Uncommented lines reading the ice velocity from file
OlgaSergienko 811071a
Merge branch 'ice_dynamics' of github.com:OlgaSergienko/MOM6 into ice…
OlgaSergienko a8538f0
Changes to scaling factors and conversions of the 'sfc_mass_flux' par…
OlgaSergienko 45f48f3
Merge branch 'dev/gfdl' into ice_dynamics
marshallward b07465e
Remove unnecessary diagnostics for ice shelves from MOM_forcing_type
MJHarrison-GFDL 2a22210
Correct rescaling for data override of ice shelf sfc mass fluxes
MJHarrison-GFDL 6e84f04
Add diagnostic rescaling for ice shelf mass fluxes
MJHarrison-GFDL 24f43d4
Uncommented assignement of 'area_shelf_h(i,j)=G%areaT(i,j)' in MOM_ic…
OlgaSergienko c44688e
Merge branch 'dev/gfdl' into ice_dynamics
OlgaSergienko 8c379b1
Merge pull request #10 from MJHarrison-GFDL/ice_dynamics_patch_matt
OlgaSergienko d720e75
Merge branch 'dev/gfdl' into ice_dynamics
Hallberg-NOAA 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 hidden or 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 hidden or 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 hidden or 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.
Uh oh!
There was an error while loading. Please reload this page.