NCAR sponge merge #1308
NCAR sponge merge #1308
Conversation
This reverts commit 3085520.
- This commit causes tc4 to fail.
- sp_tendency_temp and sp_tendency_salt are new diagnostic
variables which evaluate the respective tracer tendendies
(tr_units/sec).
- sp_tendency_u and sp_tendency_v diagnose the accelerations
(m/sec) applied from calls to the sponge routine.
- No attempt has been made to CMOR-ize these diagnostics.
- More work is needed to generalize this code for additional tracers.
- this PR includes updates from NCAR for uv momentum
sponge implementation.
- Diagnostics are included for tracer tendencies and
accelerations due to sponge terms.
- The uv sponge feature is currently not being tested. This will be
addressed in a future PR which will add sponge accelerations
to tc4.
- A previous bug in the 3-dimensional mask returned from this
routine in the case where the data to be interpolated reside
on the model's horizontal grid is retained using the 2018_answers flag.
- If 2018_answers is set to True, the mask is not properly initialized
and this leads to incorrect vertical reconstructions in the ALE
sponge code.
- 2018 flags (DEFAULT_2018_ANSWERS or HOR_REGRID_2018_ANSWERS)
should be set to False for any cases using sponge restoring for
tracers or momentum.
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #1308 +/- ##
============================================
- Coverage 45.94% 45.90% -0.05%
============================================
Files 234 234
Lines 72121 72269 +148
============================================
+ Hits 33138 33177 +39
- Misses 38983 39092 +109
Continue to review full report at Codecov.
|
There was a problem hiding this comment.
I have examined these changes and they seem well thought-out and useful. The issues that were raised with some of the versions have been addressed, and this PR has passed both the TC testing and the pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/12000. I think that it is ready to be merged into MOM6.
However, because of the large number of commits (28) within this PR relative to the changes, and the fact that a number of the intermediate commits had problems that would preclude their use in any kind of Git bisection, I am going to do this as a squash-merge.
This PR contains updates for u,v accelerations in MOM_ALE_sponge provided by NCAR.
where the returned mask was not initialized properly.