dev-gfdl-main-candidate-2022-01-29

- Rolled forward src/MOM6 and src/SIS2 to head of main circa Jan/Feb 2022.

SIS2 commits since last sync to main:
- NOAA-GFDL/SIS2@236fa72 (HEAD -> main, origin/main) Fix the result of a bad automated merge
- NOAA-GFDL/SIS2@87ff9e5 Merge pull request #164 from Hallberg-NOAA/fix_unit_descriptions
- NOAA-GFDL/SIS2@f020bba Merge branch 'dev/gfdl' into fix_unit_descriptions
- NOAA-GFDL/SIS2@94ac8bd Merge pull request #163 from Hallberg-NOAA/stock_0degC
- NOAA-GFDL/SIS2@b926925 Merge pull request #165 from Hallberg-NOAA/sum_output_cleanup
- NOAA-GFDL/SIS2@9d0329a (*)Correct SIS summed output, including salt units
- NOAA-GFDL/SIS2@d18605e Fixed 15 more variable unit descriptions
- NOAA-GFDL/SIS2@41c76d8 Corrected spelling errors in comments
- NOAA-GFDL/SIS2@98e926e Corrected comments in SIS_tracer_advect.F90
- NOAA-GFDL/SIS2@dde02fb Fixed 28 variable unit descriptions
- NOAA-GFDL/SIS2@b6a9dfd +(*)Report heat stocks relative to liquid at 0 degC
- NOAA-GFDL/SIS2@4e2454b Merge branch 'ridging_CS' into dev/gfdl
- NOAA-GFDL/SIS2@ed5f20a Merge branch 'ridging_CS' of https://github.com/ESMG/SIS2 into ridging_CS
- NOAA-GFDL/SIS2@04ab05d +Rescale G%Rad_Earth and set it via dG%Rad_Earth_L
- NOAA-GFDL/SIS2@0cb6a0a Use allocate with source to initialize arrays
- NOAA-GFDL/SIS2@e55a3eb Add a ridging control structure.
- NOAA-GFDL/SIS2@ae2b2e3 Attempting to add a control structure for ridging
- NOAA-GFDL/SIS2@0dc7d86 Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
- NOAA-GFDL/SIS2@906d26c Merge pull request #159 from marshallward/eos_ptr_removal
- NOAA-GFDL/SIS2@55032ff MOM EOS pointer API update
- NOAA-GFDL/SIS2@1c02a8f Add ice mass by category to diag options.
- NOAA-GFDL/SIS2@e3b5574 Merge pull request #156 from Hallberg-NOAA/fix_set_massless_tracer_arg
- NOAA-GFDL/SIS2@297ff46 +Change opt. arg. to set_massless_SIS_tracers

MOM6 commits since last sync to main:
- NOAA-GFDL/MOM6@e5563478 Improved fix for detecting symmetric mode output in refineDiag_ocean_month.py Update symmetric mode test to handle 2D or 3D input data. Also, check that the data and mask are 2 or 3D and 2D, respectively.
- NOAA-GFDL/MOM6@f5a84968 Fix for detecting symmetric mode output in refineDiag_ocean_month.py The data has shape of TIME,Y,X and the mask has shape of Y,X, so the symmetric mode check should compare the 2nd index for the data and the 1st index for the mask. If the mask Y value is one greater than the data Y value, then the output is symmetric.
- NOAA-GFDL/MOM6@6d9a98ef Update for locating basin codes in MOM6_refineDiag.csh The script currently looks for the codes in basin_codes.nc which does not exist in FRE output normally. Many FRE XMLs add basin_codes.nc to the history output before output staging, so the basin codes appear alongside the other history files with the YYYYMMDD.basin_codes.nc name. This update to the refineDiag wrapper script uses the YYYYMMDD.basin_codes.nc file as the basin codes if it exists.
- NOAA-GFDL/MOM6@ef61d50c MOM6: (*)Updated version of MOM6 after MOM6 PR #41
- NOAA-GFDL/MOM6@95221af5 MOM6: (*)Updated version of MOM6 and MOM_parameter_doc files
- NOAA-GFDL/MOM6@5ac8a699 Merge pull request #348 from Hallberg-NOAA/update_SIS2_version
- NOAA-GFDL/MOM6@0aa93483 Updated version of SIS2 and MOM_parameter_doc files
- NOAA-GFDL/MOM6@0b6dd99e MOM6: Fixes an uninitialized logical in FMS_cap
- NOAA-GFDL/MOM6@611d6e6b SIS2: +Rescale G%Rad_Earth and set it via dG%Rad_Earth_L
- NOAA-GFDL/MOM6@b5d2fa34 SIS2: Use allocate with source to initialize arrays
- NOAA-GFDL/MOM6@f9377ca3 MOM6: +Rescale tides and ramp-up times
- NOAA-GFDL/MOM6@1611c5c0 MOM6: Adding temperature restore capability for SPEAR. (#36)
- NOAA-GFDL/MOM6@85556792 MOM6: +Obsolete ETA_TOLERANCE_AUX
- NOAA-GFDL/MOM6@f05469d5 MOM6: change conversion H_to_MKS to H_to_m for u/veffA
- NOAA-GFDL/MOM6@11dd3dff Add omitted file to "Merge in recent minor updates"
- NOAA-GFDL/MOM6@d14218c5 MOM6 & SIS2: Merge in recent minor updates
- NOAA-GFDL/MOM6@31114023 MOM6: (*)Fix compile-time issues with MOM_sum_driver.F90
- NOAA-GFDL/MOM6@7e56f0e8 MOM6: +Argument cleanup in vertical diffusivity code
- NOAA-GFDL/MOM6@5d0c027e MOM6: Update available_diags and MOM_parameter_doc files
- NOAA-GFDL/MOM6@e2bebd2b MOM6: Refactored solo_driver/MOM_driver.F90
- NOAA-GFDL/MOM6@109e7898 MOM6: +(*)Fix bug when RES_SCALE_MEKE_VISC = True (#1512)
- NOAA-GFDL/MOM6@2276c470 MOM6: +Add new parameter FATAL_INCONSISTENT_RESTART_TIME (#1511)
- NOAA-GFDL/MOM6@271ab0b0 MOM6: +*Change defaults for 3 parameters to better values (#1509)
- NOAA-GFDL/MOM6@a90da93d MOM6: Done with EPBL docs?
- NOAA-GFDL/MOM6@8c6c667f MOM6: Particle API (#1504)
- NOAA-GFDL/MOM6@c138c521 MOM6: +Add BAROTROPIC_TIDAL_SAL_BUG to fix a tide bug
- NOAA-GFDL/MOM6@c3c46494 Merge pull request #344 from Hallberg-NOAA/set_default_params
- NOAA-GFDL/MOM6@10f46fd8 Explicitly set 3 parameters to default values
- NOAA-GFDL/MOM6@f5d708bc MOM6: Testing: Generalized dimension testing