+Use verticalGrid_type to specify vertical extents #1268
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
Use GV%ke instead of G%ke everywhere in the MOM6 code to get the number of layers in a configuration. This required the addition of new vertical_grid_type arguments to a number of subroutines, and some unused variables were deleted. This is one of the final steps in a very long-term project to separate the vertical and horizontal grid types. All answers are bitwise identical, but there are new (non-optional) arguments to 51 subroutines.
Use the vertical extent from the verticalGrid_type argument GV instead of the extent from the ocean_grid_type argument G to specify the vertical extent of arrays in memory in array declarations. There 18 subroutines where new vertical_grid_type arguqments were needed, and some comments were corrected. All answers are bitwise identical, but there are new (non-optional) arguments to 18 subroutines.
The MOM6 style guide clearly states that MOM6 uses a two space indent between code levels, to enhance the readability of the MOM6 code. Continuation lines are typically indented 4 or more spaces. This commit corrects several hundred lines that did not conform to this standard. All answers are bitwise identical.
Corrected additional cases where the line indent pattern does not match the MOM6 standards, especially in some routines in MOM_open_boundary.F90, MOM_diag_mediator.F90, and MOM_ice_shelf related code. All answers are bitwise identical.
Corrected non-standard spacing around semicolons separating do loops or if tests on a single line, following MOM6 code standards. (If Marshall wins his planned argument against allowing such constructs, this enforcement of standards will help in getting rid of them.) All answers are bitwise identical.
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #1268 +/- ##
============================================
- Coverage 45.89% 45.88% -0.01%
============================================
Files 225 225
Lines 71406 71396 -10
============================================
- Hits 32769 32763 -6
+ Misses 38637 38633 -4
Continue to review full report at Codecov.
|
Added GV to the shared declaration in an openMP directive. All answers are bitwise identical.
This added merge was done to reconcile two separate merges of dev/gfdl onto the ke_from_GV branch. It should have no effect except to clean up the git history.
Corrected the statement setting use_ice_shelf in initialize_MOM, which somehow was not merged in correctly, presumably due to human error, when dev/gfdl was merged into this branch. All answers are bitwise identical.
|
This PR is being tested with https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/11794. |
Added GV to the shared declaration in an openMP directive. All answers are bitwise identical.
Added GV to the shared declaration in another openMP directive. All answers are bitwise identical.
|
This PR passed the revised pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/11796. |
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.
Completed the move to use the verticalGrid_type, and not the ocean_grid_type,
to specify the number of layers and the vertical extents in memory of 3-d
arrays. This required the addition of new GV arguments in dozens of routines.
This PR also includes some extensive corrections in the nonstandard use of white
space, so when this is reviewed, I recommend that the "ignore whitespace" flag
be turned on. There were also a few comments that were corrected. Although
there are interface changes, there should be no answer or output changes to
any MOM6 configurations.
The commits in this PR include: