MOM6: Merge branch 'nicjhan-diagnostic-tests' into dev/master

- 08367b4 Merge branch 'nicjhan-diagnostic-tests' into dev/master
- 958789e Removing latent_evap from list of obsolete diagnostics
- b9a23f4 Revert "Update diagnostic name, old name has been obsoleted. Closes mom-ocean#155"
- 9d03ff3 Merge branch 'diagnostic-tests' of github.com:nicjhan/NOAA-GFDL-MOM6 into nicjhan-diagnostic-tests
- ad474f4 Maximum number of diagnostics increased in order to do exhaustive diagnostic checking. mom-ocean#147.
- 7f5cc91 Update diagnostic name, old name has been obsoleted. Closes mom-ocean#155
- c464f2d Only register N2, S2 diagnostics when the configuration supports them. mom-ocean#147
- b1ae675 Bugfix: Fl_itidal diagnostic shape incorrect. Closes mom-ocean#151
- 568c54c Call diag_mediator_end to close open files. Closes mom-ocean#156

ice_ocean_SIS/GOLD_SIS/available_diags.000000

@@ -10,18 +10,6 @@
 "ocean_model", "L2v"  [Unused]
     ! long_name: Length scale squared for mixing coefficient, at v-points
     ! units: m^2
-"ocean_model", "N2_u"  [Unused]
-    ! long_name: Square of Brunt-Vaisala frequency, N^2, at u-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "N2_v"  [Unused]
-    ! long_name: Square of Brunt-Vaisala frequency, N^2, at v-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "S2_u"  [Unused]
-    ! long_name: Depth average square of slope magnitude, S^2, at u-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "S2_v"  [Unused]
-    ! long_name: Depth average square of slope magnitude, S^2, at v-points, as used in Visbeck et al.
-    ! units: s^-2
 "ocean_model", "Res_fn"  [Unused]
     ! long_name: Resolution function for scaling diffusivities
     ! units: Nondim

ocean_only/global/available_diags.000000

@@ -61,18 +61,6 @@
 "ocean_model", "L2v"  [Unused]
     ! long_name: Length scale squared for mixing coefficient, at v-points
     ! units: m^2
-"ocean_model", "N2_u"  [Unused]
-    ! long_name: Square of Brunt-Vaisala frequency, N^2, at u-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "N2_v"  [Unused]
-    ! long_name: Square of Brunt-Vaisala frequency, N^2, at v-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "S2_u"  [Unused]
-    ! long_name: Depth average square of slope magnitude, S^2, at u-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "S2_v"  [Unused]
-    ! long_name: Depth average square of slope magnitude, S^2, at v-points, as used in Visbeck et al.
-    ! units: s^-2
 "ocean_model", "Res_fn"  [Used]
     ! long_name: Resolution function for scaling diffusivities
     ! units: Nondim

ocean_only/global_ALE/layer/available_diags.000000

@@ -61,18 +61,6 @@
 "ocean_model", "L2v"  [Unused]
     ! long_name: Length scale squared for mixing coefficient, at v-points
     ! units: m^2
-"ocean_model", "N2_u"  [Unused]
-    ! long_name: Square of Brunt-Vaisala frequency, N^2, at u-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "N2_v"  [Unused]
-    ! long_name: Square of Brunt-Vaisala frequency, N^2, at v-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "S2_u"  [Unused]
-    ! long_name: Depth average square of slope magnitude, S^2, at u-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "S2_v"  [Unused]
-    ! long_name: Depth average square of slope magnitude, S^2, at v-points, as used in Visbeck et al.
-    ! units: s^-2
 "ocean_model", "Res_fn"  [Unused]
     ! long_name: Resolution function for scaling diffusivities
     ! units: Nondim

ocean_only/global_ALE/z/available_diags.000000

@@ -61,18 +61,6 @@
 "ocean_model", "L2v"  [Unused]
     ! long_name: Length scale squared for mixing coefficient, at v-points
     ! units: m^2
-"ocean_model", "N2_u"  [Unused]
-    ! long_name: Square of Brunt-Vaisala frequency, N^2, at u-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "N2_v"  [Unused]
-    ! long_name: Square of Brunt-Vaisala frequency, N^2, at v-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "S2_u"  [Unused]
-    ! long_name: Depth average square of slope magnitude, S^2, at u-points, as used in Visbeck et al.
-    ! units: s^-2
-"ocean_model", "S2_v"  [Unused]
-    ! long_name: Depth average square of slope magnitude, S^2, at v-points, as used in Visbeck et al.
-    ! units: s^-2
 "ocean_model", "Res_fn"  [Unused]
     ! long_name: Resolution function for scaling diffusivities
     ! units: Nondim