MOM6: Merge branch 'gustavo-marques-legacy_diabatic_driver' into dev/…

…master

- PR from NCAR to dev/master

- NOAA-GFDL/MOM6@7b8698c Merge branch 'gustavo-marques-legacy_diabatic_driver' into dev/master
- NOAA-GFDL/MOM6@c6020a1 Merge branch 'legacy_diabatic_driver' of https://github.com/gustavo-marques/MOM6 into gustavo-marques-legacy_diabatic_driver
- NOAA-GFDL/MOM6@4f5dee8 Merge pull request #59 from gustavo-marques/add_legacy_diabatic_driver
- NOAA-GFDL/MOM6@387f4e6 Add a legacy version of diabatic_driver
- NOAA-GFDL/MOM6@5a58c34 Merge pull request #58 from alperaltuntas/update_halo_OBLdepth
- NOAA-GFDL/MOM6@adc133e Merge remote-tracking branch 'origin/dev/ncar' into HEAD
- NOAA-GFDL/MOM6@90e8f93 Update halo OBLdepth before smoothing
- NOAA-GFDL/MOM6@439041a Merge pull request #57 from alperaltuntas/merge_with_candidate_may15
- NOAA-GFDL/MOM6@91e459a 2/2 - merge with candidate may15
- NOAA-GFDL/MOM6@e0a5538 1/2 - merge with candidata may15
- NOAA-GFDL/MOM6@bfa2613 move KPP_compute_BLD to streamline merging
- NOAA-GFDL/MOM6@eadf2f2 Merge pull request #56 from alperaltuntas/introduce_cvmix_tidal
- NOAA-GFDL/MOM6@bde57f3 rm trailing whitespaces
- NOAA-GFDL/MOM6@8f73056 implement smoothing on OBL depth
- NOAA-GFDL/MOM6@29a458a remove unnecessary vars in KPP_calculate
- NOAA-GFDL/MOM6@34e4cf4 use 2d CS arrays for OBLdepth and kOBL
- NOAA-GFDL/MOM6@c2a6ed8 add smoothBLD var
- NOAA-GFDL/MOM6@82d9228 rename KPP_compute_OBL as KPP_compute_BLD
- NOAA-GFDL/MOM6@85810d2 remove unnecessary KPP_compute_OBL arguments
- NOAA-GFDL/MOM6@80d9323 restore KPP_calculate for now
- NOAA-GFDL/MOM6@72774d7 split OBL depth computation and KPP_calculate
- NOAA-GFDL/MOM6@9ce97ef use unmodified CVMix_compute_Schmittner_invariant interface
- NOAA-GFDL/MOM6@bab2e43 merge with dev/ncar
- NOAA-GFDL/MOM6@05a2e59 debug 3d tidal energy remapping
- NOAA-GFDL/MOM6@c04f455 add diagnostics for schmittner
- NOAA-GFDL/MOM6@93f242f call cvmix_coeffs_tidal_schmittner
- NOAA-GFDL/MOM6@9703e7c remap tidal energy from input coord to model coord
- NOAA-GFDL/MOM6@9590f3b Merge remote-tracking branch 'altuntas/initialize_tidal_ctrl_vars' into introduce_cvmix_tidal
- NOAA-GFDL/MOM6@b280bfd resolve conflict
- NOAA-GFDL/MOM6@0e4dce5 add cvmix_compute_SchmittnerCoeff
- NOAA-GFDL/MOM6@f132940 add call to compute_Schmittner_invariant
- NOAA-GFDL/MOM6@20cc62b add capability to read ER03 energy file
- NOAA-GFDL/MOM6@8a4a5ed distinguish profiles and cvmix schemes

coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ice_ocean_SIS2/Baltic/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ice_ocean_SIS2/SIS2/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all

@@ -28,6 +28,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all

@@ -30,6 +30,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all

@@ -30,6 +30,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all

@@ -30,6 +30,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate
@@ -1004,6 +1007,9 @@ APPLY_NONLOCAL_TRANSPORT = True !   [Boolean] default = True
                                 ! If True, applies the non-local transport to heat and scalars.
                                 ! If False, calculates the non-local transport and tendencies but
                                 ! purely for diagnostic purposes.
+SMOOTH_BLD = False              !   [Boolean] default = False
+                                ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT.
+                                ! computed via CVMix to reduce any horizontal two-grid-point noise.
 RI_CRIT = 0.3                   !   [nondim] default = 0.3
                                 ! Critical bulk Richardson number used to define depth of the
                                 ! surface Ocean Boundary Layer (OBL).

ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all

@@ -30,6 +30,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all

@@ -30,6 +30,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all

@@ -30,6 +30,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate
@@ -1004,6 +1007,9 @@ APPLY_NONLOCAL_TRANSPORT = True !   [Boolean] default = True
                                 ! If True, applies the non-local transport to heat and scalars.
                                 ! If False, calculates the non-local transport and tendencies but
                                 ! purely for diagnostic purposes.
+SMOOTH_BLD = False              !   [Boolean] default = False
+                                ! If True, applies a 1-1-4-1-1 Laplacian filter one time on HBLT.
+                                ! computed via CVMix to reduce any horizontal two-grid-point noise.
 RI_CRIT = 0.3                   !   [nondim] default = 0.3
                                 ! Critical bulk Richardson number used to define depth of the
                                 ! surface Ocean Boundary Layer (OBL).

ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all

@@ -30,6 +30,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate

ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all

@@ -30,6 +30,9 @@ ADIABATIC = False               !   [Boolean] default = False
                                 ! true. This assumes that KD = KDML = 0.0 and that
                                 ! there is no buoyancy forcing, but makes the model
                                 ! faster by eliminating subroutine calls.
+USE_LEGACY_DIABATIC_DRIVER = True !   [Boolean] default = True
+                                ! If true, use the a legacy version of the diabatic subroutine.
+                                ! This is temporary and is needed avoid change in answers.
 OFFLINE_TRACER_MODE = False     !   [Boolean] default = False
                                 ! If true, barotropic and baroclinic dynamics, thermodynamics
                                 ! are all bypassed with all the fields necessary to integrate