MOM6:8546837 Merge pull request #1002 from marshallward/diag_scaling_p2

- Updated units in available_diags

- NOAA-GFDL/MOM6@8546837 Merge pull request #1002 from marshallward/diag_scaling_p2
- NOAA-GFDL/MOM6@a045278 Dimension scaling of massout_flux, tracers
- NOAA-GFDL/MOM6@cf4b1bc Merge branch 'dev/gfdl' into diag_scaling_p2
- NOAA-GFDL/MOM6@af4a364 Merge pull request #1000 from MJHarrison-GFDL/ALE_sponges_ongrid
- NOAA-GFDL/MOM6@71da10f Merge branch 'dev/gfdl' into ALE_sponges_ongrid
- NOAA-GFDL/MOM6@57c00c8 Merge pull request #1001 from adcroft/make-src-dependency
- NOAA-GFDL/MOM6@507ac20 Adds dependency on source code
- NOAA-GFDL/MOM6@fac1a01 correct area calculation for a lat-lon grid
- NOAA-GFDL/MOM6@99b6d20 Merge remote-tracking branch 'gfdl/dev/gfdl' into ALE_sponges_ongrid
- NOAA-GFDL/MOM6@5e3d3a2 blank diag table
- NOAA-GFDL/MOM6@2c23578 Response to comments
- NOAA-GFDL/MOM6@71acc61 remove extra blank lines
- NOAA-GFDL/MOM6@2d21468 Bugfix test
- NOAA-GFDL/MOM6@728b26d Added sponge test in hidden directory
- NOAA-GFDL/MOM6@725e17d Communication bugfix and fix sponge index
- NOAA-GFDL/MOM6@4ad044d Merge branch 'ESMG-dev/esmg' into dev/gfdl
- NOAA-GFDL/MOM6@70c09a1 White space
- NOAA-GFDL/MOM6@53b8be5 Merge branch 'dev/gfdl' into dev/esmg
- NOAA-GFDL/MOM6@51fda4d Deleted unwanted commented OBC code.
- NOAA-GFDL/MOM6@a8dce64 Merge branch 'MFJansen-MEKE_fixes' into dev/gfdl
- NOAA-GFDL/MOM6@f4a4aae More OBC cleanup.
- NOAA-GFDL/MOM6@19cfeeb Merge branch 'MEKE_fixes' of https://github.com/MFJansen/MOM6 into MFJansen-MEKE_fixes
- NOAA-GFDL/MOM6@216eb10 Merge branch 'MJHarrison-GFDL-ALE_sponges_ongrid' into dev/gfdl
- NOAA-GFDL/MOM6@2efbf53 Cleaned up indentation
- NOAA-GFDL/MOM6@5eb96e2 Merge branch 'ALE_sponges_ongrid' of https://github.com/MJHarrison-GFDL/MOM6 into MJHarrison-GFDL-ALE_sponges_ongrid
- NOAA-GFDL/MOM6@8d3b553 Merge branch 'ESMG-dev/esmg' into dev/gfdl
- NOAA-GFDL/MOM6@98f625e Merge branch 'dev/esmg' of https://github.com/ESMG/MOM6 into ESMG-dev/esmg
- NOAA-GFDL/MOM6@43f9ea8 Merge pull request #996 from marshallward/codecov_config
- NOAA-GFDL/MOM6@3401eb1 shortened line length. Thanks Travis.
- NOAA-GFDL/MOM6@9719ab3 Merge branch 'dev/gfdl' into codecov_config
- NOAA-GFDL/MOM6@00609e8 New parameter indicating sponge data are ongrid
- NOAA-GFDL/MOM6@f1b866d Diagnostic scaling; global_spatial_mean in MKS
- NOAA-GFDL/MOM6@ff12685 (+) Dimentional scaling fixes; H_to_MKS scaling
- NOAA-GFDL/MOM6@af62e2e Diagnostic dimensional scaling fixes
- NOAA-GFDL/MOM6@66dab94 removed trailing spaces
- NOAA-GFDL/MOM6@276d01a Merge remote-tracking branch 'GFDL/dev/gfdl' into dev/gfdl
- NOAA-GFDL/MOM6@7e78e87 Bug fix in evaluation of MEKE%mom_src
- NOAA-GFDL/MOM6@c777b4c Bug fix in computation of topographic beta
- NOAA-GFDL/MOM6@ddefcc7 (+) MKS thickness scaling of horizontal avg diag
- NOAA-GFDL/MOM6@217eb9f Travis: Explicit 0% threshold for CodeCov
- NOAA-GFDL/MOM6@9c7053b Low CodeCov coverage threshold
- NOAA-GFDL/MOM6@d4f7f0e Got rid of OBC_TIME_FILTER option.
- NOAA-GFDL/MOM6@7cddf97 Merge remote-tracking branch 'gfdl/dev/gfdl' into dev/esmg
- NOAA-GFDL/MOM6@fe27c05 Swap in/out for tracer reservoirs.
- NOAA-GFDL/MOM6@c58e875 First stab at taking out time-filter from OBC
- NOAA-GFDL/MOM6@20e4a50 Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into dev/gfdl
- NOAA-GFDL/MOM6@e4b8767 optional ensemble_id to get_MOM_input

ocean_only/global_ALE/layer/available_diags.000000

@@ -5259,35 +5259,35 @@
     ! cell_methods: z_l:sum
 "ocean_model", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean zl:sum area:mean
 "ocean_model", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: zl:sum
 "ocean_model_z", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean z_l:sum area:mean
 "ocean_model_z", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: z_l:sum
 "ocean_model_d2", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean zl:sum area:mean
 "ocean_model_d2", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: zl:sum
 "ocean_model_z_d2", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean z_l:sum area:mean
 "ocean_model_z_d2", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: z_l:sum
 "ocean_model", "Kd_BBL"  [Used]
     ! long_name: Bottom Boundary Layer Diffusivity

ocean_only/global_ALE/z/available_diags.000000

@@ -5823,35 +5823,35 @@
     ! cell_methods: z_l:sum
 "ocean_model", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean zl:sum area:mean
 "ocean_model", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: zl:sum
 "ocean_model_z", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean z_l:sum area:mean
 "ocean_model_z", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: z_l:sum
 "ocean_model_d2", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean zl:sum area:mean
 "ocean_model_d2", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: zl:sum
 "ocean_model_z_d2", "internal_heat_h_tendency"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: xh:mean yh:mean z_l:sum area:mean
 "ocean_model_z_d2", "internal_heat_h_tendency_xyave"  [Unused]
     ! long_name: Thickness tendency (in 3D) due to internal (geothermal) sources
-    ! units: m OR kg m-2
+    ! units: m
     ! cell_methods: z_l:sum
 "ocean_model", "Kd_BBL"  [Used]
     ! long_name: Bottom Boundary Layer Diffusivity