Skip to content
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
merged 10 commits into from
Apr 2, 2022

Conversation

Hallberg-NOAA
Copy link
Member

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:

  • 4c70d40de +Corrected units in dumbbell get_param calls
  • fad341ec2 MOM_neutral_diffusion code cleanup
  • ecf3ab0cb Minor get_param call reformatting
  • e0e88cf2d +Avoid nonsensical units descriptions
  • ffc97ab8f MOM_internal_tides diagnostic code simplification
  • 81a318b8a Rescale new_depth in apply_topography_edits_from_file
  • 5cef36743 Simplify diagnostics using global_area_integral
  • 1b6aaf16d Convert global_area_mean diagnostics when writing
  • 85cb7089b +Add optional conversion argument to register_diag_scalar

  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
Copy link

codecov bot commented Mar 26, 2022

Codecov Report

Merging #97 (a4bbcb4) into dev/gfdl (356671c) will increase coverage by 0.00%.
The diff coverage is 17.09%.

@@            Coverage Diff            @@
##           dev/gfdl      #97   +/-   ##
=========================================
  Coverage     28.98%   28.98%           
=========================================
  Files           246      246           
  Lines         72354    72352    -2     
=========================================
  Hits          20970    20970           
+ Misses        51384    51382    -2     
Impacted Files Coverage Δ
src/ice_shelf/MOM_ice_shelf.F90 0.00% <0.00%> (ø)
src/ice_shelf/MOM_marine_ice.F90 0.00% <0.00%> (ø)
src/initialization/MOM_state_initialization.F90 19.83% <0.00%> (ø)
...c/parameterizations/lateral/MOM_internal_tides.F90 0.00% <0.00%> (ø)
src/user/Idealized_Hurricane.F90 0.00% <0.00%> (ø)
src/user/MOM_wave_interface.F90 0.83% <0.00%> (ø)
src/user/Phillips_initialization.F90 0.00% <0.00%> (ø)
src/user/SCM_CVMix_tests.F90 0.00% <0.00%> (ø)
src/user/dumbbell_initialization.F90 0.00% <0.00%> (ø)
src/user/dumbbell_surface_forcing.F90 0.00% <0.00%> (ø)
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 356671c...a4bbcb4. Read the comment docs.

@marshallward
Copy link
Member

Gaea regression: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/-/pipelines/15142 ✔️ 🟡

  • IDL_HURR_TAU_CURR_REL description has changed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants