Moved remaining "_z" output to "ocean_model_z" component

- As reported in #54 , commit c0fbf98 missed
  some diagnostics that needed to be renamed and moved in the "ocean_model_z".
- Also updated diag_tables I missed the first time around.
- No answer changes.

examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/diag_table

@@ -45,7 +45,7 @@ CM2.2
 "ocean_model_z","v","v","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","temp","temp","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","salt","salt","ocean_month_z","all",.true.,"none",2
-"ocean_model_z","vintage","vintage","ocean_month_z","all",.true.,"none",2
+#"ocean_model_z","vintage","vintage","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","age","age","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","CFC11","CFC11","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","CFC12","CFC12","ocean_month_z","all",.true.,"none",2

examples/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/diag_table

@@ -45,7 +45,7 @@ CM2.2
 "ocean_model_z","v","v","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","temp","temp","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","salt","salt","ocean_month_z","all",.true.,"none",2
-"ocean_model_z","vintage","vintage","ocean_month_z","all",.true.,"none",2
+#"ocean_model_z","vintage","vintage","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","age","age","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","CFC11","CFC11","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","CFC12","CFC12","ocean_month_z","all",.true.,"none",2

examples/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/diag_table

@@ -45,7 +45,7 @@ CM2.2
 "ocean_model_z","v","v","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","temp","temp","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","salt","salt","ocean_month_z","all",.true.,"none",2
-"ocean_model_z","vintage","vintage","ocean_month_z","all",.true.,"none",2
+#"ocean_model_z","vintage","vintage","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","age","age","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","CFC11","CFC11","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","CFC12","CFC12","ocean_month_z","all",.true.,"none",2

examples/coupled_AM2_SIS/AM2_MOM6i_1deg/diag_table

@@ -45,7 +45,7 @@ CM2.2
 "ocean_model_z","v","v","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","temp","temp","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","salt","salt","ocean_month_z","all",.true.,"none",2
-"ocean_model_z","vintage","vintage","ocean_month_z","all",.true.,"none",2
+#"ocean_model_z","vintage","vintage","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","age","age","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","CFC11","CFC11","ocean_month_z","all",.true.,"none",2
 "ocean_model_z","CFC12","CFC12","ocean_month_z","all",.true.,"none",2

examples/ocean_SIS/GOLD_SIS/available_diags.000000

@@ -453,7 +453,7 @@
 "ocean_model_z", "v"  [Used]
     ! long_name: Meridional Velocity in Depth Space
     ! units: meter second-1
-"ocean_model_z", "vo_z"  [Unused]
+"ocean_model_z", "vo"  [Unused]
     ! long_name: Sea Water Y Velocity
     ! units: m s-1
     ! standard_name: sea_water_y_velocity
@@ -505,19 +505,19 @@
 "ocean_model", "MLD_user"  [Unused]
     ! long_name: Mixed layer depth (used defined)
     ! units: meter
-"ocean_model", "Kd_z"  [Unused]
+"ocean_model_z", "Kd"  [Unused]
     ! long_name: Diapycnal diffusivity at interfaces, interpolated to z
     ! units: meter2 second-1
-"ocean_model", "Tflx_dia_dif_z"  [Unused]
+"ocean_model_z", "Tflx_dia_dif"  [Unused]
     ! long_name: Diffusive diapycnal temperature flux across interfaces, interpolated to z
     ! units: degC meter second-1
-"ocean_model", "Tflx_dia_adv_z"  [Unused]
+"ocean_model_z", "Tflx_dia_adv"  [Unused]
     ! long_name: Advective diapycnal temperature flux across interfaces, interpolated to z
     ! units: degC meter second-1
-"ocean_model", "Sflx_dia_dif_z"  [Unused]
+"ocean_model_z", "Sflx_dia_dif"  [Unused]
     ! long_name: Diffusive diapycnal salinity flux across interfaces, interpolated to z
     ! units: PSU meter second-1
-"ocean_model", "Sflx_dia_adv_z"  [Unused]
+"ocean_model_z", "Sflx_dia_adv"  [Unused]
     ! long_name: Advective diapycnal salinity flux across interfaces, interpolated to z
     ! units: PSU meter second-1
 "ocean_model", "Kd_layer"  [Unused]
@@ -565,10 +565,10 @@
 "ocean_model", "N2"  [Unused]
     ! long_name: Buoyancy frequency squared
     ! units: sec-2
-"ocean_model", "N2_z"  [Unused]
+"ocean_model_z", "N2"  [Unused]
     ! long_name: Buoyancy frequency, interpolated to z
     ! units: second-2
-"ocean_model", "Kd_itides_z"  [Unused]
+"ocean_model_z", "Kd_itides"  [Unused]
     ! long_name: Internal Tide Driven Diffusivity, interpolated to z
     ! units: meter2 second-1
 "ocean_model", "Kd_shear"  [Unused]
@@ -832,21 +832,21 @@
 "ocean_model", "age_dfy"  [Unused]
     ! long_name: Ideal Age Tracer diffusive zonal flux
     ! units: years m3 s-1
-"ocean_model_z", "age_z"  [Unused]
+"ocean_model_z", "age"  [Used]
     ! long_name: Ideal Age Tracer
     ! units: years
     ! standard_name: not provided
 "ocean_model", "CFC11"  [Unused]
     ! long_name: CFC-11 Concentration
     ! units: mol m-3
-"ocean_model_z", "CFC11_z"  [Unused]
+"ocean_model_z", "CFC11"  [Unused]
     ! long_name: CFC-11 Concentration
     ! units: mol m-3
     ! standard_name: not provided
 "ocean_model", "CFC12"  [Unused]
     ! long_name: CFC-12 Concentration
     ! units: mol m-3
-"ocean_model_z", "CFC12_z"  [Unused]
+"ocean_model_z", "CFC12"  [Unused]
     ! long_name: CFC-12 Concentration
     ! units: mol m-3
     ! standard_name: not provided

examples/ocean_SIS/OM4_025/available_diags.000000

@@ -411,7 +411,7 @@
 "ocean_model_z", "v"  [Unused]
     ! long_name: Meridional Velocity in Depth Space
     ! units: meter second-1
-"ocean_model_z", "vo_z"  [Unused]
+"ocean_model_z", "vo"  [Unused]
     ! long_name: Sea Water Y Velocity
     ! units: m s-1
     ! standard_name: sea_water_y_velocity
@@ -463,19 +463,19 @@
 "ocean_model", "MLD_user"  [Unused]
     ! long_name: Mixed layer depth (used defined)
     ! units: meter
-"ocean_model", "Kd_z"  [Unused]
+"ocean_model_z", "Kd"  [Unused]
     ! long_name: Diapycnal diffusivity at interfaces, interpolated to z
     ! units: meter2 second-1
-"ocean_model", "Tflx_dia_dif_z"  [Unused]
+"ocean_model_z", "Tflx_dia_dif"  [Unused]
     ! long_name: Diffusive diapycnal temperature flux across interfaces, interpolated to z
     ! units: degC meter second-1
-"ocean_model", "Tflx_dia_adv_z"  [Unused]
+"ocean_model_z", "Tflx_dia_adv"  [Unused]
     ! long_name: Advective diapycnal temperature flux across interfaces, interpolated to z
     ! units: degC meter second-1
-"ocean_model", "Sflx_dia_dif_z"  [Unused]
+"ocean_model_z", "Sflx_dia_dif"  [Unused]
     ! long_name: Diffusive diapycnal salinity flux across interfaces, interpolated to z
     ! units: PSU meter second-1
-"ocean_model", "Sflx_dia_adv_z"  [Unused]
+"ocean_model_z", "Sflx_dia_adv"  [Unused]
     ! long_name: Advective diapycnal salinity flux across interfaces, interpolated to z
     ! units: PSU meter second-1
 "ocean_model", "Kd_layer"  [Unused]
@@ -523,10 +523,10 @@
 "ocean_model", "N2"  [Unused]
     ! long_name: Buoyancy frequency squared
     ! units: sec-2
-"ocean_model", "N2_z"  [Unused]
+"ocean_model_z", "N2"  [Unused]
     ! long_name: Buoyancy frequency, interpolated to z
     ! units: second-2
-"ocean_model", "Kd_itides_z"  [Unused]
+"ocean_model_z", "Kd_itides"  [Unused]
     ! long_name: Internal Tide Driven Diffusivity, interpolated to z
     ! units: meter2 second-1
 "ocean_model", "Kd_shear"  [Unused]
@@ -820,7 +820,7 @@
 "ocean_model", "age_dfy"  [Unused]
     ! long_name: Ideal Age Tracer diffusive zonal flux
     ! units: years m3 s-1
-"ocean_model_z", "age_z"  [Unused]
+"ocean_model_z", "age"  [Unused]
     ! long_name: Ideal Age Tracer
     ! units: years
     ! standard_name: not provided

examples/ocean_SIS/OM4_025/diag_table.MOM6

@@ -95,10 +95,17 @@
  "ocean_model", "salt_global",      "salt_global",      "ocean_scalar_annual", "all", "mean", "none",2
 
 # Z diagnostics
- "ocean_model", "temp_z",       "temp",             "ocean_month_z", "all", "mean", "none",2
- "ocean_model", "salt_z",       "salt",             "ocean_month_z", "all", "mean", "none",2
- "ocean_model", "age_z",        "age",              "ocean_month_z", "all", "mean", "none",2
-#"ocean_model", "vintage_z",    "vintage",          "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "thetao",         "thetao",           "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "so",             "so",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "age",            "age",              "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "uo",             "uo",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "vo",             "vo",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "uh",             "uh",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "vh",             "vh",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "N2",             "N2",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "Kd",             "Kd",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "Kd_itides",      "Kd_itides",        "ocean_month_z", "all", "mean", "none",2
+#"ocean_model_z", "vintage",        "vintage",          "ocean_month_z", "all", "mean", "none",2
 
 # Sections
 "ocean_model", "temp", "temp", "ocean_Drake_passage",    "all", "mean", "-70. -70. -71. -54.5 -1 -1",2

examples/ocean_SIS2/OM4_025/diag_table.MOM6

@@ -95,10 +95,17 @@
  "ocean_model", "salt_global",      "salt_global",      "ocean_scalar_annual", "all", "mean", "none",2
 
 # Z diagnostics
- "ocean_model", "temp_z",       "temp",             "ocean_month_z", "all", "mean", "none",2
- "ocean_model", "salt_z",       "salt",             "ocean_month_z", "all", "mean", "none",2
- "ocean_model", "age_z",        "age",              "ocean_month_z", "all", "mean", "none",2
-#"ocean_model", "vintage_z",    "vintage",          "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "thetao",         "thetao",           "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "so",             "so",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "age",            "age",              "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "uo",             "uo",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "vo",             "vo",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "uh",             "uh",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "vh",             "vh",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "N2",             "N2",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "Kd",             "Kd",               "ocean_month_z", "all", "mean", "none",2
+ "ocean_model_z", "Kd_itides",      "Kd_itides",        "ocean_month_z", "all", "mean", "none",2
+#"ocean_model_z", "vintage",        "vintage",          "ocean_month_z", "all", "mean", "none",2
 
 # Sections
 "ocean_model", "temp", "temp", "ocean_Drake_passage",    "all", "mean", "-70. -70. -71. -54.5 -1 -1",2

examples/solo_ocean/global/available_diags.000000

@@ -450,7 +450,7 @@
 "ocean_model_z", "v"  [Unused]
     ! long_name: Meridional Velocity in Depth Space
     ! units: meter second-1
-"ocean_model_z", "vo_z"  [Unused]
+"ocean_model_z", "vo"  [Unused]
     ! long_name: Sea Water Y Velocity
     ! units: m s-1
     ! standard_name: sea_water_y_velocity
@@ -502,19 +502,19 @@
 "ocean_model", "MLD_user"  [Unused]
     ! long_name: Mixed layer depth (used defined)
     ! units: meter
-"ocean_model", "Kd_z"  [Unused]
+"ocean_model_z", "Kd"  [Unused]
     ! long_name: Diapycnal diffusivity at interfaces, interpolated to z
     ! units: meter2 second-1
-"ocean_model", "Tflx_dia_dif_z"  [Unused]
+"ocean_model_z", "Tflx_dia_dif"  [Unused]
     ! long_name: Diffusive diapycnal temperature flux across interfaces, interpolated to z
     ! units: degC meter second-1
-"ocean_model", "Tflx_dia_adv_z"  [Unused]
+"ocean_model_z", "Tflx_dia_adv"  [Unused]
     ! long_name: Advective diapycnal temperature flux across interfaces, interpolated to z
     ! units: degC meter second-1
-"ocean_model", "Sflx_dia_dif_z"  [Unused]
+"ocean_model_z", "Sflx_dia_dif"  [Unused]
     ! long_name: Diffusive diapycnal salinity flux across interfaces, interpolated to z
     ! units: PSU meter second-1
-"ocean_model", "Sflx_dia_adv_z"  [Unused]
+"ocean_model_z", "Sflx_dia_adv"  [Unused]
     ! long_name: Advective diapycnal salinity flux across interfaces, interpolated to z
     ! units: PSU meter second-1
 "ocean_model", "Kd_layer"  [Unused]
@@ -562,10 +562,10 @@
 "ocean_model", "N2"  [Unused]
     ! long_name: Buoyancy frequency squared
     ! units: sec-2
-"ocean_model", "N2_z"  [Unused]
+"ocean_model_z", "N2"  [Unused]
     ! long_name: Buoyancy frequency, interpolated to z
     ! units: second-2
-"ocean_model", "Kd_itides_z"  [Unused]
+"ocean_model_z", "Kd_itides"  [Unused]
     ! long_name: Internal Tide Driven Diffusivity, interpolated to z
     ! units: meter2 second-1
 "ocean_model", "Kd_shear"  [Unused]
@@ -829,7 +829,7 @@
 "ocean_model", "age_dfy"  [Unused]
     ! long_name: Ideal Age Tracer diffusive zonal flux
     ! units: years m3 s-1
-"ocean_model_z", "age_z"  [Unused]
+"ocean_model_z", "age"  [Unused]
     ! long_name: Ideal Age Tracer
     ! units: years
     ! standard_name: not provided

examples/solo_ocean/global_ALE/layer/available_diags.000000

@@ -450,7 +450,7 @@
 "ocean_model_z", "v"  [Unused]
     ! long_name: Meridional Velocity in Depth Space
     ! units: meter second-1
-"ocean_model_z", "vo_z"  [Unused]
+"ocean_model_z", "vo"  [Unused]
     ! long_name: Sea Water Y Velocity
     ! units: m s-1
     ! standard_name: sea_water_y_velocity
@@ -502,19 +502,19 @@
 "ocean_model", "MLD_user"  [Unused]
     ! long_name: Mixed layer depth (used defined)
     ! units: meter
-"ocean_model", "Kd_z"  [Unused]
+"ocean_model_z", "Kd"  [Unused]
     ! long_name: Diapycnal diffusivity at interfaces, interpolated to z
     ! units: meter2 second-1
-"ocean_model", "Tflx_dia_dif_z"  [Unused]
+"ocean_model_z", "Tflx_dia_dif"  [Unused]
     ! long_name: Diffusive diapycnal temperature flux across interfaces, interpolated to z
     ! units: degC meter second-1
-"ocean_model", "Tflx_dia_adv_z"  [Unused]
+"ocean_model_z", "Tflx_dia_adv"  [Unused]
     ! long_name: Advective diapycnal temperature flux across interfaces, interpolated to z
     ! units: degC meter second-1
-"ocean_model", "Sflx_dia_dif_z"  [Unused]
+"ocean_model_z", "Sflx_dia_dif"  [Unused]
     ! long_name: Diffusive diapycnal salinity flux across interfaces, interpolated to z
     ! units: PSU meter second-1
-"ocean_model", "Sflx_dia_adv_z"  [Unused]
+"ocean_model_z", "Sflx_dia_adv"  [Unused]
     ! long_name: Advective diapycnal salinity flux across interfaces, interpolated to z
     ! units: PSU meter second-1
 "ocean_model", "Kd_layer"  [Used]
@@ -562,10 +562,10 @@
 "ocean_model", "N2"  [Unused]
     ! long_name: Buoyancy frequency squared
     ! units: sec-2
-"ocean_model", "N2_z"  [Unused]
+"ocean_model_z", "N2"  [Unused]
     ! long_name: Buoyancy frequency, interpolated to z
     ! units: second-2
-"ocean_model", "Kd_itides_z"  [Unused]
+"ocean_model_z", "Kd_itides"  [Unused]
     ! long_name: Internal Tide Driven Diffusivity, interpolated to z
     ! units: meter2 second-1
 "ocean_model", "Kd_shear"  [Unused]
@@ -904,7 +904,7 @@
 "ocean_model", "age_dfy"  [Unused]
     ! long_name: Ideal Age Tracer diffusive zonal flux
     ! units: years m3 s-1
-"ocean_model_z", "age_z"  [Unused]
+"ocean_model_z", "age"  [Unused]
     ! long_name: Ideal Age Tracer
     ! units: years
     ! standard_name: not provided

examples/solo_ocean/global_ALE/z/available_diags.000000

@@ -420,7 +420,7 @@
 "ocean_model_z", "v"  [Unused]
     ! long_name: Meridional Velocity in Depth Space
     ! units: meter second-1
-"ocean_model_z", "vo_z"  [Unused]
+"ocean_model_z", "vo"  [Unused]
     ! long_name: Sea Water Y Velocity
     ! units: m s-1
     ! standard_name: sea_water_y_velocity
@@ -472,19 +472,19 @@
 "ocean_model", "MLD_user"  [Unused]
     ! long_name: Mixed layer depth (used defined)
     ! units: meter
-"ocean_model", "Kd_z"  [Unused]
+"ocean_model_z", "Kd"  [Unused]
     ! long_name: Diapycnal diffusivity at interfaces, interpolated to z
     ! units: meter2 second-1
-"ocean_model", "Tflx_dia_dif_z"  [Unused]
+"ocean_model_z", "Tflx_dia_dif"  [Unused]
     ! long_name: Diffusive diapycnal temperature flux across interfaces, interpolated to z
     ! units: degC meter second-1
-"ocean_model", "Tflx_dia_adv_z"  [Unused]
+"ocean_model_z", "Tflx_dia_adv"  [Unused]
     ! long_name: Advective diapycnal temperature flux across interfaces, interpolated to z
     ! units: degC meter second-1
-"ocean_model", "Sflx_dia_dif_z"  [Unused]
+"ocean_model_z", "Sflx_dia_dif"  [Unused]
     ! long_name: Diffusive diapycnal salinity flux across interfaces, interpolated to z
     ! units: PSU meter second-1
-"ocean_model", "Sflx_dia_adv_z"  [Unused]
+"ocean_model_z", "Sflx_dia_adv"  [Unused]
     ! long_name: Advective diapycnal salinity flux across interfaces, interpolated to z
     ! units: PSU meter second-1
 "ocean_model", "Kd_layer"  [Used]
@@ -532,10 +532,10 @@
 "ocean_model", "N2"  [Unused]
     ! long_name: Buoyancy frequency squared
     ! units: sec-2
-"ocean_model", "N2_z"  [Unused]
+"ocean_model_z", "N2"  [Unused]
     ! long_name: Buoyancy frequency, interpolated to z
     ! units: second-2
-"ocean_model", "Kd_itides_z"  [Unused]
+"ocean_model_z", "Kd_itides"  [Unused]
     ! long_name: Internal Tide Driven Diffusivity, interpolated to z
     ! units: meter2 second-1
 "ocean_model", "Kd_shear"  [Unused]
@@ -829,7 +829,7 @@
 "ocean_model", "age_dfy"  [Unused]
     ! long_name: Ideal Age Tracer diffusive zonal flux
     ! units: years m3 s-1
-"ocean_model_z", "age_z"  [Unused]
+"ocean_model_z", "age"  [Unused]
     ! long_name: Ideal Age Tracer
     ! units: years
     ! standard_name: not provided