From 3b2341cb9ffbb341dc005904663a3148c7bf686c Mon Sep 17 00:00:00 2001 From: Marshall Ward Date: Mon, 3 Apr 2023 22:33:12 -0400 Subject: [PATCH] MOM6: +(*)Remove coord_SLight - NOAA-GFDL/MOM6@19f861314 +(*)Remove coord_SLight - NOAA-GFDL/MOM6@1bb66a44c +Update check_MOM6_scaling_factors with C and S --- .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 1 - .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short | 1 - ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all | 1 - ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short | 1 - ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all | 1 - ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short | 1 - ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 1 - ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short | 1 - ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 1 - ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 1 - ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all | 1 - ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short | 1 - .../CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all | 1 - .../CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short | 1 - .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all | 1 - .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short | 1 - ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all | 1 - .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short | 1 - ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all | 1 - .../CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short | 1 - .../skin_warming_wind/EPBL/MOM_parameter_doc.all | 1 - .../skin_warming_wind/EPBL/MOM_parameter_doc.short | 1 - .../CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all | 1 - .../skin_warming_wind/KPP/MOM_parameter_doc.short | 1 - ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all | 1 - .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short | 1 - ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all | 1 - .../CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short | 1 - ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all | 1 - ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short | 1 - ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 1 - ocean_only/adjustment2d/rho/MOM_parameter_doc.short | 1 - ocean_only/adjustment2d/z/MOM_parameter_doc.all | 1 - ocean_only/adjustment2d/z/MOM_parameter_doc.short | 1 - ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 1 - ocean_only/flow_downslope/rho/MOM_parameter_doc.short | 1 - ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 1 - ocean_only/flow_downslope/sigma/MOM_parameter_doc.short | 1 - ocean_only/flow_downslope/z/MOM_parameter_doc.all | 1 - ocean_only/flow_downslope/z/MOM_parameter_doc.short | 1 - ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 1 - ocean_only/global_ALE/hycom/MOM_parameter_doc.short | 1 - ocean_only/global_ALE/z/MOM_parameter_doc.all | 1 - ocean_only/global_ALE/z/MOM_parameter_doc.short | 1 - ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 1 - ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short | 1 - ocean_only/resting/z/MOM_parameter_doc.all | 1 - ocean_only/resting/z/MOM_parameter_doc.short | 1 - ocean_only/seamount/rho/MOM_parameter_doc.all | 1 - ocean_only/seamount/rho/MOM_parameter_doc.short | 1 - ocean_only/seamount/sigma/MOM_parameter_doc.all | 1 - ocean_only/seamount/sigma/MOM_parameter_doc.short | 1 - ocean_only/seamount/z/MOM_parameter_doc.all | 1 - ocean_only/seamount/z/MOM_parameter_doc.short | 1 - ocean_only/single_column/EPBL/MOM_parameter_doc.all | 1 - ocean_only/single_column/EPBL/MOM_parameter_doc.short | 1 - ocean_only/single_column/KPP/MOM_parameter_doc.all | 1 - ocean_only/single_column/KPP/MOM_parameter_doc.short | 1 - ocean_only/sloshing/rho/MOM_parameter_doc.all | 1 - ocean_only/sloshing/rho/MOM_parameter_doc.short | 1 - ocean_only/sloshing/z/MOM_parameter_doc.all | 1 - ocean_only/sloshing/z/MOM_parameter_doc.short | 1 - ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 1 - ocean_only/tracer_mixing/rho/MOM_parameter_doc.short | 1 - ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 1 - ocean_only/tracer_mixing/z/MOM_parameter_doc.short | 1 - src/MOM6 | 2 +- 67 files changed, 1 insertion(+), 67 deletions(-) diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all index ee1a3f8ca3..3f356df0d3 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all @@ -478,7 +478,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short index 4ff8fd82db..f5ecb90539 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short @@ -174,7 +174,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces ALE_COORDINATE_CONFIG = "FILE:vgrid.nc,dz" ! default = "UNIFORM" ! Determines how to specify the coordinate resolution. Valid options are: diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all index c1716edbff..127b9e7c43 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -470,7 +470,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short index 1206d645a2..a569eed6c1 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short @@ -196,7 +196,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False ! When defined, a proper high-order reconstruction scheme is used within diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all index bc23fb0bdc..5d73d9ad27 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -470,7 +470,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short index 78ef46f183..2f0fdc7310 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short @@ -192,7 +192,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False ! When defined, a proper high-order reconstruction scheme is used within diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index a44fe77a64..65bf379e65 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -470,7 +470,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index a2c28ebcc6..fe86e0c47d 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -199,7 +199,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False ! When defined, a proper high-order reconstruction scheme is used within diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 189c6d15a5..1560bb502a 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -470,7 +470,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index 0105e25cc7..5b358ea98f 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -193,7 +193,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False ! When defined, a proper high-order reconstruction scheme is used within diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index ca98d73be2..6501921870 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -461,7 +461,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short index 1989a640d9..6c78c5de8d 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short @@ -207,7 +207,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False ! When defined, a proper high-order reconstruction scheme is used within 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 95d76c21de..dea05f421e 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 @@ -424,7 +424,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short index abe1630a3f..c3742c0d8e 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short @@ -126,7 +126,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 400*1.0 ! [m] ! The distribution of vertical resolution for the target 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 117b677b15..69bfb90ebb 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 @@ -424,7 +424,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short index 78da7e99b1..ec66324eb5 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short @@ -126,7 +126,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 400*1.0 ! [m] ! The distribution of vertical resolution for the target 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 78da9ac88e..b5f5c06836 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 @@ -424,7 +424,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short index c6ee630802..071d1a6129 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short @@ -126,7 +126,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 400*1.0 ! [m] ! The distribution of vertical resolution for the target 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 ae72cfc9a3..f77a584893 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 @@ -424,7 +424,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short index 9a13fbfa29..e97f2b05e4 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short @@ -126,7 +126,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 400*1.0 ! [m] ! The distribution of vertical resolution for the target 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 db377df13a..1af10940ec 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 @@ -424,7 +424,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short index 9ebd07e907..28f8287984 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.short @@ -126,7 +126,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 400*1.0 ! [m] ! The distribution of vertical resolution for the target 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 4740c6d6c9..15be51b901 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 @@ -424,7 +424,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short index c1195b73fe..5871482b00 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.short @@ -126,7 +126,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 400*1.0 ! [m] ! The distribution of vertical resolution for the target 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 4fda444477..9d60fc0b2f 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 @@ -424,7 +424,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short index 163c9693cc..a93dcca899 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short @@ -126,7 +126,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 400*1.0 ! [m] ! The distribution of vertical resolution for the target 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 03c35914fa..f9b73a5866 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 @@ -424,7 +424,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short index 0cab49ae59..813669cef4 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short @@ -126,7 +126,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 400*1.0 ! [m] ! The distribution of vertical resolution for the target diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 7fff2b91bf..10d812df44 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -424,7 +424,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index 228dcd1d05..6d89c8ace9 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -127,7 +127,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 600*0.5 ! [m] ! The distribution of vertical resolution for the target diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 4ceec9e579..3f332fb38b 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -431,7 +431,6 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "kg m^-3" ! default = "kg m^-3" ! Units of the regridding coordinate. diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index 2f75b04440..7b4b442134 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -154,7 +154,6 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces INTERPOLATION_SCHEME = "P3M_IH4IH3" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index c7d2c8190c..01d8f39c3a 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -431,7 +431,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index c0f8fd8877..e7bfb44e02 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -154,7 +154,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 25*0.8 ! [m] ! The distribution of vertical resolution for the target diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 38f3a127a1..95da3c833e 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -442,7 +442,6 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "kg m^-3" ! default = "kg m^-3" ! Units of the regridding coordinate. diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 8439edc092..1b11fb8a06 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -153,7 +153,6 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces INTERPOLATION_SCHEME = "PQM_IH4IH3" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 9b9406708f..891ba2c618 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -442,7 +442,6 @@ REGRIDDING_COORDINATE_MODE = "SIGMA" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "Non-dimensional" ! default = "Non-dimensional" ! Units of the regridding coordinate. diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index 1f0c78f539..649f0d984e 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -151,7 +151,6 @@ REGRIDDING_COORDINATE_MODE = "SIGMA" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 40*0.025 ! [Non-dimensional] ! The distribution of vertical resolution for the target diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 1a08bd4d60..ad662ca67c 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -442,7 +442,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index df60f4a864..d99fe73270 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -151,7 +151,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 40*100.0 ! [m] ! The distribution of vertical resolution for the target diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 8712d7cc5b..8251dbd73d 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -462,7 +462,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 13c27837f5..d2759a32da 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -167,7 +167,6 @@ REGRIDDING_COORDINATE_MODE = "HYCOM1" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces ALE_COORDINATE_CONFIG = "HYBRID:hycom1_50.nc,sigma2,dz" ! default = "UNIFORM" ! Determines how to specify the coordinate resolution. Valid options are: diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 2f6784642c..43ee1c2cfc 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -462,7 +462,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index 915755ba2d..265a3547b4 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -167,7 +167,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces ALE_COORDINATE_CONFIG = "FILE:vgrid.nc,dz" ! default = "UNIFORM" ! Determines how to specify the coordinate resolution. Valid options are: 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 ff3b98de31..94bcc82e91 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -431,7 +431,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short index bff5c44675..78f398fede 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -133,7 +133,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 40*10.0 ! [m] ! The distribution of vertical resolution for the target diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 4a7bc3cbc5..0508aaf68b 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -431,7 +431,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/resting/z/MOM_parameter_doc.short b/ocean_only/resting/z/MOM_parameter_doc.short index d110318db1..756e9a9a06 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.short +++ b/ocean_only/resting/z/MOM_parameter_doc.short @@ -145,7 +145,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 9*111.11111111111111 ! [m] ! The distribution of vertical resolution for the target diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index c12d653c0c..713d10ec3f 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -456,7 +456,6 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "kg m^-3" ! default = "kg m^-3" ! Units of the regridding coordinate. diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index 2629001454..b1a881690d 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -154,7 +154,6 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces INTERPOLATION_SCHEME = "P3M_IH4IH3" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index d84d945ea0..889a442132 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -456,7 +456,6 @@ REGRIDDING_COORDINATE_MODE = "SIGMA" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "Non-dimensional" ! default = "Non-dimensional" ! Units of the regridding coordinate. diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index a349d5cbb9..b7d4bff3db 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -154,7 +154,6 @@ REGRIDDING_COORDINATE_MODE = "SIGMA" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 20*0.05 ! [Non-dimensional] ! The distribution of vertical resolution for the target diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 4c9cf3b282..e8facf80fd 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -456,7 +456,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index ea60f9b1d5..9d8e23f8df 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -154,7 +154,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 20*200.0 ! [m] ! The distribution of vertical resolution for the target diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index b499ef2320..cdde92e08c 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -416,7 +416,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.short b/ocean_only/single_column/EPBL/MOM_parameter_doc.short index ba51fb12f1..8291104fb8 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.short +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.short @@ -116,7 +116,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces ALE_COORDINATE_CONFIG = "FILE:./INPUT/vgrid_cm4.nc,dz" ! default = "UNIFORM" ! Determines how to specify the coordinate resolution. Valid options are: diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index c3581bfa52..ea4cebe002 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -416,7 +416,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.short b/ocean_only/single_column/KPP/MOM_parameter_doc.short index 49c909f9eb..1fccd5a6e8 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.short +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.short @@ -116,7 +116,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces ALE_COORDINATE_CONFIG = "FILE:./INPUT/vgrid_cm4.nc,dz" ! default = "UNIFORM" ! Determines how to specify the coordinate resolution. Valid options are: diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 793defdea3..f63756560a 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -434,7 +434,6 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "kg m^-3" ! default = "kg m^-3" ! Units of the regridding coordinate. diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index 213db0d42d..35a56b938e 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -148,7 +148,6 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces INTERPOLATION_SCHEME = "PQM_IH4IH3" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 40ba642f9f..1330d9bdd0 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -434,7 +434,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index cae7058d0f..0c41c81f86 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -148,7 +148,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 10*100.0 ! [m] ! The distribution of vertical resolution for the target diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index fc2ef05431..4ecaf32106 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -431,7 +431,6 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "kg m^-3" ! default = "kg m^-3" ! Units of the regridding coordinate. diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short index 5cafa7f521..ef9463e628 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short @@ -155,7 +155,6 @@ REGRIDDING_COORDINATE_MODE = "RHO" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces INTERPOLATION_SCHEME = "P3M_IH4IH3" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index d1b7823d96..f552feff12 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -431,7 +431,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces REGRIDDING_COORDINATE_UNITS = "m" ! default = "m" ! Units of the regridding coordinate. diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short index 071afe160b..c8902006aa 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short @@ -155,7 +155,6 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! RHO - continuous isopycnal ! HYCOM1 - HyCOM-like hybrid coordinate ! HYBGEN - Hybrid coordinate from the Hycom hybgen code - ! SLIGHT - stretched coordinates above continuous isopycnal ! ADAPTIVE - optimize for smooth neutral density surfaces !ALE_RESOLUTION = 10*10.0 ! [m] ! The distribution of vertical resolution for the target diff --git a/src/MOM6 b/src/MOM6 index 588cf03ade..19f861314c 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 588cf03adeed355e3db9a12a73c726f3b88b4c35 +Subproject commit 19f861314c21f3b24fa2c7bb951e6fc73761a854