-
Notifications
You must be signed in to change notification settings - Fork 236
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
MOM6: +Corrected the use of array syntax calculations #1108
Merged
marshallward
merged 7 commits into
mom-ocean:dev/gfdl
from
Hallberg-NOAA:array_syntax_cleanup
May 12, 2020
Merged
MOM6: +Corrected the use of array syntax calculations #1108
marshallward
merged 7 commits into
mom-ocean:dev/gfdl
from
Hallberg-NOAA:array_syntax_cleanup
May 12, 2020
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
Replaced array syntax arithmetic with explicit loops in shelf_calc_flux, so that uninitialized values in halo points could not trigger model failures. All answers are bitwise identical.
Replaced array syntax sums in MOM_internal_tides with explicit loops. Also documented internal variable units in MOM_internal_tides, and noted an incorrect expression in PPM_angular_advect with a comment (with '###') and a suggested correction. All answers are bitwise identical because the bug was noted but not corrected.
Added array-syntax notation for full-array copies in offline_diabatic_ale. All answers are bitwise identical.
Removed duplicated dimension declarations for two ppoly variables in bulk_average in MOM_lateral_boundary_diffusion. When I first saw these declarations, they were confusing to me, as I was unsure at first whether they are actually declaring 4-d arrays or 2-d arrays (it is the latter). Also removed unneeded full array syntax in 2 subroutine calls, and merged a pair of do-loop statements with common loop contents. All answers are bitwise identical.
Combined scaling factors when reading internal tide TKE input from a file for use with the Nikurashin mixing scheme, while also eliminating an array-syntax multiplication. All answers are bitwise identical.
Added grid type arguments to calls to update_ALE_sponge_field so that the internal array pointers set by this routine will use the same indexing conventions as the rest of the MOM6 code. Also added comments describing some arguments and other variables and got rid of some unneeded line continuations in MOM.F90. All answers are bitwise identical, but there are two new arguments to update_ALE_sponge_field.
Added array-syntax notation for a full-array copy in ISOMIP_Tracer.F90. All answers are bitwise identical.
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #1108 +/- ##
============================================
- Coverage 46.06% 45.78% -0.29%
============================================
Files 214 214
Lines 69361 69352 -9
============================================
- Hits 31954 31751 -203
- Misses 37407 37601 +194
Continue to review full report at Codecov.
|
Gaea regression test: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/pipelines/10368 Test has passed. |
marshallward
approved these changes
May 12, 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.
Corrected the use (or misuse) of array syntax in assignments and arithmetic,
and added new grid arguments to update_ALE_sponge_field so that the correct
array indexing will be used in the sponges if global indexing is used. All
answers are bitwise identical in the MOM6-examples test suite, and there are no
changes to any output files. This PR enforces some MOM6 coding conventions
regarding the use of array syntax and prepares to try global indexing. The
commits in this PR include: