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.

Sign up for GitHub

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

dynamic ice shelf #1338

Merged
merged 20 commits into from
Mar 18, 2021
Merged

dynamic ice shelf #1338

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
f1041d1
Fixed bugs in CG_action, matrix_diagonal and calc_shelf_visc in
OlgaSergienko Dec 16, 2020
39dd3e3
Modified MOM_ice_shelf_dynamics.F90
OlgaSergienko Dec 16, 2020
d27bcbd
Matt's changes to drivers
OlgaSergienko Dec 23, 2020
ebac0ad
Modifications to register_diag_field in MOM_ice_shelf_dynamics to mak…
OlgaSergienko Dec 29, 2020
f30f636
corrected indecises in computation of driving stresses
OlgaSergienko Feb 9, 2021
7752052
fixed ice-shelf advection
OlgaSergienko Feb 10, 2021
f0ae41c
modified viscosity computations
OlgaSergienko Feb 11, 2021
89f4386
corrected initialize_boundary_channel call
OlgaSergienko Feb 18, 2021
271bfce
corrected boundary mask in init_boundary_channel and updated u_ and
OlgaSergienko Feb 22, 2021
fdd83e6
dynamic ice shelf with non-linear viscosity and evolving ice thickness
OlgaSergienko Feb 22, 2021
32cfe35
modified MOM_ice_shelf_initialize for testing with viscosity from a file
OlgaSergienko Feb 24, 2021
5483bfe
Cleaned initialize_ice_shelf_boundary_channel
OlgaSergienko Mar 3, 2021
9aa75c8
Modified MOM_ice_shelf_initialize.F90
OlgaSergienko Mar 3, 2021
2232fa2
corrected style errors in MOM_ice_shelf.F90; MOM_ice_shelf_dynamics.F…
OlgaSergienko Mar 3, 2021
aed4f0e
More style errors
OlgaSergienko Mar 3, 2021
43dadc1
Defined variables in ice_shelf_solve_outer
OlgaSergienko Mar 3, 2021
b47e493
Removed blocks of commented code. Added parentheses in calc_shelf_visc
OlgaSergienko Mar 9, 2021
abc8fe4
Removed blocks of commented text and multiplications by 0
OlgaSergienko Mar 11, 2021
5839494
Merge branch 'dev/gfdl' into ice_dynamics
Hallberg-NOAA Mar 12, 2021
edc15f6
Merge branch 'dev/gfdl' into ice_dynamics
Hallberg-NOAA Mar 17, 2021
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
11 changes: 11 additions & 0 deletions src/ice_shelf/MOM_ice_shelf.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,17 @@ subroutine shelf_calc_flux(sfc_state_in, fluxes_in, Time, time_step, CS)
endif
endif

! Melting has been computed, now is time to update thickness and mass with dynamic ice shelf
if (CS%active_shelf_dynamics) then !OVS 12/10/20
call change_thickness_using_melt(ISS, G, US, US%s_to_T*time_step, fluxes, CS%density_ice, CS%debug) !OVS 12/10/20

if (CS%debug) then
call hchksum(ISS%h_shelf, "h_shelf after change thickness using melt", G%HI, haloshift=0, scale=US%Z_to_m)
call hchksum(ISS%mass_shelf, "mass_shelf after change thickness using melt", G%HI, haloshift=0, &
scale=US%RZ_to_kg_m2)
endif
endif !OVS 12/10/20

if (CS%debug) call MOM_forcing_chksum("Before add shelf flux", fluxes, G, CS%US, haloshift=0)

call add_shelf_flux(G, US, CS, sfc_state, fluxes)
Expand Down
Loading