Main to dev #71
Merged
Main to dev #71
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
The read_variable_2d function was previously configured to only run if the start and nread arrays matched the size of the field they were accessing. This was incompatible with the history of the function, which had previously required a fourth time axis (of one record), then was later modified to not require this axis. As a result, there are now files in use both with and without a time axis. This patch relaxes this check to ensure that the read is quasi-2d, i.e. the first two axes can read a segment of a 2d field, but will now reshape the start and nread arrays to match the field being read. Some additional checks are also added to ensure that it only reads one 2d slice.
Pointers to the diabatic driver's energetic PBL field are now only associated when `use_energetic_PBL` is true. The `energetic_PBL` field was also renamed to `ePBL` to avoid potential conflict with the `energetic_PBL` subroutine. Thanks to Alper Altuntas for detecting this issue and the proposed fix. Co-Authored-By: Alper Altuntas <[email protected]>
…ate-2022-01-29 GFDL to main (Jan 2022)
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #71 +/- ##
============================================
- Coverage 29.00% 29.00% -0.01%
============================================
Files 244 244
Lines 71885 71921 +36
============================================
+ Hits 20852 20861 +9
- Misses 51033 51060 +27
Continue to review full report at Codecov.
|
|
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/14797 ✔️ |
Hallberg-NOAA
approved these changes
Feb 21, 2022
There was a problem hiding this comment.
This commit is already on the main branch, and it all seems reasonable. This has passed TC testing and pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/14820.
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.
Merge of mom-ocean#1556 to dev/gfdl