Update to EMC fork #1
Merged
Conversation
This file contains 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
…n_code_LBD Delete forgotten code
MOM_ice_shelf_dynamics.F90 modified initialize_ice_shelf_boundary_channel in MOM_ice_shelf_initialze.F90
* Also reducing line lenghts > 120
Merge branch 'revert_drivers' of https://github.com/MJHarrison-GFDL/MOM6 into matts-revert-drivers
…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.
Fixes inconsistency in the calculation of tendency due to lateral diffusion
See https://arxiv.org/abs/2004.06278. Not an exact reproduction of "squares" because Fortran doesn't have a uint64 type, and not all compilers provide integers with > 64 bits...
…_diff Adds mask2dT checker to avoid calling boundary_k_range at land points
Added a counter-based PRNG to MOM_random
Remove an omp parallel do directive due to thread-unsafe cpu_clock
This patch fixes a sign bug, in both MCT and NUOPC, when accounting for the latent heat from fprec and frunnoff. Following MOM6's definition, both fprec and frunoff are > 0 into the ocean. Therefore, the latent heat associated with these terms should be negative.
* Fixes latent heat contribution from fprec and frunoff (MCT and NUOPC)
v_bdry_val through halo
due to sub-ice-shelf melting
Sync with main to bring in new file layout
dynamic ice shelf
Two minor changes to the .testing build: - We now apply `--recurse-submodules` to the target build in the regression test. This is required after an update to the submodules, when the target submodule is out of sync with the main branch (e.g. dev/gfdl at NOAA-GFDL). - A LDFLAGS_USER hook was added to the `.testing/Makefile` configuration, similar to the FCFLAGS_* hooks. This is required if the library dependencies do not reside in the default directores. For example, this may be needed for a custom netCDF or MPI library.
Testing: Recurse target submodules, LDFLAGS hook
EMC update 20210322
…lux_areacorr Implements flux area correction factors in the NUOPC cap
add if clause to a set_diffusivity OMP block.
…ate-2021-03-26 dev/gfdl main candidate 2021-03-26
add support for threading in cmeps
Feature/update to gfdl 20210402
…20210503 this is corresponding to GFDL main branch 20210503 commit (hash # e6ce6a8)
Feature/update to gfdl 20210503
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Update to EMC fork