forked from mom-ocean/MOM6
-
Notifications
You must be signed in to change notification settings - Fork 66
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
+Standardize diagnostic rescaling and get_param calls #97
Merged
marshallward
merged 10 commits into
NOAA-GFDL:dev/gfdl
from
Hallberg-NOAA:diag_conversion
Apr 2, 2022
Merged
+Standardize diagnostic rescaling and get_param calls #97
marshallward
merged 10 commits into
NOAA-GFDL:dev/gfdl
from
Hallberg-NOAA:diag_conversion
Apr 2, 2022
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
Add the optional conversion argument to register_diag_scalar, which works analogously to the argument that is already available in register_diag_field. All answers are bitwise identical, but there is a new optional argument in a public type.
Use conversion argument during registration and tmp_scale argument in the calls to global_area_mean for averaged fields in the MOM_forcing_type and MOM_diagnostics modules. Also added or corrected some descriptive comments and fixed an extra unit conversion factor in one recently added calculation of ustar that was likely not used. All answers are bitwise identical.
Use the tmp_scale argument in calls to global_area_integral to simplify some global integrals, and added dimensional rescaling for the time_step element of the ice_shelf control structure. Also corrected some dimensional descriptions in comments. All answers are bitwise identical.
Rescaled the new_depth variable in apply_topography_edits_from_file, and used source arguments to initialize 6 allocated variables. All answers are bitwise identical.
Replaced a call to global_area_mean with a call to global_area_integral in a diagnostic calculation in the internal_tides module. Also added descriptions of the dimensions of a number of variables in this module, or eliminated the dimension description of several integers (for which units make no sense). Only an unused debugging diagnostic is changed, and all solutions are bitwise identical.
Eliminated units arguments for logical, integer, or character string get_param calls where the units make no sense. In some other cases, calls were slightly revised to place the units and scale arguments on the same line for easier detection of inconsistent settings. All answers are bitwise identical, but the MOM_parameter_doc.all files for some test cases are corrected.
Revised get_param calls to put the units and scale arguments on the same line, to help detect inconsistent settings. All answers and output are bitwise identical.
Eliminated a commented-out get_param call and use a source argument to initialize some arrays. All answers and output are bitwise identical.
Corrected the units in some get_param calls in the dumbbell test case. All answers are bitwise identical, but there will be minor changes in the MOM_parameter_doc files for the dumbbell test case.
Codecov Report
@@ Coverage Diff @@
## dev/gfdl #97 +/- ##
=========================================
Coverage 28.98% 28.98%
=========================================
Files 246 246
Lines 72354 72352 -2
=========================================
Hits 20970 20970
+ Misses 51384 51382 -2
Continue to review full report at Codecov.
|
marshallward
approved these changes
Apr 2, 2022
Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/15142 ✔️ 🟡
|
This was referenced May 16, 2022
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 number of commits to standardize where certain
global-mean diagnostics are unscaled, correct or improve the units or syntax of
some get_param calls, and otherwise clean up irregular code. All answers are
bitwise identical, but there are some minor changes in the parameter_doc output
files for a few test cases.
The commits in this PR include: