Main to dev/gfdl#347
Merged
Merged
Conversation
Address comment from reviewer by adding units to covTS and varS.
* Add ``implicit none ; private`` to this module; * Put module variables into the control structure for this module; * Add the description of the units for all real variables; * Add a consistent two-point indent throughout the module . TODO: Without further modifications, adding ``private`` to the control structure of this module will break the model. Currently, MOM.F90 needs access to ``use_stoch_eos``, ``stanley_coeff``, and some of the diagnostic ids.
…the ideal age module. This PR also adds the ability to use the actual BL depth that is diagnosed by the active BL scheme inside the ideal age module (for all ideal age tracers).
"boundary layer" instead.
Bring in latest main changes (GFDL to main 2022-07-21)
…-main-2022-08-10 Merge GFDL to main (2022-08-10)
In preparation for implementing the option to apply a vertical smooth filter in the Richardson number multiple times, the parameter SMOOTH_RI (logical) was renamed to N_SMOOTH_RI (interger). If N_SMOOTH_RI = 0 (default), smoothing is not performed. If N_SMOOTH_RI > 0, smoothing will be applied N_SMOOTH_RI times.
Currently, there are two diagnostics related to the gradient Richarson number and these are described as follows: * ri_grad_shear : Gradient Richarson number used by MOM_CVMix_shear module; * ri_grad_shear_smooth : Smoothed gradient Richarson number used by MOM_CVMix_shear module. The description for ri_grad_shear is misleading. If smoothing is applied, ri_grad_shear *is not* the RI number used by MOM_CVMix_shear module. In this commit. I propose to avoid this potential confusion by renaming ri_grad_shear_smooth to ri_grad_shear_orig and, if N_SMOOTH_RI > 0, use ri_grad_shear to store the smoothed profiles. * ri_grad_shear_orig : Original gradient Richarson number, before smoothing was applied. This is part of the MOM_CVMix_shear module and only available when N_SMOOTH_RI > 0. No change in answers for GMOM.
This commit adds the option to smooth the gradient Richardson number multiple times using a 1-2-1 filter. The number of times that the filter is applied is controlled by parameter N_SMOOTH_RI.
The correct order is lon_min lon_max lat_min lat_max ... and not lat_min lat_max lon_min lon_max.
Improvements in the gradient Ri # calculation/diagnosis (MOM_CVMix_shear)
Fix string order in the instructions for defining regional_section
add ML tracer to ideal age module
Testing to see if GH actions is failing due to MPI installation
(*) Merge GFDL to main (2022-10-27)
This patch fixes two issues in the POSIX API. The `siglongjmp` interface was referencing the wrong symbol (`longjmp`). While this did not seem to cause any issues, possibly due to some shared definitions on glibc/BSD platforms, the error was correctly detected by the Cray compiler. This patch corrects the C symbol name. The `sigsetjmp_missing` function, as a default replacement for a missing `sigsetjmp`, was also defined without a return value, since it always returns an error if called at runtime. The Cray compiler raised a warning about this, so we now assign a return value of -1, although it is never used. Thanks to Jim Edwards for reporting these errors.
POSIX: siglongjmp and sigsetjmp_missing fixes
Fix NUOPC gnu restart issue by removing leading spaces in restartfiles list
use more cesm style logging
Merge with mom-ocean
…023-03-02 NCAR to main candidate branch (2023-3-02)
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #347 +/- ##
============================================
+ Coverage 37.16% 37.19% +0.03%
============================================
Files 265 263 -2
Lines 74508 73147 -1361
Branches 13839 13625 -214
============================================
- Hits 27692 27209 -483
+ Misses 41722 40926 -796
+ Partials 5094 5012 -82
... and 121 files with indirect coverage changes 📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
Member
Author
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/18748 ✔️
There was a minor conflict to resolve in the CVMix layer related to the Ri smoothing. The new counter and the changes to comments around the counter had to be resolved. |
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
6 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.
Includes recent updates from NCAR.
(NOTE: This PR is primarily for documentation and testing. Do not update the branch against dev/gfdl or merge it through GitHub.)