User/mjh/ice shelf#63
Merged
Merged
Conversation
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.
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
…st merge attempt
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
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.