From bd55f1e3efe4768519b071e4e6941e28a12f3bc9 Mon Sep 17 00:00:00 2001 From: MOM6 bot Date: Thu, 30 Mar 2023 19:48:50 -0400 Subject: [PATCH] MOM6: Add PPM_CM and HYCOM1_ONLY_IMPROVES - NOAA-GFDL/MOM6@588cf03ad Add PPM_CM and HYCOM1_ONLY_IMPROVES - NOAA-GFDL/MOM6@37389b5ab Fix indexing bugs in get_field_nc (#334) - NOAA-GFDL/MOM6@ceb4c9286 Only root_PE makes write_energy netcdf file calls - NOAA-GFDL/MOM6@348d7b741 (*)Fix a bug with BULKMIXEDLAYER & ML_MIX_FIRST>0 - NOAA-GFDL/MOM6@6c69e610c update how UFS names restarts --- .../MOM_parameter_doc.all | 7 ++++--- .../MOM_parameter_doc.short | 4 ++-- .../Baltic_OM4_025/MOM_parameter_doc.all | 14 ++++++++++---- .../Baltic_OM4_025/MOM_parameter_doc.short | 4 ++-- ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all | 14 ++++++++++---- .../Baltic_OM4_05/MOM_parameter_doc.short | 4 ++-- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 14 ++++++++++---- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short | 4 ++-- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 14 ++++++++++---- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 4 ++-- ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all | 14 ++++++++++---- ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short | 4 ++-- .../cooling_only/EPBL/MOM_parameter_doc.all | 7 ++++--- .../cooling_only/KPP/MOM_parameter_doc.all | 7 ++++--- .../mech_only/EPBL/MOM_parameter_doc.all | 7 ++++--- .../mech_only/KPP/MOM_parameter_doc.all | 7 ++++--- .../skin_warming_wind/EPBL/MOM_parameter_doc.all | 7 ++++--- .../skin_warming_wind/KPP/MOM_parameter_doc.all | 7 ++++--- .../wind_only/EPBL/MOM_parameter_doc.all | 7 ++++--- .../wind_only/KPP/MOM_parameter_doc.all | 7 ++++--- ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 11 +++++++---- .../adjustment2d/rho/MOM_parameter_doc.short | 8 +++++--- ocean_only/adjustment2d/z/MOM_parameter_doc.all | 7 ++++--- ocean_only/adjustment2d/z/MOM_parameter_doc.short | 4 ++-- .../flow_downslope/rho/MOM_parameter_doc.all | 11 +++++++---- .../flow_downslope/rho/MOM_parameter_doc.short | 8 +++++--- .../flow_downslope/sigma/MOM_parameter_doc.all | 7 ++++--- .../flow_downslope/sigma/MOM_parameter_doc.short | 4 ++-- ocean_only/flow_downslope/z/MOM_parameter_doc.all | 7 ++++--- .../flow_downslope/z/MOM_parameter_doc.short | 4 ++-- ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 14 ++++++++++---- .../global_ALE/hycom/MOM_parameter_doc.short | 4 ++-- src/MOM6 | 2 +- 33 files changed, 153 insertions(+), 95 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 3bcbd099c0..ee1a3f8ca3 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 @@ -506,8 +506,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -519,7 +519,8 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PPM_H4" ! default = "PPM_H4" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 b5f22e6d62..4ff8fd82db 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 @@ -198,8 +198,8 @@ ALE_COORDINATE_CONFIG = "FILE:vgrid.nc,dz" ! default = "UNIFORM" ! is of non-dimensional fractions of the water column. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 e512c108d3..c1716edbff 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -478,10 +478,12 @@ INTERPOLATION_SCHEME = "P1M_H2" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a ! function of state. Otherwise, it is not used. It can be one of the following - ! schemes: P1M_H2 (2nd-order accurate) + ! schemes: + ! P1M_H2 (2nd-order accurate) ! P1M_H4 (2nd-order accurate) ! P1M_IH4 (2nd-order accurate) ! PLM (2nd-order accurate) + ! PPM_CW (3rd-order accurate) ! PPM_H4 (3rd-order accurate) ! PPM_IH4 (3rd-order accurate) ! P3M_IH4IH3 (4th-order accurate) @@ -530,6 +532,9 @@ REGRID_COMPRESSIBILITY_FRACTION = 0.01 ! [nondim] default = 0.0 ! compressibility solely to make homogeneous regions appear stratified. MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. +HYCOM1_ONLY_IMPROVES = False ! [Boolean] default = False + ! When regridding, an interface is only moved if this improves the fit to the + ! target density. MAXIMUM_INT_DEPTH_CONFIG = "FNC1:5,8000.0,1.0,.01" ! default = "NONE" ! Determines how to specify the maximum interface depths. ! Valid options are: @@ -554,8 +559,8 @@ MAX_LAYER_THICKNESS_CONFIG = "FNC1:400,31000.0,0.1,.01" ! default = "NONE" ! The list of maximum thickness for each layer. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -567,7 +572,8 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PPM_H4" ! default = "PPM_H4" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 0e9b279209..1206d645a2 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short @@ -251,8 +251,8 @@ MAX_LAYER_THICKNESS_CONFIG = "FNC1:400,31000.0,0.1,.01" ! default = "NONE" ! The list of maximum thickness for each layer. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 ccb646b254..bc23fb0bdc 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -478,10 +478,12 @@ INTERPOLATION_SCHEME = "P1M_H2" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a ! function of state. Otherwise, it is not used. It can be one of the following - ! schemes: P1M_H2 (2nd-order accurate) + ! schemes: + ! P1M_H2 (2nd-order accurate) ! P1M_H4 (2nd-order accurate) ! P1M_IH4 (2nd-order accurate) ! PLM (2nd-order accurate) + ! PPM_CW (3rd-order accurate) ! PPM_H4 (3rd-order accurate) ! PPM_IH4 (3rd-order accurate) ! P3M_IH4IH3 (4th-order accurate) @@ -530,6 +532,9 @@ REGRID_COMPRESSIBILITY_FRACTION = 0.01 ! [nondim] default = 0.0 ! compressibility solely to make homogeneous regions appear stratified. MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. +HYCOM1_ONLY_IMPROVES = False ! [Boolean] default = False + ! When regridding, an interface is only moved if this improves the fit to the + ! target density. MAXIMUM_INT_DEPTH_CONFIG = "FNC1:5,8000.0,1.0,.01" ! default = "NONE" ! Determines how to specify the maximum interface depths. ! Valid options are: @@ -554,8 +559,8 @@ MAX_LAYER_THICKNESS_CONFIG = "FNC1:400,31000.0,0.1,.01" ! default = "NONE" ! The list of maximum thickness for each layer. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -567,7 +572,8 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PPM_H4" ! default = "PPM_H4" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 be0bca2e9a..78ef46f183 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short @@ -247,8 +247,8 @@ MAX_LAYER_THICKNESS_CONFIG = "FNC1:400,31000.0,0.1,.01" ! default = "NONE" ! The list of maximum thickness for each layer. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 5b2b106afd..a44fe77a64 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -478,10 +478,12 @@ INTERPOLATION_SCHEME = "P1M_H2" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a ! function of state. Otherwise, it is not used. It can be one of the following - ! schemes: P1M_H2 (2nd-order accurate) + ! schemes: + ! P1M_H2 (2nd-order accurate) ! P1M_H4 (2nd-order accurate) ! P1M_IH4 (2nd-order accurate) ! PLM (2nd-order accurate) + ! PPM_CW (3rd-order accurate) ! PPM_H4 (3rd-order accurate) ! PPM_IH4 (3rd-order accurate) ! P3M_IH4IH3 (4th-order accurate) @@ -530,6 +532,9 @@ REGRID_COMPRESSIBILITY_FRACTION = 0.01 ! [nondim] default = 0.0 ! compressibility solely to make homogeneous regions appear stratified. MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. +HYCOM1_ONLY_IMPROVES = False ! [Boolean] default = False + ! When regridding, an interface is only moved if this improves the fit to the + ! target density. MAXIMUM_INT_DEPTH_CONFIG = "FNC1:5,8000.0,1.0,.01" ! default = "NONE" ! Determines how to specify the maximum interface depths. ! Valid options are: @@ -554,8 +559,8 @@ MAX_LAYER_THICKNESS_CONFIG = "FNC1:400,31000.0,0.1,.01" ! default = "NONE" ! The list of maximum thickness for each layer. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -567,7 +572,8 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PPM_H4" ! default = "PPM_H4" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index 60ea2a72aa..a2c28ebcc6 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -254,8 +254,8 @@ MAX_LAYER_THICKNESS_CONFIG = "FNC1:400,31000.0,0.1,.01" ! default = "NONE" ! The list of maximum thickness for each layer. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 0b4475dc57..189c6d15a5 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -478,10 +478,12 @@ INTERPOLATION_SCHEME = "P1M_H2" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a ! function of state. Otherwise, it is not used. It can be one of the following - ! schemes: P1M_H2 (2nd-order accurate) + ! schemes: + ! P1M_H2 (2nd-order accurate) ! P1M_H4 (2nd-order accurate) ! P1M_IH4 (2nd-order accurate) ! PLM (2nd-order accurate) + ! PPM_CW (3rd-order accurate) ! PPM_H4 (3rd-order accurate) ! PPM_IH4 (3rd-order accurate) ! P3M_IH4IH3 (4th-order accurate) @@ -530,6 +532,9 @@ REGRID_COMPRESSIBILITY_FRACTION = 0.01 ! [nondim] default = 0.0 ! compressibility solely to make homogeneous regions appear stratified. MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. +HYCOM1_ONLY_IMPROVES = False ! [Boolean] default = False + ! When regridding, an interface is only moved if this improves the fit to the + ! target density. MAXIMUM_INT_DEPTH_CONFIG = "FNC1:5,8000.0,1.0,.01" ! default = "NONE" ! Determines how to specify the maximum interface depths. ! Valid options are: @@ -554,8 +559,8 @@ MAX_LAYER_THICKNESS_CONFIG = "FNC1:400,31000.0,0.1,.01" ! default = "NONE" ! The list of maximum thickness for each layer. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -567,7 +572,8 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PPM_H4" ! default = "PPM_H4" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index 4530c1e781..0105e25cc7 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -248,8 +248,8 @@ MAX_LAYER_THICKNESS_CONFIG = "FNC1:400,31000.0,0.1,.01" ! default = "NONE" ! The list of maximum thickness for each layer. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index c84363a5fa..ca98d73be2 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -469,10 +469,12 @@ INTERPOLATION_SCHEME = "P1M_H2" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a ! function of state. Otherwise, it is not used. It can be one of the following - ! schemes: P1M_H2 (2nd-order accurate) + ! schemes: + ! P1M_H2 (2nd-order accurate) ! P1M_H4 (2nd-order accurate) ! P1M_IH4 (2nd-order accurate) ! PLM (2nd-order accurate) + ! PPM_CW (3rd-order accurate) ! PPM_H4 (3rd-order accurate) ! PPM_IH4 (3rd-order accurate) ! P3M_IH4IH3 (4th-order accurate) @@ -521,6 +523,9 @@ REGRID_COMPRESSIBILITY_FRACTION = 0.0 ! [nondim] default = 0.0 ! compressibility solely to make homogeneous regions appear stratified. MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. +HYCOM1_ONLY_IMPROVES = False ! [Boolean] default = False + ! When regridding, an interface is only moved if this improves the fit to the + ! target density. MAXIMUM_INT_DEPTH_CONFIG = "FNC1:5,8000.0,1.0,.01" ! default = "NONE" ! Determines how to specify the maximum interface depths. ! Valid options are: @@ -545,8 +550,8 @@ MAX_LAYER_THICKNESS_CONFIG = "FNC1:400,31000.0,0.1,.01" ! default = "NONE" ! The list of maximum thickness for each layer. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -558,7 +563,8 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PPM_H4" ! default = "PPM_H4" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short index 7ac5dcddac..1989a640d9 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short @@ -259,8 +259,8 @@ MAX_LAYER_THICKNESS_CONFIG = "FNC1:400,31000.0,0.1,.01" ! default = "NONE" ! The list of maximum thickness for each layer. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 c4229ebc2d..95d76c21de 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 @@ -452,8 +452,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -465,7 +465,8 @@ REMAPPING_SCHEME = "PLM" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 874df9c9c5..117b677b15 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 @@ -452,8 +452,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -465,7 +465,8 @@ REMAPPING_SCHEME = "PLM" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 26907455c0..78da9ac88e 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 @@ -452,8 +452,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -465,7 +465,8 @@ REMAPPING_SCHEME = "PLM" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 cf9afde195..ae72cfc9a3 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 @@ -452,8 +452,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -465,7 +465,8 @@ REMAPPING_SCHEME = "PLM" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 63ee981c0a..db377df13a 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 @@ -452,8 +452,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -465,7 +465,8 @@ REMAPPING_SCHEME = "PLM" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 f9758364bb..4740c6d6c9 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 @@ -452,8 +452,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -465,7 +465,8 @@ REMAPPING_SCHEME = "PLM" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 7e55ab0a32..4fda444477 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 @@ -452,8 +452,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -465,7 +465,8 @@ REMAPPING_SCHEME = "PLM" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) 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 1eb5158fb9..03c35914fa 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 @@ -452,8 +452,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -465,7 +465,8 @@ REMAPPING_SCHEME = "PLM" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PLM" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 9ca3c56794..4ceec9e579 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -439,10 +439,12 @@ INTERPOLATION_SCHEME = "P3M_IH4IH3" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a ! function of state. Otherwise, it is not used. It can be one of the following - ! schemes: P1M_H2 (2nd-order accurate) + ! schemes: + ! P1M_H2 (2nd-order accurate) ! P1M_H4 (2nd-order accurate) ! P1M_IH4 (2nd-order accurate) ! PLM (2nd-order accurate) + ! PPM_CW (3rd-order accurate) ! PPM_H4 (3rd-order accurate) ! PPM_IH4 (3rd-order accurate) ! P3M_IH4IH3 (4th-order accurate) @@ -511,8 +513,8 @@ MAX_LAYER_THICKNESS_CONFIG = "NONE" ! default = "NONE" ! FNC1:string - FNC1:dz_min,H_total,power,precision REMAPPING_SCHEME = "PPM_IH4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -524,7 +526,8 @@ REMAPPING_SCHEME = "PPM_IH4" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PPM_IH4" ! default = "PPM_IH4" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index 0a43d7eae6..2f75b04440 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -160,10 +160,12 @@ INTERPOLATION_SCHEME = "P3M_IH4IH3" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a ! function of state. Otherwise, it is not used. It can be one of the following - ! schemes: P1M_H2 (2nd-order accurate) + ! schemes: + ! P1M_H2 (2nd-order accurate) ! P1M_H4 (2nd-order accurate) ! P1M_IH4 (2nd-order accurate) ! PLM (2nd-order accurate) + ! PPM_CW (3rd-order accurate) ! PPM_H4 (3rd-order accurate) ! PPM_IH4 (3rd-order accurate) ! P3M_IH4IH3 (4th-order accurate) @@ -186,8 +188,8 @@ MIN_THICKNESS = 1.0E-04 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PPM_IH4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index b748be37bf..c7d2c8190c 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -459,8 +459,8 @@ MIN_THICKNESS = 1.0E-04 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PPM_IH4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -472,7 +472,8 @@ REMAPPING_SCHEME = "PPM_IH4" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PPM_IH4" ! default = "PPM_IH4" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index c96eb7115a..c0f8fd8877 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -166,8 +166,8 @@ MIN_THICKNESS = 1.0E-04 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PPM_IH4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 1e8a572f17..38f3a127a1 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -450,10 +450,12 @@ INTERPOLATION_SCHEME = "PQM_IH4IH3" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a ! function of state. Otherwise, it is not used. It can be one of the following - ! schemes: P1M_H2 (2nd-order accurate) + ! schemes: + ! P1M_H2 (2nd-order accurate) ! P1M_H4 (2nd-order accurate) ! P1M_IH4 (2nd-order accurate) ! PLM (2nd-order accurate) + ! PPM_CW (3rd-order accurate) ! PPM_H4 (3rd-order accurate) ! PPM_IH4 (3rd-order accurate) ! P3M_IH4IH3 (4th-order accurate) @@ -522,8 +524,8 @@ MAX_LAYER_THICKNESS_CONFIG = "NONE" ! default = "NONE" ! FNC1:string - FNC1:dz_min,H_total,power,precision REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -535,7 +537,8 @@ REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PQM_IH4IH3" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 0f61852e0d..8439edc092 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -159,10 +159,12 @@ INTERPOLATION_SCHEME = "PQM_IH4IH3" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a ! function of state. Otherwise, it is not used. It can be one of the following - ! schemes: P1M_H2 (2nd-order accurate) + ! schemes: + ! P1M_H2 (2nd-order accurate) ! P1M_H4 (2nd-order accurate) ! P1M_IH4 (2nd-order accurate) ! PLM (2nd-order accurate) + ! PPM_CW (3rd-order accurate) ! PPM_H4 (3rd-order accurate) ! PPM_IH4 (3rd-order accurate) ! P3M_IH4IH3 (4th-order accurate) @@ -183,8 +185,8 @@ BOUNDARY_EXTRAPOLATION = True ! [Boolean] default = False ! RHO target densities for interfaces REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 6e35a24b69..9b9406708f 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -470,8 +470,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -483,7 +483,8 @@ REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PQM_IH4IH3" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index e93de08509..1f0c78f539 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -161,8 +161,8 @@ REGRIDDING_COORDINATE_MODE = "SIGMA" ! default = "LAYER" ! is of non-dimensional fractions of the water column. REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 6453949904..1a08bd4d60 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -470,8 +470,8 @@ MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -483,7 +483,8 @@ REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PQM_IH4IH3" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index db5adbff73..df60f4a864 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -161,8 +161,8 @@ REGRIDDING_COORDINATE_MODE = "Z*" ! default = "LAYER" ! is of non-dimensional fractions of the water column. REMAPPING_SCHEME = "PQM_IH4IH3" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 47436c9063..8712d7cc5b 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -470,10 +470,12 @@ INTERPOLATION_SCHEME = "P1M_H2" ! default = "P1M_H2" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a ! function of state. Otherwise, it is not used. It can be one of the following - ! schemes: P1M_H2 (2nd-order accurate) + ! schemes: + ! P1M_H2 (2nd-order accurate) ! P1M_H4 (2nd-order accurate) ! P1M_IH4 (2nd-order accurate) ! PLM (2nd-order accurate) + ! PPM_CW (3rd-order accurate) ! PPM_H4 (3rd-order accurate) ! PPM_IH4 (3rd-order accurate) ! P3M_IH4IH3 (4th-order accurate) @@ -522,6 +524,9 @@ REGRID_COMPRESSIBILITY_FRACTION = 0.0 ! [nondim] default = 0.0 ! compressibility solely to make homogeneous regions appear stratified. MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. +HYCOM1_ONLY_IMPROVES = False ! [Boolean] default = False + ! When regridding, an interface is only moved if this improves the fit to the + ! target density. MAXIMUM_INT_DEPTH_CONFIG = "FNC1:5,12000,1.0,.125" ! default = "NONE" ! Determines how to specify the maximum interface depths. ! Valid options are: @@ -544,8 +549,8 @@ MAX_LAYER_THICKNESS_CONFIG = "NONE" ! default = "NONE" ! FNC1:string - FNC1:dz_min,H_total,power,precision REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) @@ -557,7 +562,8 @@ REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" VELOCITY_REMAPPING_SCHEME = "PPM_H4" ! default = "PPM_H4" ! This sets the reconstruction scheme used for vertical remapping of velocities. ! By default it is the same as REMAPPING_SCHEME. It can be one of the following - ! schemes: PCM (1st-order accurate) + ! schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 21a2a6b020..13c27837f5 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -204,8 +204,8 @@ MAXIMUM_INT_DEPTH_CONFIG = "FNC1:5,12000,1.0,.125" ! default = "NONE" ! The list of maximum depths for each interface. REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all - ! variables. It can be one of the following schemes: PCM (1st-order - ! accurate) + ! variables. It can be one of the following schemes: + ! PCM (1st-order accurate) ! PLM (2nd-order accurate) ! PLM_HYBGEN (2nd-order accurate) ! PPM_H4 (3rd-order accurate) diff --git a/src/MOM6 b/src/MOM6 index 00854d054b..588cf03ade 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 00854d054b229c0740c4c7606cc46a63cb5c012a +Subproject commit 588cf03adeed355e3db9a12a73c726f3b88b4c35