+Remapping consolidation, separation and cleanup #224
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
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #224 +/- ##
============================================
- Coverage 37.18% 37.13% -0.06%
============================================
Files 263 263
Lines 73035 73060 +25
Branches 13608 13605 -3
============================================
- Hits 27161 27130 -31
- Misses 40859 40919 +60
+ Partials 5015 5011 -4
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
Hallberg-NOAA
force-pushed
the
remapping_cleanup
branch
from
3b88da4 to
9b2a721
Compare
adcroft
approved these changes
Oct 26, 2022
There was a problem hiding this comment.
This is a good cleanup. Tested at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/17220
Created the new module remapping_attic to hold older versions of remapping code that are no longer used by MOM6. The subroutines is PosSumErrSignificant, remapByProjection, remapByDeltaZ and integrateReconOnInterval were moved to remapping_attic, where they can be tested by calling remapping_attic_unit_tests. The hard-coded old_algorithm logical module variable and the code it wraps were also eliminated. Also added a schematic description of the units of the real variables in the various routines in MOM_remapping and corrected some spelling errors. All answers are bitwise identical.
Moved interpolate_column and reintegrate_column (without changing anything) from MOM_diag_vkernels.F90 to MOM_remapping.F90 and incorporated the tests that had been in diag_vkernels_unit_tests into remapping_unit_tests. The entire MOM_diag_vkernels.F90 file was then removed. All answers are bitwise identical, although the module for two public routines was changed and a third was eliminated.
Remove missing_value arguments to interpolate_column and reintegrate_column, instead using 0 for the values in vanished cells. This change helps to address github.com/mom-ocean/issues/769. Also added comments schematically describing some of the argument units. Because 0 was already being used for the missing value (except in unit tests), all solutions are bitwise identical.
Added the new subroutine check_remapped_values with the duplicative error checking code in remapping_core_h and remapping_core_w, both to reduce code volume and promote code coverage, and to make the substance of these two routines easier to follow. All answers are bitwise identical.
Hallberg-NOAA
force-pushed
the
remapping_cleanup
branch
from
9b2a721 to
f9dbf76
Compare
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/17220 ✔️ |
marshallward
pushed a commit
that referenced
this pull request
Apr 4, 2023
…-main-2022-08-10 Merge GFDL to main (2022-08-10)
This was referenced Apr 6, 2023
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.
This PR consists of a series of commits that separate out older, unused
remapping code into a new, separate module (remapping_attic.F90), and collects
the remapping code that actually is used by MOM6 into MOM_remapping.F90. It
also includes changes to improve the documentation of the remapping code or to
stream-line it. The missing_value argument was eliminated in several places, in
response to github.com/mom-ocean/issues/769, and to reflect how the code is
actually being used. This PR is a prelude to other changes in a subsequent PR
that will make the remapping code practical for application more widely in the
MOM6 code, but which will unfortunately change some diagnostics by avoiding some
inflexible or inefficient constructs in the code as it is. Despite the addition
of several routines, MOM_remapping is 10% shorter than it was before. Although
several modules have changed, been added or removed, all answers are bitwise
identical, and all of the unit tests that were used before are still being used.
The commits in this PR include: