Fix available_diags

- I corrupted available_diags (not sure how) with the last manual merge.
  This fixes available_diags to match both interactive and pipeline output.

ocean_only/global_ALE/layer/available_diags.000000

@@ -3768,15 +3768,7 @@
  ! long_name: Equivalent barotropic modal strcuture
  ! units: nondim
  ! cell_methods: z_l:mean
-<<<<<<< HEAD
 "ocean_model", "mass_wt" [Used]
-=======
-"ocean_model", "mass_wt" [Unused]
- ! long_name: The column mass for calculating mass-weighted average properties
- ! units: kg m-2
- ! cell_methods: xh:mean yh:mean area:mean
-"ocean_model_d2", "mass_wt" [Unused]
->>>>>>> 8a3501a4e0d9818f486157cbf1e3814e144709e2
  ! long_name: The column mass for calculating mass-weighted average properties
  ! units: kg m-2
  ! cell_methods: xh:mean yh:mean area:mean
@@ -6034,15 +6026,7 @@
  ! long_name: Heat flux into ocean from mass flux into ocean
  ! units: W m-2
  ! cell_methods: xh:mean yh:mean area:mean
-<<<<<<< HEAD
 "ocean_model", "internal_heat" [Used]
-=======
-"ocean_model", "internal_heat" [Unused]
- ! long_name: Heat flux into ocean from geothermal or other internal sources
- ! units: W m-2
- ! cell_methods: xh:mean yh:mean area:mean
-"ocean_model_d2", "internal_heat" [Unused]
->>>>>>> 8a3501a4e0d9818f486157cbf1e3814e144709e2
  ! long_name: Heat flux into ocean from geothermal or other internal sources
  ! units: W m-2
  ! cell_methods: xh:mean yh:mean area:mean
@@ -8374,15 +8358,7 @@
  ! units: W m-2
  ! standard_name: temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water
  ! cell_methods: xh:mean yh:mean area:mean
-<<<<<<< HEAD
 "ocean_model", "heat_content_massin" [Used]
-=======
-"ocean_model", "heat_content_massin" [Unused]
- ! long_name: Heat content (relative to 0degC) of net mass entering ocean ocean
- ! units: W m-2
- ! cell_methods: xh:mean yh:mean area:mean
-"ocean_model_d2", "heat_content_massin" [Unused]
->>>>>>> 8a3501a4e0d9818f486157cbf1e3814e144709e2
  ! long_name: Heat content (relative to 0degC) of net mass entering ocean ocean
  ! units: W m-2
  ! cell_methods: xh:mean yh:mean area:mean
@@ -8574,15 +8550,7 @@
  ! units: W m-2
  ! standard_name: snow_ice_melt_heat_flux
  ! cell_methods: xh:mean yh:mean area:mean
-<<<<<<< HEAD
 "ocean_model", "heat_added" [Used]
-=======
-"ocean_model", "heat_added" [Unused]
- ! long_name: Flux Adjustment or restoring surface heat flux into ocean
- ! units: W m-2
- ! cell_methods: xh:mean yh:mean area:mean
-"ocean_model_d2", "heat_added" [Unused]
->>>>>>> 8a3501a4e0d9818f486157cbf1e3814e144709e2
  ! long_name: Flux Adjustment or restoring surface heat flux into ocean
  ! units: W m-2
  ! cell_methods: xh:mean yh:mean area:mean

ocean_only/global_ALE/z/available_diags.000000

@@ -3848,11 +3848,7 @@
  ! long_name: Equivalent barotropic modal strcuture
  ! units: nondim
  ! cell_methods: z_l:mean
-<<<<<<< HEAD
 "ocean_model", "mass_wt" [Used]
-=======
-"ocean_model", "mass_wt" [Unused]
->>>>>>> 8a3501a4e0d9818f486157cbf1e3814e144709e2
  ! long_name: The column mass for calculating mass-weighted average properties
  ! units: kg m-2
  ! cell_methods: xh:mean yh:mean area:mean
@@ -6780,15 +6776,7 @@
  ! long_name: Heat flux into ocean from mass flux into ocean
  ! units: W m-2
  ! cell_methods: xh:mean yh:mean area:mean
-<<<<<<< HEAD
 "ocean_model", "internal_heat" [Used]
-=======
-"ocean_model", "internal_heat" [Unused]
- ! long_name: Heat flux into ocean from geothermal or other internal sources
- ! units: W m-2
- ! cell_methods: xh:mean yh:mean area:mean
-"ocean_model_d2", "internal_heat" [Unused]
->>>>>>> 8a3501a4e0d9818f486157cbf1e3814e144709e2
  ! long_name: Heat flux into ocean from geothermal or other internal sources
  ! units: W m-2
  ! cell_methods: xh:mean yh:mean area:mean
@@ -9720,15 +9708,7 @@
  ! units: W m-2
  ! standard_name: temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water
  ! cell_methods: xh:mean yh:mean area:mean
-<<<<<<< HEAD
 "ocean_model", "heat_content_massin" [Used]
-=======
-"ocean_model", "heat_content_massin" [Unused]
- ! long_name: Heat content (relative to 0degC) of net mass entering ocean ocean
- ! units: W m-2
- ! cell_methods: xh:mean yh:mean area:mean
-"ocean_model_d2", "heat_content_massin" [Unused]
->>>>>>> 8a3501a4e0d9818f486157cbf1e3814e144709e2
  ! long_name: Heat content (relative to 0degC) of net mass entering ocean ocean
  ! units: W m-2
  ! cell_methods: xh:mean yh:mean area:mean
@@ -9920,15 +9900,7 @@
  ! units: W m-2
  ! standard_name: snow_ice_melt_heat_flux
  ! cell_methods: xh:mean yh:mean area:mean
-<<<<<<< HEAD
 "ocean_model", "heat_added" [Used]
-=======
-"ocean_model", "heat_added" [Unused]
- ! long_name: Flux Adjustment or restoring surface heat flux into ocean
- ! units: W m-2
- ! cell_methods: xh:mean yh:mean area:mean
-"ocean_model_d2", "heat_added" [Unused]
->>>>>>> 8a3501a4e0d9818f486157cbf1e3814e144709e2
  ! long_name: Flux Adjustment or restoring surface heat flux into ocean
  ! units: W m-2
  ! cell_methods: xh:mean yh:mean area:mean