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

User/mjh/ice shelf #63

Merged
merged 3 commits into from
Sep 26, 2014
Merged

User/mjh/ice shelf #63

merged 3 commits into from
Sep 26, 2014

Conversation

MJHarrison-GFDL
Copy link
Contributor

Modifications to bulk mixed layer and diabatic driver for sub ice shelf cavity.
Added Amery ice shelf to the ocean_SIS examples (need to add datasets to /archive/gold)

Tested with solo and GOLD_SIS examples. Does not change answers for these experiments.

 o New experiment in examples/ocean_SIS/GIS_0125
 o Mods to MOM_ice_shelf.F90
 o MOM_bulk_mixed_layer and MOM_diabatic_driver mods
This update give reproducing results for the
following examples:

SOLO TEST CASES
===============
double_gyre
DOME
adjustment2d/layer
adjustment2d/rho
adjustment2d/z
benchmark
lock_exchange
global
global_ALE/layer

OCEAN-SIS TEST CASES
===============
GOLD_SIS
The datasets are not yet in place so this example
can not be run yet.
@adcroft adcroft merged commit d1d22af into dev/master Sep 26, 2014
nikizadehgfdl pushed a commit to nikizadehgfdl/MOM6 that referenced this pull request Oct 9, 2017
…le_entries

Added xyave diagnostic diag_table entries

- Adds horizontal averages of T,S to ocean_model_z
gustavo-marques pushed a commit to gustavo-marques/MOM6 that referenced this pull request May 31, 2018
…iffusion

Add old double diffusion + clean the diabatic subroutine
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
…_master_to_master_merge

Resolved conflicts in affinity.c between changes in pull request mom-ocean#63 and version of affinity.c with apple #ifdefs
MJHarrison-GFDL pushed a commit to MJHarrison-GFDL/MOM6 that referenced this pull request Aug 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants