diff --git a/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_parameter_doc.all index 06cc94a6e4..6554fc6ee4 100644 --- a/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_parameter_doc.all @@ -455,6 +455,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index fc4d8454da..3e5aaebd4c 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -455,6 +455,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.all index 06cc94a6e4..6554fc6ee4 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.all @@ -455,6 +455,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 82a7615efc..5968ef0913 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -455,6 +455,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ice_ocean_SIS/GOLD_SIS/MOM_parameter_doc.all b/ice_ocean_SIS/GOLD_SIS/MOM_parameter_doc.all index b45a6bbb37..fd7ee4fddb 100644 --- a/ice_ocean_SIS/GOLD_SIS/MOM_parameter_doc.all +++ b/ice_ocean_SIS/GOLD_SIS/MOM_parameter_doc.all @@ -482,6 +482,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ice_ocean_SIS/GOLD_SIS/available_diags.000000 b/ice_ocean_SIS/GOLD_SIS/available_diags.000000 index e29c5be4bf..59e42cb8af 100644 --- a/ice_ocean_SIS/GOLD_SIS/available_diags.000000 +++ b/ice_ocean_SIS/GOLD_SIS/available_diags.000000 @@ -71,6 +71,9 @@ ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 ! standard_name: ocean_momentum_xy_biharmonic_diffusivity +"ocean_model_z_new", "Ahh" [Unused] + ! long_name: Biharmonic Horizontal Viscosity at h Points + ! units: meter4 second-1 "ocean_model", "Ahq" [Unused] ! long_name: Biharmonic Horizontal Viscosity at q Points ! units: meter4 second-1 @@ -81,12 +84,18 @@ ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 ! standard_name: ocean_momentum_xy_laplacian_diffusivity +"ocean_model_z_new", "Khh" [Unused] + ! long_name: Laplacian Horizontal Viscosity at h Points + ! units: meter2 second-1 "ocean_model", "Khq" [Unused] ! long_name: Laplacian Horizontal Viscosity at q Points ! units: meter2 second-1 "ocean_model", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms ! units: Watt meter-2 +"ocean_model_z_new", "FrictWork" [Unused] + ! long_name: Integral work done by lateral friction terms + ! units: Watt meter-2 "ocean_model", "FrictWorkIntz" [Unused] ! long_name: Depth integrated work done by lateral friction ! units: Watt meter-2 @@ -368,6 +377,10 @@ ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 ! standard_name: sea_water_mass_per_unit_area +"ocean_model_z_new", "masscello" [Unused] + ! long_name: Mass per unit area of liquid ocean grid cell + ! units: kg m-2 + ! standard_name: sea_water_mass_per_unit_area "ocean_model", "masso" [Unused] ! long_name: Mass of liquid ocean ! units: kg @@ -376,6 +389,10 @@ ! long_name: Cell Thickness ! units: m ! standard_name: cell_thickness +"ocean_model_z_new", "thkcello" [Unused] + ! long_name: Cell Thickness + ! units: m + ! standard_name: cell_thickness "ocean_model", "thetaoga" [Unused] ! long_name: Global Mean Ocean Potential Temperature ! units: Celsius @@ -409,9 +426,15 @@ "ocean_model", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rml" [Unused] + ! long_name: Mixed Layer Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rho_cv" [Unused] + ! long_name: Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "dudt" [Unused] ! long_name: Zonal Acceleration ! units: meter second-2 @@ -421,9 +444,15 @@ "ocean_model", "dhdt" [Unused] ! long_name: Thickness tendency ! units: meter second-1 +"ocean_model_z_new", "dhdt" [Unused] + ! long_name: Thickness tendency + ! units: meter second-1 "ocean_model", "h_rho" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates ! units: meter +"ocean_model_z_new", "h_rho" [Unused] + ! long_name: Layer thicknesses in pure potential density coordinates + ! units: meter "ocean_model", "uh_rho" [Unused] ! long_name: Zonal volume transport in pure potential density coordinates ! units: meter3 second-1 @@ -439,27 +468,51 @@ "ocean_model", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: meter2 second-2 +"ocean_model_z_new", "KE" [Unused] + ! long_name: Layer kinetic energy per unit mass + ! units: meter2 second-2 "ocean_model", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: meter3 second-3 +"ocean_model_z_new", "dKE_dt" [Unused] + ! long_name: Kinetic Energy Tendency of Layer + ! units: meter3 second-3 "ocean_model", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: meter3 second-3 +"ocean_model_z_new", "PE_to_KE" [Unused] + ! long_name: Potential to Kinetic Energy Conversion of Layer + ! units: meter3 second-3 "ocean_model", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_Coradv" [Unused] + ! long_name: Kinetic Energy Source from Coriolis and Advection + ! units: meter3 second-3 "ocean_model", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_adv" [Unused] + ! long_name: Kinetic Energy Source from Advection + ! units: meter3 second-3 "ocean_model", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: meter3 second-3 +"ocean_model_z_new", "KE_visc" [Unused] + ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses + ! units: meter3 second-3 "ocean_model", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: meter3 second-3 +"ocean_model_z_new", "KE_horvisc" [Unused] + ! long_name: Kinetic Energy Source from Horizontal Viscosity + ! units: meter3 second-3 "ocean_model", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: meter3 second-3 +"ocean_model_z_new", "KE_dia" [Unused] + ! long_name: Kinetic Energy Source from Diapycnal Diffusion + ! units: meter3 second-3 "ocean_model", "cg1" [Unused] ! long_name: First baroclinic gravity wave speed ! units: meter second-1 @@ -533,9 +586,15 @@ "ocean_model", "ea" [Unused] ! long_name: Layer entrainment from above per timestep ! units: meter +"ocean_model_z_new", "ea" [Unused] + ! long_name: Layer entrainment from above per timestep + ! units: meter "ocean_model", "eb" [Unused] ! long_name: Layer entrainment from below per timestep ! units: meter +"ocean_model_z_new", "eb" [Unused] + ! long_name: Layer entrainment from below per timestep + ! units: meter "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing ! units: meter second-2 @@ -601,15 +660,24 @@ "ocean_model", "Kd_layer" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) ! units: meter2 second-1 +"ocean_model_z_new", "Kd_layer" [Unused] + ! long_name: Diapycnal diffusivity of layers (as set) + ! units: meter2 second-1 "ocean_model", "TKE_itidal" [Unused] ! long_name: Internal Tide Driven Turbulent Kinetic Energy ! units: Watt meter-2 "ocean_model", "maxTKE" [Unused] ! long_name: Maximum layer TKE ! units: meter3 second-3 +"ocean_model_z_new", "maxTKE" [Unused] + ! long_name: Maximum layer TKE + ! units: meter3 second-3 "ocean_model", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd ! units: second2 meter +"ocean_model_z_new", "TKE_to_Kd" [Unused] + ! long_name: Convert TKE to Kd + ! units: second2 meter "ocean_model", "Nb" [Unused] ! long_name: Bottom Buoyancy Frequency ! units: sec-1 @@ -634,12 +702,21 @@ "ocean_model", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Work" [Unused] + ! long_name: Work done by Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Itidal_Work" [Unused] + ! long_name: Work done by Internal Tide Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: Watts m-2 +"ocean_model_z_new", "Kd_Nikurashin_Work" [Unused] + ! long_name: Work done by Nikurashin Lee Wave Drag Scheme + ! units: Watts m-2 "ocean_model", "N2" [Unused] ! long_name: Buoyancy frequency squared ! units: sec-2 @@ -679,6 +756,9 @@ "ocean_model", "Kd_effective" [Unused] ! long_name: Diapycnal diffusivity as applied ! units: meter2 second-1 +"ocean_model_z_new", "Kd_effective" [Unused] + ! long_name: Diapycnal diffusivity as applied + ! units: meter2 second-1 "ocean_model", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 @@ -739,12 +819,21 @@ "ocean_model", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: meter-1 +"ocean_model_z_new", "opac_1" [Unused] + ! long_name: Opacity for shortwave radiation in band 1 + ! units: meter-1 "ocean_model", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: meter-1 +"ocean_model_z_new", "opac_2" [Unused] + ! long_name: Opacity for shortwave radiation in band 2 + ! units: meter-1 "ocean_model", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: meter-1 +"ocean_model_z_new", "opac_3" [Unused] + ! long_name: Opacity for shortwave radiation in band 3 + ! units: meter-1 "ocean_model", "Chl_opac" [Unused] ! long_name: Surface chlorophyll A concentration used to find opacity ! units: mg meter-3 @@ -771,6 +860,9 @@ "ocean_model", "h" [Used] ! long_name: Layer Thickness ! units: meter +"ocean_model_z_new", "h" [Unused] + ! long_name: Layer Thickness + ! units: meter "ocean_model", "volo" [Unused] ! long_name: Total volume of liquid ocean ! units: m3 @@ -801,6 +893,9 @@ "ocean_model", "temp" [Used] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt" [Used] ! long_name: Salinity ! units: PPT @@ -808,6 +903,9 @@ ! long_name: Sea Water Salinity ! units: ppt ! standard_name: sea_water_salinity +"ocean_model_z_new", "salt" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model", "tob" [Unused] ! long_name: Sea Water Potential Temperature at Sea Floor ! units: degC @@ -910,15 +1008,24 @@ "ocean_model", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: meter +"ocean_model_z_new", "h_predia" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: meter "ocean_model", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: meter "ocean_model", "temp_predia" [Unused] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp_predia" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt_predia" [Unused] ! long_name: Salinity ! units: PPT +"ocean_model_z_new", "salt_predia" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model_z", "temp" [Used] ! long_name: Potential Temperature ! units: degC @@ -938,6 +1045,9 @@ "ocean_model", "age" [Unused] ! long_name: Ideal Age Tracer ! units: years +"ocean_model_z_new", "age" [Unused] + ! long_name: Ideal Age Tracer + ! units: years "ocean_model", "age_adx" [Unused] ! long_name: Ideal Age Tracer advective zonal flux ! units: years m3 s-1 @@ -957,6 +1067,9 @@ "ocean_model", "CFC11" [Unused] ! long_name: CFC-11 Concentration ! units: mol m-3 +"ocean_model_z_new", "CFC11" [Unused] + ! long_name: CFC-11 Concentration + ! units: mol m-3 "ocean_model_z", "CFC11" [Unused] ! long_name: CFC-11 Concentration ! units: mol m-3 @@ -964,6 +1077,9 @@ "ocean_model", "CFC12" [Unused] ! long_name: CFC-12 Concentration ! units: mol m-3 +"ocean_model_z_new", "CFC12" [Unused] + ! long_name: CFC-12 Concentration + ! units: mol m-3 "ocean_model_z", "CFC12" [Unused] ! long_name: CFC-12 Concentration ! units: mol m-3 diff --git a/ice_ocean_SIS/GOLD_SIS_icebergs/MOM_parameter_doc.all b/ice_ocean_SIS/GOLD_SIS_icebergs/MOM_parameter_doc.all index b45a6bbb37..fd7ee4fddb 100644 --- a/ice_ocean_SIS/GOLD_SIS_icebergs/MOM_parameter_doc.all +++ b/ice_ocean_SIS/GOLD_SIS_icebergs/MOM_parameter_doc.all @@ -482,6 +482,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ice_ocean_SIS/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS/OM4_025/MOM_parameter_doc.all index 5ce66a7f5a..22f5664f62 100644 --- a/ice_ocean_SIS/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS/OM4_025/MOM_parameter_doc.all @@ -483,6 +483,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False diff --git a/ice_ocean_SIS/OM4_025/available_diags.000000 b/ice_ocean_SIS/OM4_025/available_diags.000000 index 09cc4a479c..40df9d486d 100644 --- a/ice_ocean_SIS/OM4_025/available_diags.000000 +++ b/ice_ocean_SIS/OM4_025/available_diags.000000 @@ -128,6 +128,9 @@ ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 ! standard_name: ocean_momentum_xy_biharmonic_diffusivity +"ocean_model_z_new", "Ahh" [Unused] + ! long_name: Biharmonic Horizontal Viscosity at h Points + ! units: meter4 second-1 "ocean_model", "Ahq" [Unused] ! long_name: Biharmonic Horizontal Viscosity at q Points ! units: meter4 second-1 @@ -138,12 +141,18 @@ ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 ! standard_name: ocean_momentum_xy_laplacian_diffusivity +"ocean_model_z_new", "Khh" [Unused] + ! long_name: Laplacian Horizontal Viscosity at h Points + ! units: meter2 second-1 "ocean_model", "Khq" [Unused] ! long_name: Laplacian Horizontal Viscosity at q Points ! units: meter2 second-1 "ocean_model", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms ! units: Watt meter-2 +"ocean_model_z_new", "FrictWork" [Unused] + ! long_name: Integral work done by lateral friction terms + ! units: Watt meter-2 "ocean_model", "FrictWorkIntz" [Unused] ! long_name: Depth integrated work done by lateral friction ! units: Watt meter-2 @@ -425,6 +434,10 @@ ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 ! standard_name: sea_water_mass_per_unit_area +"ocean_model_z_new", "masscello" [Unused] + ! long_name: Mass per unit area of liquid ocean grid cell + ! units: kg m-2 + ! standard_name: sea_water_mass_per_unit_area "ocean_model", "masso" [Unused] ! long_name: Mass of liquid ocean ! units: kg @@ -433,6 +446,10 @@ ! long_name: Cell Thickness ! units: m ! standard_name: cell_thickness +"ocean_model_z_new", "thkcello" [Unused] + ! long_name: Cell Thickness + ! units: m + ! standard_name: cell_thickness "ocean_model", "thetaoga" [Unused] ! long_name: Global Mean Ocean Potential Temperature ! units: Celsius @@ -466,9 +483,15 @@ "ocean_model", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rml" [Unused] + ! long_name: Mixed Layer Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rho_cv" [Unused] + ! long_name: Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "dudt" [Unused] ! long_name: Zonal Acceleration ! units: meter second-2 @@ -478,9 +501,15 @@ "ocean_model", "dhdt" [Unused] ! long_name: Thickness tendency ! units: meter second-1 +"ocean_model_z_new", "dhdt" [Unused] + ! long_name: Thickness tendency + ! units: meter second-1 "ocean_model", "h_rho" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates ! units: meter +"ocean_model_z_new", "h_rho" [Unused] + ! long_name: Layer thicknesses in pure potential density coordinates + ! units: meter "ocean_model", "uh_rho" [Unused] ! long_name: Zonal volume transport in pure potential density coordinates ! units: meter3 second-1 @@ -496,27 +525,51 @@ "ocean_model", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: meter2 second-2 +"ocean_model_z_new", "KE" [Unused] + ! long_name: Layer kinetic energy per unit mass + ! units: meter2 second-2 "ocean_model", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: meter3 second-3 +"ocean_model_z_new", "dKE_dt" [Unused] + ! long_name: Kinetic Energy Tendency of Layer + ! units: meter3 second-3 "ocean_model", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: meter3 second-3 +"ocean_model_z_new", "PE_to_KE" [Unused] + ! long_name: Potential to Kinetic Energy Conversion of Layer + ! units: meter3 second-3 "ocean_model", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_Coradv" [Unused] + ! long_name: Kinetic Energy Source from Coriolis and Advection + ! units: meter3 second-3 "ocean_model", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_adv" [Unused] + ! long_name: Kinetic Energy Source from Advection + ! units: meter3 second-3 "ocean_model", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: meter3 second-3 +"ocean_model_z_new", "KE_visc" [Unused] + ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses + ! units: meter3 second-3 "ocean_model", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: meter3 second-3 +"ocean_model_z_new", "KE_horvisc" [Unused] + ! long_name: Kinetic Energy Source from Horizontal Viscosity + ! units: meter3 second-3 "ocean_model", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: meter3 second-3 +"ocean_model_z_new", "KE_dia" [Unused] + ! long_name: Kinetic Energy Source from Diapycnal Diffusion + ! units: meter3 second-3 "ocean_model", "cg1" [Unused] ! long_name: First baroclinic gravity wave speed ! units: meter second-1 @@ -590,9 +643,15 @@ "ocean_model", "ea" [Unused] ! long_name: Layer entrainment from above per timestep ! units: meter +"ocean_model_z_new", "ea" [Unused] + ! long_name: Layer entrainment from above per timestep + ! units: meter "ocean_model", "eb" [Unused] ! long_name: Layer entrainment from below per timestep ! units: meter +"ocean_model_z_new", "eb" [Unused] + ! long_name: Layer entrainment from below per timestep + ! units: meter "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing ! units: meter second-2 @@ -658,15 +717,24 @@ "ocean_model", "Kd_layer" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) ! units: meter2 second-1 +"ocean_model_z_new", "Kd_layer" [Unused] + ! long_name: Diapycnal diffusivity of layers (as set) + ! units: meter2 second-1 "ocean_model", "TKE_itidal" [Unused] ! long_name: Internal Tide Driven Turbulent Kinetic Energy ! units: Watt meter-2 "ocean_model", "maxTKE" [Unused] ! long_name: Maximum layer TKE ! units: meter3 second-3 +"ocean_model_z_new", "maxTKE" [Unused] + ! long_name: Maximum layer TKE + ! units: meter3 second-3 "ocean_model", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd ! units: second2 meter +"ocean_model_z_new", "TKE_to_Kd" [Unused] + ! long_name: Convert TKE to Kd + ! units: second2 meter "ocean_model", "Nb" [Unused] ! long_name: Bottom Buoyancy Frequency ! units: sec-1 @@ -691,12 +759,21 @@ "ocean_model", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Work" [Unused] + ! long_name: Work done by Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Itidal_Work" [Unused] + ! long_name: Work done by Internal Tide Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: Watts m-2 +"ocean_model_z_new", "Kd_Nikurashin_Work" [Unused] + ! long_name: Work done by Nikurashin Lee Wave Drag Scheme + ! units: Watts m-2 "ocean_model", "N2" [Unused] ! long_name: Buoyancy frequency squared ! units: sec-2 @@ -743,18 +820,30 @@ "ocean_model", "KPP_BulkDrho" [Unused] ! long_name: Bulk difference in density used in Bulk Richardson number, as used by [CVmix] KPP ! units: kg/m3 +"ocean_model_z_new", "KPP_BulkDrho" [Unused] + ! long_name: Bulk difference in density used in Bulk Richardson number, as used by [CVmix] KPP + ! units: kg/m3 "ocean_model", "KPP_BulkUz2" [Unused] ! long_name: Square of bulk difference in resolved velocity used in Bulk Richardson number via [CVmix] KPP ! units: m2/s2 +"ocean_model_z_new", "KPP_BulkUz2" [Unused] + ! long_name: Square of bulk difference in resolved velocity used in Bulk Richardson number via [CVmix] KPP + ! units: m2/s2 "ocean_model", "KPP_BulkRi" [Unused] ! long_name: Bulk Richardson number used to find the OBL depth used by [CVmix] KPP ! units: nondim +"ocean_model_z_new", "KPP_BulkRi" [Unused] + ! long_name: Bulk Richardson number used to find the OBL depth used by [CVmix] KPP + ! units: nondim "ocean_model", "KPP_sigma" [Unused] ! long_name: Sigma coordinate used by [CVmix] KPP ! units: nondim "ocean_model", "KPP_Ws" [Unused] ! long_name: Turbulent vertical velocity scale for scalars used by [CVmix] KPP ! units: m/s +"ocean_model_z_new", "KPP_Ws" [Unused] + ! long_name: Turbulent vertical velocity scale for scalars used by [CVmix] KPP + ! units: m/s "ocean_model", "KPP_N" [Unused] ! long_name: (Adjusted) Brunt-Vaisala frequency used by [CVmix] KPP ! units: 1/s @@ -764,6 +853,9 @@ "ocean_model", "KPP_Vt2" [Unused] ! long_name: Unresolved shear turbulence used by [CVmix] KPP ! units: m2/s2 +"ocean_model_z_new", "KPP_Vt2" [Unused] + ! long_name: Unresolved shear turbulence used by [CVmix] KPP + ! units: m2/s2 "ocean_model", "KPP_uStar" [Unused] ! long_name: Friction velocity, u*, as used by [CVmix] KPP ! units: m/s @@ -797,15 +889,27 @@ "ocean_model", "KPP_NLT_dTdt" [Unused] ! long_name: Temperature tendency due to non-local transport of heat, as calculated by [CVmix] KPP ! units: K/s +"ocean_model_z_new", "KPP_NLT_dTdt" [Unused] + ! long_name: Temperature tendency due to non-local transport of heat, as calculated by [CVmix] KPP + ! units: K/s "ocean_model", "KPP_NLT_dSdt" [Unused] ! long_name: Salinity tendency due to non-local transport of salt, as calculated by [CVmix] KPP ! units: ppt/s +"ocean_model_z_new", "KPP_NLT_dSdt" [Unused] + ! long_name: Salinity tendency due to non-local transport of salt, as calculated by [CVmix] KPP + ! units: ppt/s "ocean_model", "KPP_NLT_temp_budget" [Unused] ! long_name: Heat content change due to non-local transport, as calculated by [CVmix] KPP ! units: W/m^2 +"ocean_model_z_new", "KPP_NLT_temp_budget" [Unused] + ! long_name: Heat content change due to non-local transport, as calculated by [CVmix] KPP + ! units: W/m^2 "ocean_model", "KPP_NLT_saln_budget" [Unused] ! long_name: Salt content change due to non-local transport, as calculated by [CVmix] KPP ! units: kg/(sec*m^2) +"ocean_model_z_new", "KPP_NLT_saln_budget" [Unused] + ! long_name: Salt content change due to non-local transport, as calculated by [CVmix] KPP + ! units: kg/(sec*m^2) "ocean_model", "KPP_Tsurf" [Unused] ! long_name: Temperature of surface layer (10% of OBL depth) as passed to [CVmix] KPP ! units: C @@ -821,6 +925,9 @@ "ocean_model", "Kd_effective" [Unused] ! long_name: Diapycnal diffusivity as applied ! units: meter2 second-1 +"ocean_model_z_new", "Kd_effective" [Unused] + ! long_name: Diapycnal diffusivity as applied + ! units: meter2 second-1 "ocean_model", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 @@ -836,12 +943,21 @@ "ocean_model", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: meter-1 +"ocean_model_z_new", "opac_1" [Unused] + ! long_name: Opacity for shortwave radiation in band 1 + ! units: meter-1 "ocean_model", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: meter-1 +"ocean_model_z_new", "opac_2" [Unused] + ! long_name: Opacity for shortwave radiation in band 2 + ! units: meter-1 "ocean_model", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: meter-1 +"ocean_model_z_new", "opac_3" [Unused] + ! long_name: Opacity for shortwave radiation in band 3 + ! units: meter-1 "ocean_model", "Chl_opac" [Unused] ! long_name: Surface chlorophyll A concentration used to find opacity ! units: mg meter-3 @@ -868,6 +984,9 @@ "ocean_model", "h" [Unused] ! long_name: Layer Thickness ! units: meter +"ocean_model_z_new", "h" [Unused] + ! long_name: Layer Thickness + ! units: meter "ocean_model", "volo" [Unused] ! long_name: Total volume of liquid ocean ! units: m3 @@ -898,6 +1017,9 @@ "ocean_model", "temp" [Unused] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt" [Unused] ! long_name: Salinity ! units: PPT @@ -905,6 +1027,9 @@ ! long_name: Sea Water Salinity ! units: ppt ! standard_name: sea_water_salinity +"ocean_model_z_new", "salt" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model", "tob" [Unused] ! long_name: Sea Water Potential Temperature at Sea Floor ! units: degC @@ -1007,6 +1132,9 @@ "ocean_model", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: meter +"ocean_model_z_new", "h_predia" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: meter "ocean_model", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: meter @@ -1019,18 +1147,33 @@ "ocean_model", "h_preale" [Unused] ! long_name: Layer Thickness before remapping ! units: meter +"ocean_model_z_new", "h_preale" [Unused] + ! long_name: Layer Thickness before remapping + ! units: meter "ocean_model", "T_preale" [Unused] ! long_name: Temperature before remapping ! units: degC +"ocean_model_z_new", "T_preale" [Unused] + ! long_name: Temperature before remapping + ! units: degC "ocean_model", "S_preale" [Unused] ! long_name: Salinity before remapping ! units: ppt +"ocean_model_z_new", "S_preale" [Unused] + ! long_name: Salinity before remapping + ! units: ppt "ocean_model", "temp_predia" [Unused] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp_predia" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt_predia" [Unused] ! long_name: Salinity ! units: PPT +"ocean_model_z_new", "salt_predia" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model_z", "temp" [Unused] ! long_name: Potential Temperature ! units: degC @@ -1050,6 +1193,9 @@ "ocean_model", "age" [Unused] ! long_name: Ideal Age Tracer ! units: years +"ocean_model_z_new", "age" [Unused] + ! long_name: Ideal Age Tracer + ! units: years "ocean_model", "age_adx" [Unused] ! long_name: Ideal Age Tracer advective zonal flux ! units: years m3 s-1 diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index d8e7123fe7..65d712738c 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -455,6 +455,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 0e883df0ae..98560c0661 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -483,6 +483,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index b45a6bbb37..fd7ee4fddb 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -482,6 +482,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 826a30639a..aa5c880599 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -482,6 +482,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 826a30639a..aa5c880599 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -482,6 +482,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2_icebergs/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_icebergs/MOM_parameter_doc.all index b45a6bbb37..fd7ee4fddb 100644 --- a/ice_ocean_SIS2/SIS2_icebergs/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_icebergs/MOM_parameter_doc.all @@ -482,6 +482,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all index 8b3f032e2b..9319eab001 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all @@ -413,6 +413,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all index c24053435f..26c3914ef8 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all @@ -477,6 +477,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all index 709ec0b661..6926fa2400 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all @@ -477,6 +477,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all index 8ac4431b53..21b32e5326 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all @@ -413,6 +413,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all index a3f0da67d2..145f5dad15 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all @@ -477,6 +477,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all index bf918309ab..b7435b638f 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all @@ -477,6 +477,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all index 8a20fdcce4..f62e4604b4 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all @@ -413,6 +413,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all index 4916b5c97e..641c33d6d5 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all @@ -477,6 +477,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all index 87cb83c4da..c6f51133ed 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all @@ -477,6 +477,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all index dbc5b15929..c806d78f40 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all @@ -413,6 +413,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all index f151e55bf8..a0cddef736 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all @@ -477,6 +477,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all index 1a7903a4b6..ce98f3044b 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all @@ -477,6 +477,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 2bd9d128f4..42bfd15d3c 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -359,6 +359,14 @@ OBC_CONFIG = "DOME" ! default = "file" ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! USER - call a user modified routine. +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/MESO_025_63L/MOM_parameter_doc.all b/ocean_only/MESO_025_63L/MOM_parameter_doc.all index 18489182b8..9d1634782a 100644 --- a/ocean_only/MESO_025_63L/MOM_parameter_doc.all +++ b/ocean_only/MESO_025_63L/MOM_parameter_doc.all @@ -456,6 +456,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 305dd7bd84..2dad137be0 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -354,6 +354,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 5ede019589..db3c93eb0b 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -477,6 +477,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index becb0c25f3..c6abcc2fe6 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -434,6 +434,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 31b28d3034..a8695af65c 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -505,6 +505,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 69a848e6c8..2a08731213 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -505,6 +505,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 53828ee5a4..5b6d0d39d3 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -453,6 +453,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 8113adc9c4..1464ef8c60 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -358,6 +358,14 @@ READ_OBC_TS = False ! [Boolean] default = False ! If true, read the values for the temperature and ! salinity open boundary conditions from the file ! specified by OBC_FILE. +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 3f3cb12550..5cab58508c 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -328,6 +328,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index daefa7d499..eac0e0b3f8 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -418,6 +418,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 137fcf8775..342e14f44e 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -425,6 +425,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index b6c75183c7..00f8ff95d6 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -496,6 +496,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 976b1693a5..1fa95f6bfd 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -496,6 +496,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index afa49fbafc..660a43fb16 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -496,6 +496,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/global/MOM_parameter_doc.all b/ocean_only/global/MOM_parameter_doc.all index f2f3b242ac..6ac0d8f728 100644 --- a/ocean_only/global/MOM_parameter_doc.all +++ b/ocean_only/global/MOM_parameter_doc.all @@ -431,6 +431,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False diff --git a/ocean_only/global/available_diags.000000 b/ocean_only/global/available_diags.000000 index 0ac4e0d39e..e7d79a13b3 100644 --- a/ocean_only/global/available_diags.000000 +++ b/ocean_only/global/available_diags.000000 @@ -125,6 +125,9 @@ ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 ! standard_name: ocean_momentum_xy_biharmonic_diffusivity +"ocean_model_z_new", "Ahh" [Unused] + ! long_name: Biharmonic Horizontal Viscosity at h Points + ! units: meter4 second-1 "ocean_model", "Ahq" [Unused] ! long_name: Biharmonic Horizontal Viscosity at q Points ! units: meter4 second-1 @@ -135,12 +138,18 @@ ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 ! standard_name: ocean_momentum_xy_laplacian_diffusivity +"ocean_model_z_new", "Khh" [Unused] + ! long_name: Laplacian Horizontal Viscosity at h Points + ! units: meter2 second-1 "ocean_model", "Khq" [Unused] ! long_name: Laplacian Horizontal Viscosity at q Points ! units: meter2 second-1 "ocean_model", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms ! units: Watt meter-2 +"ocean_model_z_new", "FrictWork" [Unused] + ! long_name: Integral work done by lateral friction terms + ! units: Watt meter-2 "ocean_model", "FrictWorkIntz" [Unused] ! long_name: Depth integrated work done by lateral friction ! units: Watt meter-2 @@ -422,6 +431,10 @@ ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 ! standard_name: sea_water_mass_per_unit_area +"ocean_model_z_new", "masscello" [Unused] + ! long_name: Mass per unit area of liquid ocean grid cell + ! units: kg m-2 + ! standard_name: sea_water_mass_per_unit_area "ocean_model", "masso" [Unused] ! long_name: Mass of liquid ocean ! units: kg @@ -430,6 +443,10 @@ ! long_name: Cell Thickness ! units: m ! standard_name: cell_thickness +"ocean_model_z_new", "thkcello" [Unused] + ! long_name: Cell Thickness + ! units: m + ! standard_name: cell_thickness "ocean_model", "thetaoga" [Unused] ! long_name: Global Mean Ocean Potential Temperature ! units: Celsius @@ -463,9 +480,15 @@ "ocean_model", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rml" [Unused] + ! long_name: Mixed Layer Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rho_cv" [Unused] + ! long_name: Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "dudt" [Unused] ! long_name: Zonal Acceleration ! units: meter second-2 @@ -475,9 +498,15 @@ "ocean_model", "dhdt" [Unused] ! long_name: Thickness tendency ! units: meter second-1 +"ocean_model_z_new", "dhdt" [Unused] + ! long_name: Thickness tendency + ! units: meter second-1 "ocean_model", "h_rho" [Used] ! long_name: Layer thicknesses in pure potential density coordinates ! units: meter +"ocean_model_z_new", "h_rho" [Unused] + ! long_name: Layer thicknesses in pure potential density coordinates + ! units: meter "ocean_model", "uh_rho" [Used] ! long_name: Zonal volume transport in pure potential density coordinates ! units: meter3 second-1 @@ -493,27 +522,51 @@ "ocean_model", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: meter2 second-2 +"ocean_model_z_new", "KE" [Unused] + ! long_name: Layer kinetic energy per unit mass + ! units: meter2 second-2 "ocean_model", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: meter3 second-3 +"ocean_model_z_new", "dKE_dt" [Unused] + ! long_name: Kinetic Energy Tendency of Layer + ! units: meter3 second-3 "ocean_model", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: meter3 second-3 +"ocean_model_z_new", "PE_to_KE" [Unused] + ! long_name: Potential to Kinetic Energy Conversion of Layer + ! units: meter3 second-3 "ocean_model", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_Coradv" [Unused] + ! long_name: Kinetic Energy Source from Coriolis and Advection + ! units: meter3 second-3 "ocean_model", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_adv" [Unused] + ! long_name: Kinetic Energy Source from Advection + ! units: meter3 second-3 "ocean_model", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: meter3 second-3 +"ocean_model_z_new", "KE_visc" [Unused] + ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses + ! units: meter3 second-3 "ocean_model", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: meter3 second-3 +"ocean_model_z_new", "KE_horvisc" [Unused] + ! long_name: Kinetic Energy Source from Horizontal Viscosity + ! units: meter3 second-3 "ocean_model", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: meter3 second-3 +"ocean_model_z_new", "KE_dia" [Unused] + ! long_name: Kinetic Energy Source from Diapycnal Diffusion + ! units: meter3 second-3 "ocean_model", "cg1" [Unused] ! long_name: First baroclinic gravity wave speed ! units: meter second-1 @@ -587,9 +640,15 @@ "ocean_model", "ea" [Unused] ! long_name: Layer entrainment from above per timestep ! units: meter +"ocean_model_z_new", "ea" [Unused] + ! long_name: Layer entrainment from above per timestep + ! units: meter "ocean_model", "eb" [Unused] ! long_name: Layer entrainment from below per timestep ! units: meter +"ocean_model_z_new", "eb" [Unused] + ! long_name: Layer entrainment from below per timestep + ! units: meter "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing ! units: meter second-2 @@ -655,15 +714,24 @@ "ocean_model", "Kd_layer" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) ! units: meter2 second-1 +"ocean_model_z_new", "Kd_layer" [Unused] + ! long_name: Diapycnal diffusivity of layers (as set) + ! units: meter2 second-1 "ocean_model", "TKE_itidal" [Unused] ! long_name: Internal Tide Driven Turbulent Kinetic Energy ! units: Watt meter-2 "ocean_model", "maxTKE" [Unused] ! long_name: Maximum layer TKE ! units: meter3 second-3 +"ocean_model_z_new", "maxTKE" [Unused] + ! long_name: Maximum layer TKE + ! units: meter3 second-3 "ocean_model", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd ! units: second2 meter +"ocean_model_z_new", "TKE_to_Kd" [Unused] + ! long_name: Convert TKE to Kd + ! units: second2 meter "ocean_model", "Nb" [Unused] ! long_name: Bottom Buoyancy Frequency ! units: sec-1 @@ -688,12 +756,21 @@ "ocean_model", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Work" [Unused] + ! long_name: Work done by Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Itidal_Work" [Unused] + ! long_name: Work done by Internal Tide Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: Watts m-2 +"ocean_model_z_new", "Kd_Nikurashin_Work" [Unused] + ! long_name: Work done by Nikurashin Lee Wave Drag Scheme + ! units: Watts m-2 "ocean_model", "N2" [Unused] ! long_name: Buoyancy frequency squared ! units: sec-2 @@ -733,6 +810,9 @@ "ocean_model", "Kd_effective" [Unused] ! long_name: Diapycnal diffusivity as applied ! units: meter2 second-1 +"ocean_model_z_new", "Kd_effective" [Unused] + ! long_name: Diapycnal diffusivity as applied + ! units: meter2 second-1 "ocean_model", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 @@ -793,12 +873,21 @@ "ocean_model", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: meter-1 +"ocean_model_z_new", "opac_1" [Unused] + ! long_name: Opacity for shortwave radiation in band 1 + ! units: meter-1 "ocean_model", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: meter-1 +"ocean_model_z_new", "opac_2" [Unused] + ! long_name: Opacity for shortwave radiation in band 2 + ! units: meter-1 "ocean_model", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: meter-1 +"ocean_model_z_new", "opac_3" [Unused] + ! long_name: Opacity for shortwave radiation in band 3 + ! units: meter-1 "ocean_model", "Chl_opac" [Unused] ! long_name: Surface chlorophyll A concentration used to find opacity ! units: mg meter-3 @@ -825,6 +914,9 @@ "ocean_model", "h" [Used] ! long_name: Layer Thickness ! units: meter +"ocean_model_z_new", "h" [Unused] + ! long_name: Layer Thickness + ! units: meter "ocean_model", "volo" [Unused] ! long_name: Total volume of liquid ocean ! units: m3 @@ -855,6 +947,9 @@ "ocean_model", "temp" [Used] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt" [Used] ! long_name: Salinity ! units: PPT @@ -862,6 +957,9 @@ ! long_name: Sea Water Salinity ! units: ppt ! standard_name: sea_water_salinity +"ocean_model_z_new", "salt" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model", "tob" [Unused] ! long_name: Sea Water Potential Temperature at Sea Floor ! units: degC @@ -964,15 +1062,24 @@ "ocean_model", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: meter +"ocean_model_z_new", "h_predia" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: meter "ocean_model", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: meter "ocean_model", "temp_predia" [Unused] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp_predia" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt_predia" [Unused] ! long_name: Salinity ! units: PPT +"ocean_model_z_new", "salt_predia" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model_z", "temp" [Unused] ! long_name: Potential Temperature ! units: degC @@ -992,6 +1099,9 @@ "ocean_model", "age" [Used] ! long_name: Ideal Age Tracer ! units: years +"ocean_model_z_new", "age" [Unused] + ! long_name: Ideal Age Tracer + ! units: years "ocean_model", "age_adx" [Unused] ! long_name: Ideal Age Tracer advective zonal flux ! units: years m3 s-1 diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index bc28f24663..635fd442a5 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -404,6 +404,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index fd72f0c343..66c3fd3794 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -125,6 +125,9 @@ ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 ! standard_name: ocean_momentum_xy_biharmonic_diffusivity +"ocean_model_z_new", "Ahh" [Unused] + ! long_name: Biharmonic Horizontal Viscosity at h Points + ! units: meter4 second-1 "ocean_model", "Ahq" [Unused] ! long_name: Biharmonic Horizontal Viscosity at q Points ! units: meter4 second-1 @@ -135,12 +138,18 @@ ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 ! standard_name: ocean_momentum_xy_laplacian_diffusivity +"ocean_model_z_new", "Khh" [Unused] + ! long_name: Laplacian Horizontal Viscosity at h Points + ! units: meter2 second-1 "ocean_model", "Khq" [Unused] ! long_name: Laplacian Horizontal Viscosity at q Points ! units: meter2 second-1 "ocean_model", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms ! units: Watt meter-2 +"ocean_model_z_new", "FrictWork" [Unused] + ! long_name: Integral work done by lateral friction terms + ! units: Watt meter-2 "ocean_model", "FrictWorkIntz" [Unused] ! long_name: Depth integrated work done by lateral friction ! units: Watt meter-2 @@ -422,6 +431,10 @@ ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 ! standard_name: sea_water_mass_per_unit_area +"ocean_model_z_new", "masscello" [Unused] + ! long_name: Mass per unit area of liquid ocean grid cell + ! units: kg m-2 + ! standard_name: sea_water_mass_per_unit_area "ocean_model", "masso" [Used] ! long_name: Mass of liquid ocean ! units: kg @@ -430,6 +443,10 @@ ! long_name: Cell Thickness ! units: m ! standard_name: cell_thickness +"ocean_model_z_new", "thkcello" [Unused] + ! long_name: Cell Thickness + ! units: m + ! standard_name: cell_thickness "ocean_model", "thetaoga" [Used] ! long_name: Global Mean Ocean Potential Temperature ! units: Celsius @@ -463,9 +480,15 @@ "ocean_model", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rml" [Unused] + ! long_name: Mixed Layer Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rho_cv" [Unused] + ! long_name: Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "dudt" [Unused] ! long_name: Zonal Acceleration ! units: meter second-2 @@ -475,9 +498,15 @@ "ocean_model", "dhdt" [Unused] ! long_name: Thickness tendency ! units: meter second-1 +"ocean_model_z_new", "dhdt" [Unused] + ! long_name: Thickness tendency + ! units: meter second-1 "ocean_model", "h_rho" [Used] ! long_name: Layer thicknesses in pure potential density coordinates ! units: meter +"ocean_model_z_new", "h_rho" [Unused] + ! long_name: Layer thicknesses in pure potential density coordinates + ! units: meter "ocean_model", "uh_rho" [Used] ! long_name: Zonal volume transport in pure potential density coordinates ! units: meter3 second-1 @@ -493,27 +522,51 @@ "ocean_model", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: meter2 second-2 +"ocean_model_z_new", "KE" [Unused] + ! long_name: Layer kinetic energy per unit mass + ! units: meter2 second-2 "ocean_model", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: meter3 second-3 +"ocean_model_z_new", "dKE_dt" [Unused] + ! long_name: Kinetic Energy Tendency of Layer + ! units: meter3 second-3 "ocean_model", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: meter3 second-3 +"ocean_model_z_new", "PE_to_KE" [Unused] + ! long_name: Potential to Kinetic Energy Conversion of Layer + ! units: meter3 second-3 "ocean_model", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_Coradv" [Unused] + ! long_name: Kinetic Energy Source from Coriolis and Advection + ! units: meter3 second-3 "ocean_model", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_adv" [Unused] + ! long_name: Kinetic Energy Source from Advection + ! units: meter3 second-3 "ocean_model", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: meter3 second-3 +"ocean_model_z_new", "KE_visc" [Unused] + ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses + ! units: meter3 second-3 "ocean_model", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: meter3 second-3 +"ocean_model_z_new", "KE_horvisc" [Unused] + ! long_name: Kinetic Energy Source from Horizontal Viscosity + ! units: meter3 second-3 "ocean_model", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: meter3 second-3 +"ocean_model_z_new", "KE_dia" [Unused] + ! long_name: Kinetic Energy Source from Diapycnal Diffusion + ! units: meter3 second-3 "ocean_model", "cg1" [Unused] ! long_name: First baroclinic gravity wave speed ! units: meter second-1 @@ -587,9 +640,15 @@ "ocean_model", "ea" [Unused] ! long_name: Layer entrainment from above per timestep ! units: meter +"ocean_model_z_new", "ea" [Unused] + ! long_name: Layer entrainment from above per timestep + ! units: meter "ocean_model", "eb" [Unused] ! long_name: Layer entrainment from below per timestep ! units: meter +"ocean_model_z_new", "eb" [Unused] + ! long_name: Layer entrainment from below per timestep + ! units: meter "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing ! units: meter second-2 @@ -655,15 +714,24 @@ "ocean_model", "Kd_layer" [Used] ! long_name: Diapycnal diffusivity of layers (as set) ! units: meter2 second-1 +"ocean_model_z_new", "Kd_layer" [Unused] + ! long_name: Diapycnal diffusivity of layers (as set) + ! units: meter2 second-1 "ocean_model", "TKE_itidal" [Unused] ! long_name: Internal Tide Driven Turbulent Kinetic Energy ! units: Watt meter-2 "ocean_model", "maxTKE" [Unused] ! long_name: Maximum layer TKE ! units: meter3 second-3 +"ocean_model_z_new", "maxTKE" [Unused] + ! long_name: Maximum layer TKE + ! units: meter3 second-3 "ocean_model", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd ! units: second2 meter +"ocean_model_z_new", "TKE_to_Kd" [Unused] + ! long_name: Convert TKE to Kd + ! units: second2 meter "ocean_model", "Nb" [Unused] ! long_name: Bottom Buoyancy Frequency ! units: sec-1 @@ -688,12 +756,21 @@ "ocean_model", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Work" [Unused] + ! long_name: Work done by Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Itidal_Work" [Unused] + ! long_name: Work done by Internal Tide Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: Watts m-2 +"ocean_model_z_new", "Kd_Nikurashin_Work" [Unused] + ! long_name: Work done by Nikurashin Lee Wave Drag Scheme + ! units: Watts m-2 "ocean_model", "N2" [Unused] ! long_name: Buoyancy frequency squared ! units: sec-2 @@ -740,18 +817,30 @@ "ocean_model", "KPP_BulkDrho" [Used] ! long_name: Bulk difference in density used in Bulk Richardson number, as used by [CVmix] KPP ! units: kg/m3 +"ocean_model_z_new", "KPP_BulkDrho" [Unused] + ! long_name: Bulk difference in density used in Bulk Richardson number, as used by [CVmix] KPP + ! units: kg/m3 "ocean_model", "KPP_BulkUz2" [Used] ! long_name: Square of bulk difference in resolved velocity used in Bulk Richardson number via [CVmix] KPP ! units: m2/s2 +"ocean_model_z_new", "KPP_BulkUz2" [Unused] + ! long_name: Square of bulk difference in resolved velocity used in Bulk Richardson number via [CVmix] KPP + ! units: m2/s2 "ocean_model", "KPP_BulkRi" [Used] ! long_name: Bulk Richardson number used to find the OBL depth used by [CVmix] KPP ! units: nondim +"ocean_model_z_new", "KPP_BulkRi" [Unused] + ! long_name: Bulk Richardson number used to find the OBL depth used by [CVmix] KPP + ! units: nondim "ocean_model", "KPP_sigma" [Unused] ! long_name: Sigma coordinate used by [CVmix] KPP ! units: nondim "ocean_model", "KPP_Ws" [Used] ! long_name: Turbulent vertical velocity scale for scalars used by [CVmix] KPP ! units: m/s +"ocean_model_z_new", "KPP_Ws" [Unused] + ! long_name: Turbulent vertical velocity scale for scalars used by [CVmix] KPP + ! units: m/s "ocean_model", "KPP_N" [Used] ! long_name: (Adjusted) Brunt-Vaisala frequency used by [CVmix] KPP ! units: 1/s @@ -761,6 +850,9 @@ "ocean_model", "KPP_Vt2" [Used] ! long_name: Unresolved shear turbulence used by [CVmix] KPP ! units: m2/s2 +"ocean_model_z_new", "KPP_Vt2" [Unused] + ! long_name: Unresolved shear turbulence used by [CVmix] KPP + ! units: m2/s2 "ocean_model", "KPP_uStar" [Used] ! long_name: Friction velocity, u*, as used by [CVmix] KPP ! units: m/s @@ -794,15 +886,27 @@ "ocean_model", "KPP_NLT_dTdt" [Unused] ! long_name: Temperature tendency due to non-local transport of heat, as calculated by [CVmix] KPP ! units: K/s +"ocean_model_z_new", "KPP_NLT_dTdt" [Unused] + ! long_name: Temperature tendency due to non-local transport of heat, as calculated by [CVmix] KPP + ! units: K/s "ocean_model", "KPP_NLT_dSdt" [Unused] ! long_name: Salinity tendency due to non-local transport of salt, as calculated by [CVmix] KPP ! units: ppt/s +"ocean_model_z_new", "KPP_NLT_dSdt" [Unused] + ! long_name: Salinity tendency due to non-local transport of salt, as calculated by [CVmix] KPP + ! units: ppt/s "ocean_model", "KPP_NLT_temp_budget" [Unused] ! long_name: Heat content change due to non-local transport, as calculated by [CVmix] KPP ! units: W/m^2 +"ocean_model_z_new", "KPP_NLT_temp_budget" [Unused] + ! long_name: Heat content change due to non-local transport, as calculated by [CVmix] KPP + ! units: W/m^2 "ocean_model", "KPP_NLT_saln_budget" [Unused] ! long_name: Salt content change due to non-local transport, as calculated by [CVmix] KPP ! units: kg/(sec*m^2) +"ocean_model_z_new", "KPP_NLT_saln_budget" [Unused] + ! long_name: Salt content change due to non-local transport, as calculated by [CVmix] KPP + ! units: kg/(sec*m^2) "ocean_model", "KPP_Tsurf" [Unused] ! long_name: Temperature of surface layer (10% of OBL depth) as passed to [CVmix] KPP ! units: C @@ -818,6 +922,9 @@ "ocean_model", "Kd_effective" [Used] ! long_name: Diapycnal diffusivity as applied ! units: meter2 second-1 +"ocean_model_z_new", "Kd_effective" [Unused] + ! long_name: Diapycnal diffusivity as applied + ! units: meter2 second-1 "ocean_model", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 @@ -878,12 +985,21 @@ "ocean_model", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: meter-1 +"ocean_model_z_new", "opac_1" [Unused] + ! long_name: Opacity for shortwave radiation in band 1 + ! units: meter-1 "ocean_model", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: meter-1 +"ocean_model_z_new", "opac_2" [Unused] + ! long_name: Opacity for shortwave radiation in band 2 + ! units: meter-1 "ocean_model", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: meter-1 +"ocean_model_z_new", "opac_3" [Unused] + ! long_name: Opacity for shortwave radiation in band 3 + ! units: meter-1 "ocean_model", "Chl_opac" [Unused] ! long_name: Surface chlorophyll A concentration used to find opacity ! units: mg meter-3 @@ -910,6 +1026,9 @@ "ocean_model", "h" [Used] ! long_name: Layer Thickness ! units: meter +"ocean_model_z_new", "h" [Unused] + ! long_name: Layer Thickness + ! units: meter "ocean_model", "volo" [Used] ! long_name: Total volume of liquid ocean ! units: m3 @@ -940,6 +1059,9 @@ "ocean_model", "temp" [Used] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt" [Used] ! long_name: Salinity ! units: PPT @@ -947,6 +1069,9 @@ ! long_name: Sea Water Salinity ! units: ppt ! standard_name: sea_water_salinity +"ocean_model_z_new", "salt" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model", "tob" [Unused] ! long_name: Sea Water Potential Temperature at Sea Floor ! units: degC @@ -1049,15 +1174,24 @@ "ocean_model", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: meter +"ocean_model_z_new", "h_predia" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: meter "ocean_model", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: meter "ocean_model", "temp_predia" [Unused] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp_predia" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt_predia" [Unused] ! long_name: Salinity ! units: PPT +"ocean_model_z_new", "salt_predia" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model_z", "temp" [Unused] ! long_name: Potential Temperature ! units: degC @@ -1077,6 +1211,9 @@ "ocean_model", "age" [Used] ! long_name: Ideal Age Tracer ! units: years +"ocean_model_z_new", "age" [Unused] + ! long_name: Ideal Age Tracer + ! units: years "ocean_model", "age_adx" [Unused] ! long_name: Ideal Age Tracer advective zonal flux ! units: years m3 s-1 diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 2175c3e7a5..d299799927 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -466,6 +466,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 691e438222..758cf31702 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -125,6 +125,9 @@ ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 ! standard_name: ocean_momentum_xy_biharmonic_diffusivity +"ocean_model_z_new", "Ahh" [Unused] + ! long_name: Biharmonic Horizontal Viscosity at h Points + ! units: meter4 second-1 "ocean_model", "Ahq" [Unused] ! long_name: Biharmonic Horizontal Viscosity at q Points ! units: meter4 second-1 @@ -135,12 +138,18 @@ ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 ! standard_name: ocean_momentum_xy_laplacian_diffusivity +"ocean_model_z_new", "Khh" [Unused] + ! long_name: Laplacian Horizontal Viscosity at h Points + ! units: meter2 second-1 "ocean_model", "Khq" [Unused] ! long_name: Laplacian Horizontal Viscosity at q Points ! units: meter2 second-1 "ocean_model", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms ! units: Watt meter-2 +"ocean_model_z_new", "FrictWork" [Unused] + ! long_name: Integral work done by lateral friction terms + ! units: Watt meter-2 "ocean_model", "FrictWorkIntz" [Unused] ! long_name: Depth integrated work done by lateral friction ! units: Watt meter-2 @@ -392,6 +401,10 @@ ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 ! standard_name: sea_water_mass_per_unit_area +"ocean_model_z_new", "masscello" [Unused] + ! long_name: Mass per unit area of liquid ocean grid cell + ! units: kg m-2 + ! standard_name: sea_water_mass_per_unit_area "ocean_model", "masso" [Used] ! long_name: Mass of liquid ocean ! units: kg @@ -400,6 +413,10 @@ ! long_name: Cell Thickness ! units: m ! standard_name: cell_thickness +"ocean_model_z_new", "thkcello" [Unused] + ! long_name: Cell Thickness + ! units: m + ! standard_name: cell_thickness "ocean_model", "thetaoga" [Used] ! long_name: Global Mean Ocean Potential Temperature ! units: Celsius @@ -433,9 +450,15 @@ "ocean_model", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rml" [Unused] + ! long_name: Mixed Layer Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rho_cv" [Unused] + ! long_name: Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "dudt" [Unused] ! long_name: Zonal Acceleration ! units: meter second-2 @@ -445,9 +468,15 @@ "ocean_model", "dhdt" [Unused] ! long_name: Thickness tendency ! units: meter second-1 +"ocean_model_z_new", "dhdt" [Unused] + ! long_name: Thickness tendency + ! units: meter second-1 "ocean_model", "h_rho" [Used] ! long_name: Layer thicknesses in pure potential density coordinates ! units: meter +"ocean_model_z_new", "h_rho" [Unused] + ! long_name: Layer thicknesses in pure potential density coordinates + ! units: meter "ocean_model", "uh_rho" [Used] ! long_name: Zonal volume transport in pure potential density coordinates ! units: meter3 second-1 @@ -463,27 +492,51 @@ "ocean_model", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: meter2 second-2 +"ocean_model_z_new", "KE" [Unused] + ! long_name: Layer kinetic energy per unit mass + ! units: meter2 second-2 "ocean_model", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: meter3 second-3 +"ocean_model_z_new", "dKE_dt" [Unused] + ! long_name: Kinetic Energy Tendency of Layer + ! units: meter3 second-3 "ocean_model", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: meter3 second-3 +"ocean_model_z_new", "PE_to_KE" [Unused] + ! long_name: Potential to Kinetic Energy Conversion of Layer + ! units: meter3 second-3 "ocean_model", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_Coradv" [Unused] + ! long_name: Kinetic Energy Source from Coriolis and Advection + ! units: meter3 second-3 "ocean_model", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_adv" [Unused] + ! long_name: Kinetic Energy Source from Advection + ! units: meter3 second-3 "ocean_model", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: meter3 second-3 +"ocean_model_z_new", "KE_visc" [Unused] + ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses + ! units: meter3 second-3 "ocean_model", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: meter3 second-3 +"ocean_model_z_new", "KE_horvisc" [Unused] + ! long_name: Kinetic Energy Source from Horizontal Viscosity + ! units: meter3 second-3 "ocean_model", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: meter3 second-3 +"ocean_model_z_new", "KE_dia" [Unused] + ! long_name: Kinetic Energy Source from Diapycnal Diffusion + ! units: meter3 second-3 "ocean_model", "cg1" [Unused] ! long_name: First baroclinic gravity wave speed ! units: meter second-1 @@ -557,9 +610,15 @@ "ocean_model", "ea" [Unused] ! long_name: Layer entrainment from above per timestep ! units: meter +"ocean_model_z_new", "ea" [Unused] + ! long_name: Layer entrainment from above per timestep + ! units: meter "ocean_model", "eb" [Unused] ! long_name: Layer entrainment from below per timestep ! units: meter +"ocean_model_z_new", "eb" [Unused] + ! long_name: Layer entrainment from below per timestep + ! units: meter "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing ! units: meter second-2 @@ -625,15 +684,24 @@ "ocean_model", "Kd_layer" [Used] ! long_name: Diapycnal diffusivity of layers (as set) ! units: meter2 second-1 +"ocean_model_z_new", "Kd_layer" [Unused] + ! long_name: Diapycnal diffusivity of layers (as set) + ! units: meter2 second-1 "ocean_model", "TKE_itidal" [Unused] ! long_name: Internal Tide Driven Turbulent Kinetic Energy ! units: Watt meter-2 "ocean_model", "maxTKE" [Unused] ! long_name: Maximum layer TKE ! units: meter3 second-3 +"ocean_model_z_new", "maxTKE" [Unused] + ! long_name: Maximum layer TKE + ! units: meter3 second-3 "ocean_model", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd ! units: second2 meter +"ocean_model_z_new", "TKE_to_Kd" [Unused] + ! long_name: Convert TKE to Kd + ! units: second2 meter "ocean_model", "Nb" [Unused] ! long_name: Bottom Buoyancy Frequency ! units: sec-1 @@ -658,12 +726,21 @@ "ocean_model", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Work" [Unused] + ! long_name: Work done by Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Itidal_Work" [Unused] + ! long_name: Work done by Internal Tide Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: Watts m-2 +"ocean_model_z_new", "Kd_Nikurashin_Work" [Unused] + ! long_name: Work done by Nikurashin Lee Wave Drag Scheme + ! units: Watts m-2 "ocean_model", "N2" [Unused] ! long_name: Buoyancy frequency squared ! units: sec-2 @@ -710,18 +787,30 @@ "ocean_model", "KPP_BulkDrho" [Used] ! long_name: Bulk difference in density used in Bulk Richardson number, as used by [CVmix] KPP ! units: kg/m3 +"ocean_model_z_new", "KPP_BulkDrho" [Unused] + ! long_name: Bulk difference in density used in Bulk Richardson number, as used by [CVmix] KPP + ! units: kg/m3 "ocean_model", "KPP_BulkUz2" [Used] ! long_name: Square of bulk difference in resolved velocity used in Bulk Richardson number via [CVmix] KPP ! units: m2/s2 +"ocean_model_z_new", "KPP_BulkUz2" [Unused] + ! long_name: Square of bulk difference in resolved velocity used in Bulk Richardson number via [CVmix] KPP + ! units: m2/s2 "ocean_model", "KPP_BulkRi" [Used] ! long_name: Bulk Richardson number used to find the OBL depth used by [CVmix] KPP ! units: nondim +"ocean_model_z_new", "KPP_BulkRi" [Unused] + ! long_name: Bulk Richardson number used to find the OBL depth used by [CVmix] KPP + ! units: nondim "ocean_model", "KPP_sigma" [Unused] ! long_name: Sigma coordinate used by [CVmix] KPP ! units: nondim "ocean_model", "KPP_Ws" [Used] ! long_name: Turbulent vertical velocity scale for scalars used by [CVmix] KPP ! units: m/s +"ocean_model_z_new", "KPP_Ws" [Unused] + ! long_name: Turbulent vertical velocity scale for scalars used by [CVmix] KPP + ! units: m/s "ocean_model", "KPP_N" [Used] ! long_name: (Adjusted) Brunt-Vaisala frequency used by [CVmix] KPP ! units: 1/s @@ -731,6 +820,9 @@ "ocean_model", "KPP_Vt2" [Used] ! long_name: Unresolved shear turbulence used by [CVmix] KPP ! units: m2/s2 +"ocean_model_z_new", "KPP_Vt2" [Unused] + ! long_name: Unresolved shear turbulence used by [CVmix] KPP + ! units: m2/s2 "ocean_model", "KPP_uStar" [Used] ! long_name: Friction velocity, u*, as used by [CVmix] KPP ! units: m/s @@ -764,15 +856,27 @@ "ocean_model", "KPP_NLT_dTdt" [Unused] ! long_name: Temperature tendency due to non-local transport of heat, as calculated by [CVmix] KPP ! units: K/s +"ocean_model_z_new", "KPP_NLT_dTdt" [Unused] + ! long_name: Temperature tendency due to non-local transport of heat, as calculated by [CVmix] KPP + ! units: K/s "ocean_model", "KPP_NLT_dSdt" [Unused] ! long_name: Salinity tendency due to non-local transport of salt, as calculated by [CVmix] KPP ! units: ppt/s +"ocean_model_z_new", "KPP_NLT_dSdt" [Unused] + ! long_name: Salinity tendency due to non-local transport of salt, as calculated by [CVmix] KPP + ! units: ppt/s "ocean_model", "KPP_NLT_temp_budget" [Unused] ! long_name: Heat content change due to non-local transport, as calculated by [CVmix] KPP ! units: W/m^2 +"ocean_model_z_new", "KPP_NLT_temp_budget" [Unused] + ! long_name: Heat content change due to non-local transport, as calculated by [CVmix] KPP + ! units: W/m^2 "ocean_model", "KPP_NLT_saln_budget" [Unused] ! long_name: Salt content change due to non-local transport, as calculated by [CVmix] KPP ! units: kg/(sec*m^2) +"ocean_model_z_new", "KPP_NLT_saln_budget" [Unused] + ! long_name: Salt content change due to non-local transport, as calculated by [CVmix] KPP + ! units: kg/(sec*m^2) "ocean_model", "KPP_Tsurf" [Unused] ! long_name: Temperature of surface layer (10% of OBL depth) as passed to [CVmix] KPP ! units: C @@ -788,6 +892,9 @@ "ocean_model", "Kd_effective" [Used] ! long_name: Diapycnal diffusivity as applied ! units: meter2 second-1 +"ocean_model_z_new", "Kd_effective" [Unused] + ! long_name: Diapycnal diffusivity as applied + ! units: meter2 second-1 "ocean_model", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 @@ -803,12 +910,21 @@ "ocean_model", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: meter-1 +"ocean_model_z_new", "opac_1" [Unused] + ! long_name: Opacity for shortwave radiation in band 1 + ! units: meter-1 "ocean_model", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: meter-1 +"ocean_model_z_new", "opac_2" [Unused] + ! long_name: Opacity for shortwave radiation in band 2 + ! units: meter-1 "ocean_model", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: meter-1 +"ocean_model_z_new", "opac_3" [Unused] + ! long_name: Opacity for shortwave radiation in band 3 + ! units: meter-1 "ocean_model", "Chl_opac" [Unused] ! long_name: Surface chlorophyll A concentration used to find opacity ! units: mg meter-3 @@ -835,6 +951,9 @@ "ocean_model", "h" [Used] ! long_name: Layer Thickness ! units: meter +"ocean_model_z_new", "h" [Unused] + ! long_name: Layer Thickness + ! units: meter "ocean_model", "volo" [Used] ! long_name: Total volume of liquid ocean ! units: m3 @@ -865,6 +984,9 @@ "ocean_model", "temp" [Used] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt" [Used] ! long_name: Salinity ! units: PPT @@ -872,6 +994,9 @@ ! long_name: Sea Water Salinity ! units: ppt ! standard_name: sea_water_salinity +"ocean_model_z_new", "salt" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model", "tob" [Unused] ! long_name: Sea Water Potential Temperature at Sea Floor ! units: degC @@ -974,15 +1099,24 @@ "ocean_model", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: meter +"ocean_model_z_new", "h_predia" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: meter "ocean_model", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: meter "ocean_model", "temp_predia" [Unused] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp_predia" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt_predia" [Unused] ! long_name: Salinity ! units: PPT +"ocean_model_z_new", "salt_predia" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model_z", "temp" [Unused] ! long_name: Potential Temperature ! units: degC @@ -1002,6 +1136,9 @@ "ocean_model", "age" [Used] ! long_name: Ideal Age Tracer ! units: years +"ocean_model_z_new", "age" [Unused] + ! long_name: Ideal Age Tracer + ! units: years "ocean_model", "age_adx" [Unused] ! long_name: Ideal Age Tracer advective zonal flux ! units: years m3 s-1 diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 966d1918bc..c177e2b0de 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -421,6 +421,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all index 952d96e602..1afcb71bea 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -491,6 +491,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/mixed_layer_restrat_2d/available_diags.000000 b/ocean_only/mixed_layer_restrat_2d/available_diags.000000 index 9459bf33b5..c41864d228 100644 --- a/ocean_only/mixed_layer_restrat_2d/available_diags.000000 +++ b/ocean_only/mixed_layer_restrat_2d/available_diags.000000 @@ -41,12 +41,18 @@ ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 ! standard_name: ocean_momentum_xy_laplacian_diffusivity +"ocean_model_z_new", "Khh" [Unused] + ! long_name: Laplacian Horizontal Viscosity at h Points + ! units: meter2 second-1 "ocean_model", "Khq" [Unused] ! long_name: Laplacian Horizontal Viscosity at q Points ! units: meter2 second-1 "ocean_model", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms ! units: Watt meter-2 +"ocean_model_z_new", "FrictWork" [Unused] + ! long_name: Integral work done by lateral friction terms + ! units: Watt meter-2 "ocean_model", "FrictWorkIntz" [Unused] ! long_name: Depth integrated work done by lateral friction ! units: Watt meter-2 @@ -328,6 +334,10 @@ ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 ! standard_name: sea_water_mass_per_unit_area +"ocean_model_z_new", "masscello" [Unused] + ! long_name: Mass per unit area of liquid ocean grid cell + ! units: kg m-2 + ! standard_name: sea_water_mass_per_unit_area "ocean_model", "masso" [Unused] ! long_name: Mass of liquid ocean ! units: kg @@ -336,6 +346,10 @@ ! long_name: Cell Thickness ! units: m ! standard_name: cell_thickness +"ocean_model_z_new", "thkcello" [Unused] + ! long_name: Cell Thickness + ! units: m + ! standard_name: cell_thickness "ocean_model", "thetaoga" [Unused] ! long_name: Global Mean Ocean Potential Temperature ! units: Celsius @@ -369,9 +383,15 @@ "ocean_model", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rml" [Unused] + ! long_name: Mixed Layer Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density ! units: kg meter-3 +"ocean_model_z_new", "Rho_cv" [Unused] + ! long_name: Coordinate Potential Density + ! units: kg meter-3 "ocean_model", "dudt" [Unused] ! long_name: Zonal Acceleration ! units: meter second-2 @@ -381,9 +401,15 @@ "ocean_model", "dhdt" [Unused] ! long_name: Thickness tendency ! units: meter second-1 +"ocean_model_z_new", "dhdt" [Unused] + ! long_name: Thickness tendency + ! units: meter second-1 "ocean_model", "h_rho" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates ! units: meter +"ocean_model_z_new", "h_rho" [Unused] + ! long_name: Layer thicknesses in pure potential density coordinates + ! units: meter "ocean_model", "uh_rho" [Unused] ! long_name: Zonal volume transport in pure potential density coordinates ! units: meter3 second-1 @@ -399,27 +425,51 @@ "ocean_model", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: meter2 second-2 +"ocean_model_z_new", "KE" [Unused] + ! long_name: Layer kinetic energy per unit mass + ! units: meter2 second-2 "ocean_model", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: meter3 second-3 +"ocean_model_z_new", "dKE_dt" [Unused] + ! long_name: Kinetic Energy Tendency of Layer + ! units: meter3 second-3 "ocean_model", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: meter3 second-3 +"ocean_model_z_new", "PE_to_KE" [Unused] + ! long_name: Potential to Kinetic Energy Conversion of Layer + ! units: meter3 second-3 "ocean_model", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_Coradv" [Unused] + ! long_name: Kinetic Energy Source from Coriolis and Advection + ! units: meter3 second-3 "ocean_model", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: meter3 second-3 +"ocean_model_z_new", "KE_adv" [Unused] + ! long_name: Kinetic Energy Source from Advection + ! units: meter3 second-3 "ocean_model", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: meter3 second-3 +"ocean_model_z_new", "KE_visc" [Unused] + ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses + ! units: meter3 second-3 "ocean_model", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: meter3 second-3 +"ocean_model_z_new", "KE_horvisc" [Unused] + ! long_name: Kinetic Energy Source from Horizontal Viscosity + ! units: meter3 second-3 "ocean_model", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: meter3 second-3 +"ocean_model_z_new", "KE_dia" [Unused] + ! long_name: Kinetic Energy Source from Diapycnal Diffusion + ! units: meter3 second-3 "ocean_model", "cg1" [Unused] ! long_name: First baroclinic gravity wave speed ! units: meter second-1 @@ -477,9 +527,15 @@ "ocean_model", "ea" [Unused] ! long_name: Layer entrainment from above per timestep ! units: meter +"ocean_model_z_new", "ea" [Unused] + ! long_name: Layer entrainment from above per timestep + ! units: meter "ocean_model", "eb" [Unused] ! long_name: Layer entrainment from below per timestep ! units: meter +"ocean_model_z_new", "eb" [Unused] + ! long_name: Layer entrainment from below per timestep + ! units: meter "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing ! units: meter second-2 @@ -530,15 +586,24 @@ "ocean_model", "Kd_layer" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) ! units: meter2 second-1 +"ocean_model_z_new", "Kd_layer" [Unused] + ! long_name: Diapycnal diffusivity of layers (as set) + ! units: meter2 second-1 "ocean_model", "TKE_itidal" [Unused] ! long_name: Internal Tide Driven Turbulent Kinetic Energy ! units: Watt meter-2 "ocean_model", "maxTKE" [Unused] ! long_name: Maximum layer TKE ! units: meter3 second-3 +"ocean_model_z_new", "maxTKE" [Unused] + ! long_name: Maximum layer TKE + ! units: meter3 second-3 "ocean_model", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd ! units: second2 meter +"ocean_model_z_new", "TKE_to_Kd" [Unused] + ! long_name: Convert TKE to Kd + ! units: second2 meter "ocean_model", "Nb" [Unused] ! long_name: Bottom Buoyancy Frequency ! units: sec-1 @@ -563,12 +628,21 @@ "ocean_model", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Work" [Unused] + ! long_name: Work done by Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: Watts m-2 +"ocean_model_z_new", "Kd_Itidal_Work" [Unused] + ! long_name: Work done by Internal Tide Diapycnal Mixing + ! units: Watts m-2 "ocean_model", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: Watts m-2 +"ocean_model_z_new", "Kd_Nikurashin_Work" [Unused] + ! long_name: Work done by Nikurashin Lee Wave Drag Scheme + ! units: Watts m-2 "ocean_model", "N2" [Unused] ! long_name: Buoyancy frequency squared ! units: sec-2 @@ -596,6 +670,9 @@ "ocean_model", "Kd_effective" [Unused] ! long_name: Diapycnal diffusivity as applied ! units: meter2 second-1 +"ocean_model_z_new", "Kd_effective" [Unused] + ! long_name: Diapycnal diffusivity as applied + ! units: meter2 second-1 "ocean_model", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 @@ -611,6 +688,9 @@ "ocean_model", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: meter-1 +"ocean_model_z_new", "opac_1" [Unused] + ! long_name: Opacity for shortwave radiation in band 1 + ! units: meter-1 "ocean_model", "KHTR_u" [Unused] ! long_name: Epipycnal tracer diffusivity at zonal faces of tracer cell ! units: meter2 second-1 @@ -634,6 +714,9 @@ "ocean_model", "h" [Used] ! long_name: Layer Thickness ! units: meter +"ocean_model_z_new", "h" [Unused] + ! long_name: Layer Thickness + ! units: meter "ocean_model", "volo" [Unused] ! long_name: Total volume of liquid ocean ! units: m3 @@ -664,6 +747,9 @@ "ocean_model", "temp" [Used] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt" [Used] ! long_name: Salinity ! units: PPT @@ -671,6 +757,9 @@ ! long_name: Sea Water Salinity ! units: ppt ! standard_name: sea_water_salinity +"ocean_model_z_new", "salt" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model", "tob" [Unused] ! long_name: Sea Water Potential Temperature at Sea Floor ! units: degC @@ -766,15 +855,24 @@ "ocean_model", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: meter +"ocean_model_z_new", "h_predia" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: meter "ocean_model", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: meter "ocean_model", "temp_predia" [Unused] ! long_name: Potential Temperature ! units: Celsius +"ocean_model_z_new", "temp_predia" [Unused] + ! long_name: Potential Temperature + ! units: Celsius "ocean_model", "salt_predia" [Unused] ! long_name: Salinity ! units: PPT +"ocean_model_z_new", "salt_predia" [Unused] + ! long_name: Salinity + ! units: PPT "ocean_model_z", "temp" [Unused] ! long_name: Potential Temperature ! units: degC diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 48625201bf..3db9514eb4 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -434,6 +434,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 42ec0b1e8a..af818756f4 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -420,6 +420,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 116ee2d112..4f122a7498 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -493,6 +493,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 204222e9a0..d4d629f06b 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -421,6 +421,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 20cfb2981b..309fbd3d92 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -492,6 +492,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 13b18cbbbe..40efb8f5bd 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -492,6 +492,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 2245a29cc1..0d0f7af5c1 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -381,6 +381,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 15e9b73814..500e25f985 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -436,6 +436,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index c70ab0089f..2e257ff0a3 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -436,6 +436,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index ce48d81036..cb21b77dd1 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -423,6 +423,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 0b850b35a4..9eef2722fb 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -496,6 +496,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index be3c55ac64..2e19857f73 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -496,6 +496,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 31a03b7368..620a806c2a 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -432,6 +432,14 @@ APPLY_OBC_U = False ! [Boolean] default = False APPLY_OBC_V = False ! [Boolean] default = False ! If true, open boundary conditions may be set at some ! v-points, with the configuration controlled by OBC_CONFIG +DIAG_REMAP_Z_GRID_DEF = "" ! default = "" + ! This sets the file and variable names that define the + ! vertical grid used for diagnostic output remapping to + ! Z space. It should look like: + ! FILE:, - where is a file within + ! the INPUTDIR, is + ! the name of the variable that + ! contains interface positions. ! === module MOM_MEKE === USE_MEKE = False ! [Boolean] default = False diff --git a/src/MOM6 b/src/MOM6 index a8ce3409af..d00d00100e 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit a8ce3409afb44c6f426dbf7093c11f5c2cf782b3 +Subproject commit d00d00100e7cc79130abeadbbda1997f698f6659