Merge pull request JCSDA-internal#30 from JCSDA-internal/feature/2022…

….1.0

update version number

update submodule to latest commit (JCSDA-internal#26)

Merge branch 'dev/master' of github.com:NOAA-GFDL/MOM6 into dev/master

Draft of SCM idealized hurricane wind forcing

- New initialization and forcing for a single column model
  with idealized hurricane wind forcing.

Last version before splitting repository

- About to move tools/ and examples/ to CommerceGov/NOAA-GFDL-MOM6-examples.

Answer changing:

- Turned on MLE parameterization in OM4_025.
- Re-write of MEKE.
- Fix underflow in conservation test in remapping_core().

Significant non-answer changing:
- Switch most analysis to ocean_annual_z output.
- Verified end-to-end preprocessing for OM4_025.
- CMORization of some diagnostics.

- Added ocean_SIS2/OM4_025

- Numerous SIS2 updates
  - Multiple heat capacities
  - Enthalpy of sublimated snow/ice
  - Bug fix in C-grid wind stress for icebergs
  - Eliminated SIS1 transport option
- Overhaul of Phillips example to match Hallberg, 2013.

- SIS2
  - Rearranged calculation of part_sz(0)
  - Layer-wise accuracy checks

- Separated salt-restoring parameters in OM4_025 (simplifies CM4 configuration)
- A/B merge of applyBoundaryFLuxes()
- Moved '_z' output to new diagnostics component 'ocean_model_z'
- register_diag_field() catches unavailable diagnostics
- Added MEKE derived lateral viscosity (for back-scatter)
- Option to use Gill's equatorial deformation radius
- Numerous OpenMP updates
- Updated analysis grid for OM4_025

Added run-time parameters for latent heats of fusion/vaporization

- New parameters LATENT_HEAT_FUSION and LATENT_HEAT_VAPORIZATION.
- Default to FMS constants values HLF and HLV, respectively.
- single_column and single_column_z are using non-default values for HLV.
- No answer changes.

Mixed layer re-stratification

Code updates:
- Revised mixed-layer re-stratification parameterization (Fox-Kemper et al., 2010)
  to work for general coordinates, albeit with an arbitrary definition of mixed-
  layer depth.
- group updates from Zhi L.
- openMP updates from Zhi L.
- scalar diagnostics from John K.
- diag_table revisions for OM4 (MOM6 and SIS).
- CMORization of some diagnostics (optional) from John K.
- Latest CVmix (no answer change).

No answer changes since dev/master/2014.07.01 .

Significant answer changes:

- CVmix updated to CVMix/CVMix-src@61292f1. This includes a a rewrite of cvmix_kpp_coeffs_low() to mimic the POP order of operations as well as a disabling of enhanced diffusivity at the base of the mixed layer.

Roundoff answer changes:
- Applied bounds to integration limits in remapping.
- Added round-off adjustments in regrid_edge_values.F90 to avoid singular matices for vanishing layers.

Non-answer changing:
- Add z-remapped (lower vertical resolution) output to OM4
- Added more automatic analysis plots