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 1454aa11a..c220ca325 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 @@ -1466,8 +1466,7 @@ SENSIBLE_HEAT_FLUX = -100.0 ! [W/m2] WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 140ff152b..26bd9a6bf 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 @@ -1580,8 +1580,7 @@ SENSIBLE_HEAT_FLUX = -100.0 ! [W/m2] WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 c1664b059..d4706d39f 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 @@ -1580,8 +1580,7 @@ SENSIBLE_HEAT_FLUX = -100.0 ! [W/m2] WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 637df2c58..66022360e 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 @@ -1463,8 +1463,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 54e3b3714..65907e2cb 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 @@ -1577,8 +1577,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 89e47a748..5fe4017d8 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 @@ -1577,8 +1577,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 5bedf4425..d0bea6f3c 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 @@ -1466,8 +1466,7 @@ SENSIBLE_HEAT_FLUX = 100.0 ! [W/m2] WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short index 066d1cf6a..44088da36 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.short @@ -303,8 +303,7 @@ SENSIBLE_HEAT_FLUX = 100.0 ! [W/m2] WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). CONST_WIND_TAUX = 0.1 ! [Pa] ! With wind_config const, this is the constant zonal wind-stress CONST_WIND_TAUY = 0.0 ! [Pa] 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 09daea5a3..f22e208ed 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 @@ -1580,8 +1580,7 @@ SENSIBLE_HEAT_FLUX = 100.0 ! [W/m2] WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 e3290468f..699509a42 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 @@ -336,8 +336,7 @@ SENSIBLE_HEAT_FLUX = 100.0 ! [W/m2] WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). CONST_WIND_TAUX = 0.1 ! [Pa] ! With wind_config const, this is the constant zonal wind-stress CONST_WIND_TAUY = 0.0 ! [Pa] 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 b5f2bc483..4459c0ecd 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 @@ -1580,8 +1580,7 @@ SENSIBLE_HEAT_FLUX = 100.0 ! [W/m2] WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 cadd63666..555bd2fe9 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 @@ -333,8 +333,7 @@ SENSIBLE_HEAT_FLUX = 100.0 ! [W/m2] WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). CONST_WIND_TAUX = 0.1 ! [Pa] ! With wind_config const, this is the constant zonal wind-stress CONST_WIND_TAUY = 0.0 ! [Pa] 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 3352e4940..42b6ec9dd 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 @@ -1463,8 +1463,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short index c48797632..2446c45bb 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short @@ -298,8 +298,7 @@ VARIABLE_WINDS = False ! [Boolean] default = True WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). CONST_WIND_TAUX = 0.1 ! [Pa] ! With wind_config const, this is the constant zonal wind-stress CONST_WIND_TAUY = 0.0 ! [Pa] 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 f267c09d0..5fbf062dc 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 @@ -1577,8 +1577,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 3da95283e..198b54cd3 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 @@ -331,8 +331,7 @@ VARIABLE_WINDS = False ! [Boolean] default = True WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). CONST_WIND_TAUX = 0.1 ! [Pa] ! With wind_config const, this is the constant zonal wind-stress CONST_WIND_TAUY = 0.0 ! [Pa] 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 0f471bab7..5673e4638 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 @@ -1577,8 +1577,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 1efcb4cb8..de13dfdfd 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 @@ -328,8 +328,7 @@ VARIABLE_WINDS = False ! [Boolean] default = True WIND_CONFIG = "const" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). CONST_WIND_TAUX = 0.1 ! [Pa] ! With wind_config const, this is the constant zonal wind-stress CONST_WIND_TAUY = 0.0 ! [Pa] diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 3920a4d69..7e41366ba 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -1581,8 +1581,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 396886a91..bd1edd474 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -1436,8 +1436,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 15bd3f44f..82dd17fa6 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -1580,8 +1580,7 @@ SENSIBLE_HEAT_FLUX = 0.0 ! [W/m2] WIND_CONFIG = "ideal_hurr" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index 82ca5c1c2..f4178800c 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -306,8 +306,7 @@ SENSIBLE_HEAT_FLUX = 0.0 ! [W/m2] WIND_CONFIG = "ideal_hurr" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). ! === module idealized_hurricane === IDL_HURR_X0 = 6.48E+05 ! [m] default = 0.0 diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index ade26f83b..eb6a6ae50 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -1580,8 +1580,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index b978b2d5d..5c8f2a640 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1740,8 +1740,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 16507e633..82ef05e13 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -1692,8 +1692,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index b51c8677e..b4d95fa40 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1853,8 +1853,7 @@ BUOY_CONFIG = "linear" ! default = "zero" WIND_CONFIG = "gyres" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). TAUX_CONST = 0.0 ! [Pa] default = 0.0 ! With the gyres wind_config, the constant offset in the zonal wind stress ! profile: A in taux = A + B*sin(n*pi*y/L) + C*cos(n*pi*y/L). diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index fb56d4b98..c53e2c54f 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -452,8 +452,7 @@ BUOY_CONFIG = "linear" ! default = "zero" WIND_CONFIG = "gyres" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). TAUX_SIN_AMP = 0.1 ! [Pa] default = 0.0 ! With the gyres wind_config, the sine amplitude in the zonal wind stress ! profile: B in taux = A + B*sin(n*pi*y/L) + C*cos(n*pi*y/L). diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index cac61ea18..24eee30b2 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -1658,8 +1658,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 20d8eafc4..fe82a8bb0 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -1205,8 +1205,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "2gyre" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). TAUX_MAGNITUDE = 0.1 ! [Pa] default = 0.1 ! The peak zonal wind stress when WIND_CONFIG = 2gyre. RESTOREBUOY = False ! [Boolean] default = False diff --git a/ocean_only/double_gyre/MOM_parameter_doc.short b/ocean_only/double_gyre/MOM_parameter_doc.short index 85eb38e34..ba09e0c85 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.short +++ b/ocean_only/double_gyre/MOM_parameter_doc.short @@ -261,8 +261,7 @@ VARIABLE_BUOYFORCE = False ! [Boolean] default = True WIND_CONFIG = "2gyre" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). ! === module MOM_main (MOM_driver) === DT_FORCING = 2400.0 ! [s] default = 1200.0 diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 2e49ccb3d..298e177f8 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -1566,8 +1566,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 2d760530b..148240ad3 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -1577,8 +1577,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index c6ae6182f..5ab279605 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1739,8 +1739,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 54cb05e30..fa1e5daa2 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1691,8 +1691,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 94eb15ff1..2857ce0b9 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1691,8 +1691,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 3b950fda2..e3954a151 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -2461,8 +2461,7 @@ SSS_RESTORE_VAR = "SSS" ! default = "SSS" WIND_CONFIG = "file" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). WIND_FILE = "ocean_forcing_daily.nc" ! ! The file in which the wind stresses are found in variables STRESS_X and ! STRESS_Y. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index d52f427c6..e6b444ee3 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -588,8 +588,7 @@ SALINITYRESTORE_FILE = "ocean_forcing_daily.nc" ! WIND_CONFIG = "file" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). WIND_FILE = "ocean_forcing_daily.nc" ! ! The file in which the wind stresses are found in variables STRESS_X and ! STRESS_Y. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 2b1b95c29..e3cd651f8 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -2313,8 +2313,7 @@ SSS_RESTORE_VAR = "SSS" ! default = "SSS" WIND_CONFIG = "file" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). WIND_FILE = "ocean_forcing_daily.nc" ! ! The file in which the wind stresses are found in variables STRESS_X and ! STRESS_Y. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.short b/ocean_only/global_ALE/layer/MOM_parameter_doc.short index f9c2a4e75..575b2adc8 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.short @@ -521,8 +521,7 @@ SALINITYRESTORE_FILE = "ocean_forcing_daily.nc" ! WIND_CONFIG = "file" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). WIND_FILE = "ocean_forcing_daily.nc" ! ! The file in which the wind stresses are found in variables STRESS_X and ! STRESS_Y. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 660bc3bd4..bec52070e 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -2408,8 +2408,7 @@ SSS_RESTORE_VAR = "SSS" ! default = "SSS" WIND_CONFIG = "file" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). WIND_FILE = "ocean_forcing_daily.nc" ! ! The file in which the wind stresses are found in variables STRESS_X and ! STRESS_Y. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index fc58dede0..553c80264 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -563,8 +563,7 @@ SALINITYRESTORE_FILE = "ocean_forcing_daily.nc" ! WIND_CONFIG = "file" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). WIND_FILE = "ocean_forcing_daily.nc" ! ! The file in which the wind stresses are found in variables STRESS_X and ! STRESS_Y. diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 45bb563b9..612e862d3 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -1569,8 +1569,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. 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 a29e372c0..2ad0931b2 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1729,8 +1729,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 605b162d6..c053133b6 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -2125,8 +2125,7 @@ SSS_RESTORE_VAR = "SSS" ! default = "SSS" WIND_CONFIG = "file" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). WIND_FILE = "ocean_forcing_daily.nc" ! ! The file in which the wind stresses are found in variables STRESS_X and ! STRESS_Y. diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index a59a57860..b3c7ecbed 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -584,8 +584,7 @@ SALINITYRESTORE_FILE = "ocean_forcing_daily.nc" ! WIND_CONFIG = "file" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). WIND_FILE = "ocean_forcing_daily.nc" ! ! The file in which the wind stresses are found in variables STRESS_X and ! STRESS_Y. diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index f83483349..341af4d17 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -1562,8 +1562,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 1dc7291c0..af6a95868 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1676,8 +1676,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index a45913087..f3092f7e5 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -1595,8 +1595,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 5c7a0fde4..df3aa3371 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1755,8 +1755,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 72903b782..f683400cd 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1704,8 +1704,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 0af97d2bf..937669620 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1704,8 +1704,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index f03ec0597..d610c205e 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -1577,8 +1577,7 @@ BUOY_CONFIG = "data_override" ! default = "zero" WIND_CONFIG = "data_override" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.short b/ocean_only/single_column/BML/MOM_parameter_doc.short index 704205a27..d1428467c 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.short +++ b/ocean_only/single_column/BML/MOM_parameter_doc.short @@ -319,8 +319,7 @@ BUOY_CONFIG = "data_override" ! default = "zero" WIND_CONFIG = "data_override" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). READ_GUST_2D = True ! [Boolean] default = False ! If true, use a 2-dimensional gustiness supplied from an input file GUST_2D_FILE = "forcing_monthly.nc" ! diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 1230c65ca..7f3d63500 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -1729,8 +1729,7 @@ BUOY_CONFIG = "data_override" ! default = "zero" WIND_CONFIG = "data_override" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.short b/ocean_only/single_column/EPBL/MOM_parameter_doc.short index ca65871ca..b4e14ca34 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.short +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.short @@ -339,8 +339,7 @@ BUOY_CONFIG = "data_override" ! default = "zero" WIND_CONFIG = "data_override" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). READ_GUST_2D = True ! [Boolean] default = False ! If true, use a 2-dimensional gustiness supplied from an input file GUST_2D_FILE = "forcing_monthly.nc" ! diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index a76f7b5c0..d239d6fc3 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -1651,8 +1651,7 @@ BUOY_CONFIG = "data_override" ! default = "zero" WIND_CONFIG = "data_override" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.short b/ocean_only/single_column/KPP/MOM_parameter_doc.short index 3743d3198..caa9ada41 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.short +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.short @@ -333,8 +333,7 @@ BUOY_CONFIG = "data_override" ! default = "zero" WIND_CONFIG = "data_override" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). READ_GUST_2D = True ! [Boolean] default = False ! If true, use a 2-dimensional gustiness supplied from an input file GUST_2D_FILE = "forcing_monthly.nc" ! diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 1a8cd371d..5237511b7 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -1578,8 +1578,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index dd7c134e0..0454ea1d0 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1740,8 +1740,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 7e9c7b968..bfaa51f8b 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1692,8 +1692,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index e8ee88e8f..7c8517736 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -1543,8 +1543,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 76e758a9e..b164ebed3 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1761,8 +1761,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index de26b3694..a83b8034c 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1713,8 +1713,7 @@ BUOY_CONFIG = "NONE" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 4eea1596f..79b81b7d7 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -1014,8 +1014,7 @@ BUOY_CONFIG = "zero" ! default = "zero" WIND_CONFIG = "zero" ! default = "zero" ! The character string that indicates how wind forcing is specified. Valid ! options include (file), (data_override), (2gyre), (1gyre), (gyres), (zero), - ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_ideal_hurr), - ! (SCM_CVmix_tests) and (USER). + ! (const), (Neverworld), (scurves), (ideal_hurr), (SCM_CVmix_tests) and (USER). RESTOREBUOY = False ! [Boolean] default = False ! If true, the buoyancy fluxes drive the model back toward some specified ! surface state with a rate given by FLUXCONST. diff --git a/src/MOM6 b/src/MOM6 index 61e3bcfbb..3c3981894 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 61e3bcfbb04cec2e61a6e24c8d06dffd0ed56059 +Subproject commit 3c3981894fe518d96bfb55087a06d2bc3f242b60