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

+Cleanup of MOM_diag_manager_infra interfaces #1316

Merged
merged 2 commits into from
Feb 10, 2021

Conversation

Hallberg-NOAA
Copy link
Collaborator

Renamed the interfaces send_data_fms_wrapper to send_data_infra, and
register_...field_fms_wrapper to register..._field_infra. Also removed some
of the optional arguments from these interfaces that are never used in MOM6 and
rearranged the order of the optional arguments to send_data_infra to make more
sense given how they are used in MOM6. Also regularized the formatting of the
argument descriptions in MOM_diag_manager_infra.F90 to match the patterns
elsewhere in the MOM6 code and corrected some incorrect comments. In addition,
removed the error messages about obsolete diagnostics from found_in_table() and
put them back into the MOM_obsolete_diagnostics module in the new local
subroutine diag_found(). All answers are bitwise identical, although there are
some interface changes.

  Renamed the interfaces send_data_fms_wrapper to send_data_infra, and
register_..._field_fms_wrapper to register_..._field_infra.  Also removed some
of the optional arguments from these interfaces that are never used in MOM6 and
rearranged the order of the optional arguments to send_data_infra to make more
sense given how they are used in MOM6.  Also regularized the formatting of the
argument descriptions in MOM_diag_manager_infra.F90 to match the patterns
elsewhere in the MOM6 code and corrected some incorrect comments.  In addition,
removed the error messages about obsolete diagnostics from found_in_table() and
put them back into the MOM_obsolete_diagnostics module in the new local
subroutine diag_found().  All answers are bitwise identical, although there are
some interface changes.
@codecov
Copy link

codecov bot commented Feb 5, 2021

Codecov Report

Merging #1316 (bbee379) into dev/gfdl (d572fd5) will increase coverage by 0.00%.
The diff coverage is 39.24%.

Impacted file tree graph

@@            Coverage Diff            @@
##           dev/gfdl    #1316   +/-   ##
=========================================
  Coverage     45.79%   45.79%           
=========================================
  Files           234      234           
  Lines         72472    72476    +4     
=========================================
+ Hits          33192    33194    +2     
- Misses        39280    39282    +2     
Impacted Files Coverage Δ
src/ice_shelf/MOM_ice_shelf_diag_mediator.F90 0.00% <0.00%> (ø)
src/framework/MOM_diag_mediator.F90 66.43% <20.00%> (+0.06%) ⬆️
src/framework/MOM_diag_manager_infra.F90 48.64% <25.92%> (-1.36%) ⬇️
src/diagnostics/MOM_obsolete_diagnostics.F90 84.84% <83.33%> (-7.46%) ⬇️

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 d572fd5...b9e3f5a. Read the comment docs.

@adcroft
Copy link
Collaborator

adcroft commented Feb 8, 2021

1 similar comment
@adcroft
Copy link
Collaborator

adcroft commented Feb 8, 2021

type(diag_ctrl), intent(in) :: diag !< A structure used to control diagnostics.
character(len=*), intent(in) :: varName !< The obsolete diagnostic name
character(len=*), optional, intent(in) :: newVarName !< The valid name of this diagnostic
! Local
integer :: handle ! Integer handle returned from diag_manager

! We use register_static_field_fms() instead of register_static_field() so
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment reminds me we should create an option to pass to register() that avoids logging the diagnostic so we can then also list static diagnostics in the list available diagnostics.

@adcroft adcroft merged commit bd96811 into mom-ocean:dev/gfdl Feb 10, 2021
@Hallberg-NOAA Hallberg-NOAA deleted the diag_infra_cleanup branch July 30, 2021 18:04
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