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

Jump to bottom

dynamic ice shelf #1338

Merged
merged 20 commits into from
Mar 18, 2021
Merged

dynamic ice shelf #1338

merged 20 commits into from
Mar 18, 2021

Commits on Dec 16, 2020

  1. Fixed bugs in CG_action, matrix_diagonal and calc_shelf_visc in 

    MOM_ice_shelf_dynamics.F90  modified
initialize_ice_shelf_boundary_channel in MOM_ice_shelf_initialze.F90
    @OlgaSergienko
    OlgaSergienko committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    f1041d1 View commit details
    Browse the repository at this point in the history

  2. Modified MOM_ice_shelf_dynamics.F90

    @OlgaSergienko
    OlgaSergienko committed Dec 16, 2020
    Configuration menu
    Copy the full SHA
    39dd3e3 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2020

  1. Matt's changes to drivers 

    Merge branch 'revert_drivers' of https://github.com/MJHarrison-GFDL/MOM6 into matts-revert-drivers
    @OlgaSergienko
    OlgaSergienko committed Dec 23, 2020
    Configuration menu
    Copy the full SHA
    d27bcbd View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2020

  1. Modifications to register_diag_field in MOM_ice_shelf_dynamics to mak… 

    …e ice-shelf_fields consistent

with diag_table
Modifications to MOM_ice_shelf.F90 to apply melting to the case of a
dynamic ice shelf.
    @OlgaSergienko
    OlgaSergienko committed Dec 29, 2020
    Configuration menu
    Copy the full SHA
    ebac0ad View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2021

  1. corrected indecises in computation of driving stresses

    @OlgaSergienko
    OlgaSergienko committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    f30f636 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2021

  1. fixed ice-shelf advection

    @OlgaSergienko
    OlgaSergienko committed Feb 10, 2021
    Configuration menu
    Copy the full SHA
    7752052 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2021

  1. modified viscosity computations

    @OlgaSergienko
    OlgaSergienko committed Feb 11, 2021
    Configuration menu
    Copy the full SHA
    f0ae41c View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2021

  1. corrected initialize_boundary_channel call

    @OlgaSergienko
    OlgaSergienko committed Feb 18, 2021
    Configuration menu
    Copy the full SHA
    89f4386 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2021

  1. corrected boundary mask in init_boundary_channel and updated u_ and 

    v_bdry_val through halo
    @OlgaSergienko
    OlgaSergienko committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    271bfce View commit details
    Browse the repository at this point in the history

  2. dynamic ice shelf with non-linear viscosity and evolving ice thickness 

    due to sub-ice-shelf melting
    @OlgaSergienko
    OlgaSergienko committed Feb 22, 2021
    Configuration menu
    Copy the full SHA
    fdd83e6 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2021

  1. modified MOM_ice_shelf_initialize for testing with viscosity from a file

    @OlgaSergienko
    OlgaSergienko committed Feb 24, 2021
    Configuration menu
    Copy the full SHA
    32cfe35 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2021

  1. Cleaned initialize_ice_shelf_boundary_channel

    @OlgaSergienko
    OlgaSergienko committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    5483bfe View commit details
    Browse the repository at this point in the history

  2. Modified MOM_ice_shelf_initialize.F90

    @OlgaSergienko
    OlgaSergienko committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    9aa75c8 View commit details
    Browse the repository at this point in the history

  3. corrected style errors in MOM_ice_shelf.F90; MOM_ice_shelf_dynamics.F… 

    …90; MOM_ice_shelf_initialize.F90
    @OlgaSergienko
    OlgaSergienko committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    2232fa2 View commit details
    Browse the repository at this point in the history

  4. More style errors

    @OlgaSergienko
    OlgaSergienko committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    aed4f0e View commit details
    Browse the repository at this point in the history

  5. Defined variables in ice_shelf_solve_outer

    @OlgaSergienko
    OlgaSergienko committed Mar 3, 2021
    Configuration menu
    Copy the full SHA
    43dadc1 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2021

  1. Removed blocks of commented code. Added parentheses in calc_shelf_visc

    @OlgaSergienko
    OlgaSergienko committed Mar 9, 2021
    Configuration menu
    Copy the full SHA
    b47e493 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2021

  1. Removed blocks of commented text and multiplications by 0

    @OlgaSergienko
    OlgaSergienko committed Mar 11, 2021
    Configuration menu
    Copy the full SHA
    abc8fe4 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2021

  1. Merge branch 'dev/gfdl' into ice_dynamics

    @Hallberg-NOAA
    Hallberg-NOAA authored Mar 12, 2021
    Configuration menu
    Copy the full SHA
    5839494 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. Merge branch 'dev/gfdl' into ice_dynamics

    @Hallberg-NOAA
    Hallberg-NOAA authored Mar 17, 2021
    Configuration menu
    Copy the full SHA
    edc15f6 View commit details
    Browse the repository at this point in the history