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

MOM6: +Pass total depths as arguments #1469

Merged
merged 13 commits into from
Aug 23, 2021

Commits on Aug 15, 2021

  1. +Add optional dZref argument to find_eta

      Added an optional dZref argument to the two find_eta routines so that the
    bathymetry can use a different reference height than is used for the interface
    heights.  By default, they use the same reference height and all answers are
    bitwise identical.  There is a new optional arguments (that is not yet being
    exercised with this commit, but has been tested and will be used in an upcoming
    commit) to two publicly visible interfaces.
    Hallberg-NOAA committed Aug 15, 2021
    Configuration menu
    Copy the full SHA
    6f1a191 View commit details
    Browse the repository at this point in the history
  2. Code cleanup in MOM_regridding

      Eliminated the depth argument to check_grid_column, along with some internal
    calculations that are never used.  Also corrected some comments.  All answers
    are bitwise identical.
    Hallberg-NOAA committed Aug 15, 2021
    Configuration menu
    Copy the full SHA
    a2df3b7 View commit details
    Browse the repository at this point in the history
  3. Longer error string in get_polynomial_coordinate

      Lengthened a message string in get_polynomial_coordinate so that it will give
    a valid fatal error message in some cases of failures rather than resulting a
    segmentation fault with no message output.  All answers are bitwise identical.
    Hallberg-NOAA committed Aug 15, 2021
    Configuration menu
    Copy the full SHA
    db43b35 View commit details
    Browse the repository at this point in the history
  4. +Add optional Z_0p argument to int_density_dz

      Added an optional Z_0p argument to the various Boussinesq density integral
    routines as a new intercept for the linear expression between the (arbitrary)
    interface heights and pressure used for the equation of state routines.  If
    omitted, this is equivalent to setting this intercept to 0, and all answers are
    bitwise identical.  There are new optional arguments to several publicly visible
    interfaces (that are not yet being exercised with this commit, but have been
    tested and will be used in an upcoming commit).
    Hallberg-NOAA committed Aug 15, 2021
    Configuration menu
    Copy the full SHA
    4d8d7af View commit details
    Browse the repository at this point in the history
  5. Corrects the routine indicated in 2 error messages

      Corrected error messages to indicate the right subroutine in
    rescale_dyn_horgrid_bathymetry.  All answers are bitwise identical.
    Hallberg-NOAA committed Aug 15, 2021
    Configuration menu
    Copy the full SHA
    e4ffa76 View commit details
    Browse the repository at this point in the history
  6. Prep initialization for reference height changes

      Added the optional argument dZ_ref_eta to adjustEtaToFitBathymetry so that the
    bathymetry can use a different reference height than is used in this routine.
    Also changed the name and reversed the sign of the depth (now Z_bot) argument to
    find_interfaces, and a new Z_bottom array in MOM_temp_salt_initialize_from_Z.
    An extra unit conversion factor was eliminated from MOM_state_init_tests.  All
    answers are bitwise identical, and all of these changes are internal to this
    module.
    Hallberg-NOAA committed Aug 15, 2021
    Configuration menu
    Copy the full SHA
    7cc0582 View commit details
    Browse the repository at this point in the history
  7. Cleanup of comments in MOM_ALE_sponge.F90

      Extensive inconsequential cleanup in MOM_ALE_sponge.F90, including the
    elimination of a dozen unnecessary index-range elements of the ALE_sponge_CS and
    modifying a number of comments to be much more descriptive.  This included the
    correction of numerous spelling errors and other typos in comments.  All answers
    are bitwise identical.
    Hallberg-NOAA committed Aug 15, 2021
    Configuration menu
    Copy the full SHA
    62446ec View commit details
    Browse the repository at this point in the history
  8. (*)Fix dimensionally inconsistent MEKE beta calcs

      Corrected dimensional inconsistencies in the negligible thicknesses in the
    denominators of the expressions for the topographic betas in MEKE_equilibrium
    and MEKE_lengthScales.  This could change answers in strange cases, but seems
    unlikely to do so (partly because it is in a max expression, and not added), and
    did not change any answers in the MOM6-examples test suite.
    Hallberg-NOAA committed Aug 15, 2021
    Configuration menu
    Copy the full SHA
    c72d441 View commit details
    Browse the repository at this point in the history
  9. Added comments highlighting bugs

      Added comments denoted with "###" indicating bugs or conceptual errors in
    update_OBC_segment_data, horizontal_viscosity, thickness_diffuse and wave_speed.
    Only comments and the case of some indices are changed in this commit, and all
    answers are bitwise identical.  Actually correcting these bugs would probably
    change answers in some cases.
    Hallberg-NOAA committed Aug 15, 2021
    Configuration menu
    Copy the full SHA
    5017bf6 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2021

  1. +Pass depth_tot to initialization routines

      Added depth_tot arguments to explicitly pass the total depth to various
    initialization routines for the thicknesses, sponges, or temperatures.  These
    routines had previously used G%bathT for this role, but this change prepares to
    allow the reference depth for the bathymetry to change without requiring these
    routines to be changed to accommodate it.  All answers are bitwise identical,
    but there are new arguments to about two dozen routines.
    Hallberg-NOAA committed Aug 17, 2021
    Configuration menu
    Copy the full SHA
    3cda6fd View commit details
    Browse the repository at this point in the history
  2. +Pass depth_tot around within MOM_MEKE

      Added a new argument, depth_tot, to three routines within MOM_MEKE.F90 to
    replace places where G%bathyT had been used.  This new depth_tot variable is
    currently set to G%bathyT, but there is commented-out code suggesting a more
    appropriate expression based on the temporally evolving total thickness of
    the water column.  All answers are bitwise identical, but there are new
    arguments to 3 private routines.
    Hallberg-NOAA committed Aug 17, 2021
    Configuration menu
    Copy the full SHA
    8a0ae94 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    23d0076 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3150c9f View commit details
    Browse the repository at this point in the history