MOM6: +Document data_override routines #1314
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
Added two new files, MOM_data_override.F90 and MOM_data_override_infra.F90, to wrap the calls to the FMS data_override module, and to add MOM-specific variants of these calls, including the ability to rescale quantities that are modified by data_override into the right units or to use the right sign convention. All answers are bitwise identical, but there are new interfaces.
Use the new MOM_data_override interfaces in the MOM6/config_src/solo_driver, MOM6/config_src/coupled_driver, and MOM6/src code, instead of directly accessing the mpp data_override_mod routines. As a part of these, the dimensional rescaling of variables is now done in many places via a scale argument to data_override. The changes in the solo_driver code are more extensive because they were using arguments that do not seem to make sense, and because one of the expressions had omitted dimensionally rescaling factors, although this expression does not appear to have been used in any existing tests. In addition, the get_param calls for BUOY_CONFIG and WIND_CONFIG had not been describing all of the available options, including data_override; this has now been fixed. A number of spelling errors in the same file were also corrected. All answers are bitwise identical, but there are changes to some entries in some MOM_parameter_doc files.
Moved MOM_spatial_means.F90 from src/framework to src/diagnostics, and eliminated MOM_transform_FMS.F90, which is no longer used. Also correct an instance of "the the " in one MOM_parameter_doc description, which changes some MOM_parameter_doc.layout files. All answers are bitwise identical.
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #1314 +/- ##
============================================
+ Coverage 45.77% 45.80% +0.02%
============================================
Files 234 234
Lines 72507 72465 -42
============================================
Hits 33193 33193
+ Misses 39314 39272 -42
Continue to review full report at Codecov.
|
|
This PR has conditionally passed the pipeline testing at https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/12006, with the expected messages that some of the MOM_parameter_doc files have changed, so that the reference files in MOM6-examples will have to be updated. |
adcroft
approved these changes
Feb 5, 2021
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 includes commits that add the new files MOM_data_override.F90 and
MOM_data_override_infra.F90 to document the data_override interfaces and provide
new interfaces or optional arguments that are tailored to their use by MOM6. It
also includes changes to other modules to use these new interfaces, along with
some cleanup of files in the framework directory. All answers are bitwise
identical, but there are changes to the documentation messages in some
MOM_parameter_doc files. The commits in this PR include: