Feature/update to gfdl 20201215 #45
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
* turned off pressure force * hard-coded BLD * turned off advect_tracer * set NTR = 2
This commit adds a linear transition from full LBD at k=k_min to zero LBD at k=k_max. This is applied to both methods currently available in the LBD module. Another modification is the fact that both methods no longer compute average values at k_min (done previously via average_value_ppoly). Instead, the full layer thicknesses are now used.
This patch adds the option to apply a linear decay of the fluxes at the base of hbl. This had been already implemented but since it breaks the unit tests, which were designed to work without this option, adding this option will avoid breaking the tests.
When using the option to apply neutral diffusion only below the surface boundary layer we were using (1.-zeta). This is wrong. It should be just (zeta).
Valid options are: * PARAM - use the vector-parameter LBD_DZ_TOP * UNIFORM[:N] - uniformly distributed * FILE:string - read from a file
For each tracer point: * tracers at (I,j), (I+1,j), (i,J) and (i,J+1) are remapped to a defined zgrid; * Apply LBD, uflux and vflux are calculated using the zgrid * Remap fluxes to native grid * Apply tracer convergence in the native grid TODO: * cleanup * create a zgrid for each pair of column taking into consideration h_L, h_R, BLD_L and BLD_R.
* Add functions to merge thicknesses and BLDs * z_top is now defined every time-step using this information * added unit tests
* adding new functions to sort, swap, and remove duplications in 1D arrays * updating unit tests * clean the module
…idate-ncar-2020-08-11
* Adding a clock for LBD * Delete unecessary comments and clean up the code * Polish doxumentation
Make long character variables deferred length
z_max = min(BLD_max, H_min), where BLD_max is the deepest BLD and H_min is the shallowest water column depth.
A few fixes to get it to compile with gfortran.
Introduce a controllable stdout unit in MOM_io
…ed_10nov2020 Major updates to the LBD module
…-ncar-2020-12-15 Main candidate from NCAR (12/15/2020)
…update-to-GFDL-20201215 this is corresponding to GFDL main branch commit 20201218 (hash # 0f664aa)
|
add RT log |
DeniseWorthen
approved these changes
Dec 19, 2020
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.
Description of changes
update EMC MOM6 to GFDL 20201218 main branch commit
Specific notes
Issues Fixed (include github issue #):
MOM6 Issue #44
Are changes expected to change answers?
Testing performed:
Hashes used for testing
NEMS: b800b340
FMS: f61416f
CMEPS: 47dcaf1e
CICE: f773ef38
FV3: 377c7e5df
WW3: 9c22b135
DATA: 1e9ab6ed
CMakeModules: 18658695a
stochastic_physics: e4913c06
MOM6: 5d0f8b4 (https://github.com/jiandewang/MOM6/tree/feature/update-to-GFDL-20201215)