Skip to content

MOM6: +Miscellaneous code cleanup#1077

Merged
marshallward merged 6 commits into
mom-ocean:dev/gfdlfrom
Hallberg-NOAA:misc_cleanup
Mar 19, 2020
Merged

MOM6: +Miscellaneous code cleanup#1077
marshallward merged 6 commits into
mom-ocean:dev/gfdlfrom
Hallberg-NOAA:misc_cleanup

Conversation

@Hallberg-NOAA
Copy link
Copy Markdown
Collaborator

This PR includes a number of minor changes to clean up the MOM6 code,
including corrections to comments, removing an unnecessary halo update
rescaling of internal diagnostic calculations, and refactoring of the
find_interfaces code to avoid lots of unnecessary copies and to match the code
style used elsewhere in the MOM6 code. There are no changes to solutions,
diagnostics, or output files. The commits in this PR include:

  Corrected documented units in comments, corrected spelling errors in comments
and removed unused variables.  All answers are bitwise identical.
  Rescaled the calculations of diagnostics of the integrated mass transports, column integrated
temperature and salinity, cell thicknesses and column mass for dimensional consistency
testing.  All answers are bitwise identical.
  Rescaled the density derivatives used in full_convection, smoothed_dRdT_dRdS
and user_change_diff.  This change requires that new unit_scale_type arguments
be passed to these three subroutines.  All answers are bitwise identical.
  Converted find_interfaces from a function to a subroutine and revised
determine_temperature to rescale arguments and internal variables.  Also made
the declaration of array sizes consistent with other MOM6 code.  All answers
are bitwise identical, but there are changes to public interfaces.
  Removed an unneeded halo update in iceberg_forces.  All answers are bitwise
identical.
@Hallberg-NOAA
Copy link
Copy Markdown
Collaborator Author

This PR is being tested with https://gitlab.gfdl.noaa.gov/ogrp/MOM6/pipelines/10041.

Please note that there are no conflicts between the four recent PRs, #1074, #1075, #1076, and #1077, and they can be handled in any order. Three of these should be automatically verified and just involve the push of a green button, while the fourth ( #1074) does require updates to the available_diags files.

@marshallward
Copy link
Copy Markdown
Collaborator

I trust you that these are non-overlapping, but I also think that we should follow the process and re-submit to Gaea after each PR merge, and might as well start at the beginning of the queue.

My Lustre issue appears to have been solved, so I will work through them now.

@adcroft
Copy link
Copy Markdown
Collaborator

adcroft commented Mar 19, 2020

I would not trust that multiple PRs are non-overlapping. I always re-submit the gitlab pipeline after a previous PR has changed the code.

@marshallward
Copy link
Copy Markdown
Collaborator

marshallward commented Mar 19, 2020

Gaea regression test: https://gitlab.gfdl.noaa.gov/ogrp/MOM6/pipelines/10044

No regressions, test has passed.

@marshallward marshallward merged commit b8afb90 into mom-ocean:dev/gfdl Mar 19, 2020
@Hallberg-NOAA Hallberg-NOAA deleted the misc_cleanup branch July 30, 2021 18:50
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.

3 participants