+Fix some rescaling issues smoked out by the regional Bering domain #117
Conversation
remove conflict with dev/emc
further resolve conflict
put id_sppt_wts, etc back.
* remove white space and fix comment * Update MOM_oda_incupd.F90 remove unused index bounds, and fix sum_h2 loop. Co-authored-by: pjpegion <Philip.Pegion@noaa.gov> Co-authored-by: Marshall Ward <marshall.ward@noaa.gov>
- Pointing to OBC wiki file from the lateral parameterizations doc. - Using the MOM6 verbosity to control the time_interp verbosity. - Making the check for negative water depths more informative.
- Scaling of OBC's dz_src. - Scaling of CS%IDatu in MOM_barotropic.
Added the new run-time parameter ODA_2018_ANSWERS to recover the answers from the previous version of the code, which did not supply properly dimensional rescaled minimum thicknesses for the remapping calls in the ODA driver. When this is set to True, all answers are bitwise identical.
…omain_rescaling_fix
Hallberg-NOAA
added
bug
|
Because this is essentially a duplicate of #104, the conversation related to that pull request applies here. I had approved that PR, but we needed to create this PR to be able to resolve the conflicts with the dev/gfdl base branch without having to forcibly update ESMG:dev/esmg. |
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #117 +/- ##
=========================================
Coverage 28.77% 28.77%
=========================================
Files 248 248
Lines 72955 72964 +9
=========================================
+ Hits 20992 20995 +3
- Misses 51963 51969 +6
Continue to review full report at Codecov.
|
|
This PR passed pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/15305. |
This PR is a duplicate of #104, but is
being done on a branch so that it can be updated to reflect changes to dev/gfdl
without requiring a forced push to ESMG:dev/esmg. This PR corrects a number of
dimensional rescaling and related issues that were identified with Kate's
regional Bering sea domain.
Added unit conversion factors to some expressions setting the inverse of the
total depth to change them from [H-1] to [Z-1] in MOM_barotropic
Added a missing unit conversion factor in horiz_interp_and_extrap_tracer calls
in MOM_ALE_sponge
Eliminated the unused OBC function parse_segment_param_real and 4 other OBC
encoding integers, and made other OBC functions publicly visible
Do needed unit conversion on the output arrays returned from
time_interp_external
Converted htot (in H) to use the same unit scaling (Z) as MLD_guess in
MOM_energetic_PBL
Multiply by a tracer unit conversion factor in MOM_horizontal_regridding
Added minimal cell and edge thickness arguments to calls to remapping_core_h
in 5 files, along with run-time arguments to recreate existing solutions
The unused OBC_SIMPLE module use statement were eliminated in 8 files
The commits that are actually in this PR include:
ed850e24f Merge branch 'dev/esmg' of https://github.com/ESMG/MOM6 into Bering_domain_rescaling_fix
861a8f14d Use ODA_2018_ANSWERS to specify ODA remapping
b9697e220 Merge branch 'dev/gfdl' into dev/esmg
138396107 It would be good to initialize CS%answers_2018.
8d92579b2 Deleted an unused function, made public OBC funcs.
9c22ff272 Taking out some unused OBC constants.
3c7bd19ee More cleaning up for issue Z_R, L_R, T_RESCALE_POWER answers don't match for my Bering domain #54
4b218c07a Tweaks in response to Hallberg's comments.
7a2af6cb2 Merge branch 'dev/esmg' of github.com:ESMG/MOM6 into dev/esmg
57a1a8ae2 Rest of fix for issue Z_R, L_R, T_RESCALE_POWER answers don't match for my Bering domain #54.
41757c7a5 Fix the rebase
f50551ce4 Fix to Z_RESCALE bug in ePBL.
1e6924e03 More fixes for issue Z_R, L_R, T_RESCALE_POWER answers don't match for my Bering domain #54.
24f412d77 Part of the fix for issue Z_R, L_R, T_RESCALE_POWER answers don't match for my Bering domain #54.
The following are commits that were already in NOAA-GFDL/MOM6:dev/gfdl, but
because they were squashed or rebased, they are present with a different hash.
They are being imported again to allow the various versions of MOM6 to be fully
synchronized.
These are commits that were on dev/esmg and dev/gfdl with different hashes:
These commits have to do with the stochastics. Because there are many little
commits, a number of which undo each other, they should have been squashed or
otherwise restructured before they were committed to dev/emc or dev/esmg, but
now that they are on one of the primary development branches, these commits
need to be on all of them.