From 58e71976762d4685097c083ff6badb493dcfedca Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Tue, 15 Aug 2017 18:42:59 -0400 Subject: [PATCH 01/89] +Update the coupler_type_reform_rwh branch of FMS Changed the branch of FMS to the updated version of coupler_type_reform_rwh, which has some additional minor changes to the coupler type compared with the previous version on this branch. All answers are bitwise identical, but there are changes that will be required for a version of SIS2 that will soon be checked onto dev/gfdl. --- src/FMS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FMS b/src/FMS index 9fbeefd7a7..3d8f68c078 160000 --- a/src/FMS +++ b/src/FMS @@ -1 +1 @@ -Subproject commit 9fbeefd7a70f9befd38acf1db24a8a1111d26797 +Subproject commit 3d8f68c0788e69e4ed91123db6ebc20109d6fa9e From 9e605beb79e6482f583ca41d9d722f0d2b19f5bd Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 24 Aug 2017 15:38:09 -0400 Subject: [PATCH 02/89] Added month/annual min/max of mlotst to diag_table - mlotst (MLD_003) monthly/annual min/max have been added to diag_table for OM4_025 and OM4_05. - Closes #145 --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index eefafc3c3c..0ba24ec9fd 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -130,6 +130,10 @@ "ocean_model", "mlotst", "mlotst", "ocean_month", "all", "mean", "none",2 "ocean_model", "mlotstsq", "mlotstsq", "ocean_annual", "all", "mean", "none",2 "ocean_model", "mlotstsq", "mlotstsq", "ocean_month", "all", "mean", "none",2 + "ocean_model", "mlotst", "mlotstmin", "ocean_annual", "all", "min", "none",2 + "ocean_model", "mlotst", "mlotstmin", "ocean_month", "all", "min", "none",2 + "ocean_model", "mlotst", "mlotstmax", "ocean_annual", "all", "max", "none",2 + "ocean_model", "mlotst", "mlotstmax", "ocean_month", "all", "max", "none",2 #"ocean_model", "msftbarot", "msftbarot", "ocean_month", "all", "mean", "none",2 # to be done offline From 3ec0ff1c5b77919bd13d976ca0c9836b64e4edfc Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Mon, 28 Aug 2017 10:47:11 -0400 Subject: [PATCH 03/89] MOM6: *Removed dependence of OBC solutions on external h Made a series of 4 separate corrections to calculations at open boundary points to avoid any dependencies on the values of thicknesses outside of the domain: - Corrected the calculation of the baroclinic pressure anomaly-driven accelerations due to deflections of the free surface in open boundary conditions at the end of the barotropic stepping. - Corrected the setup of the BT_cont_type at open boundary condition points. - Corrected the calculation of face-areas at open boundary condition points for finding vertically averaged accelerations. - Corrected the calculation of the averaged normal velocities in the bottom boundary layer at open boundary condition points. Each of these code changes do change answers in test cases with some types of open boundary conditions, and the reference solutions for circle_OBCs have been updated for the combination of these 4 updates. MOM6 commit NOAA-GFDL/MOM6@993ad0f9ed7774d17225401db1e8b934315e8573 --- src/MOM6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MOM6 b/src/MOM6 index 2c0667fe2c..993ad0f9ed 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 2c0667fe2c200f0bbaebd4196db2f592e4527b91 +Subproject commit 993ad0f9ed7774d17225401db1e8b934315e8573 From 5cb23e3cccfe88a2fb340e25eb988baed14097a5 Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Wed, 30 Aug 2017 11:57:20 -0400 Subject: [PATCH 04/89] MOM6: Reordered MOM6 initialization calls Relocated the calls to MOM_initalize_fixed and call_OBC_register earlier in initialize_MOM, so that the tracer registration calls can (in a future commit) include setup related to OBC tracer fluxes. All answers are bitwise identical, but the order of entries in every MOM_parameter_doc file changes, and new versions of these files have been added. MOM6 commit Hallberg-NOAA/MOM6@4f654e8182dc3dbc172b63a54b0b53ead27d0eab --- .../CM2G63L/MOM_parameter_doc.all | 178 ++++++++-------- .../CM2G63L/MOM_parameter_doc.short | 34 +-- .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 178 ++++++++-------- .../MOM_parameter_doc.short | 28 +-- .../Concurrent_ice_1deg/MOM_parameter_doc.all | 178 ++++++++-------- .../MOM_parameter_doc.short | 28 +-- ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 178 ++++++++-------- ice_ocean_SIS2/Baltic/MOM_parameter_doc.short | 28 +-- .../MOM_parameter_doc.all | 178 ++++++++-------- .../MOM_parameter_doc.short | 44 ++-- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 180 ++++++++-------- .../OM4_025/MOM_parameter_doc.short | 34 +-- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 180 ++++++++-------- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 34 +-- ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 178 ++++++++-------- ice_ocean_SIS2/SIS2/MOM_parameter_doc.short | 28 +-- .../SIS2_bergs_cgrid/MOM_parameter_doc.all | 178 ++++++++-------- .../SIS2_bergs_cgrid/MOM_parameter_doc.short | 28 +-- .../SIS2_cgrid/MOM_parameter_doc.all | 178 ++++++++-------- .../SIS2_cgrid/MOM_parameter_doc.short | 28 +-- .../OM_360x320_C180/MOM_parameter_doc.all | 156 +++++++------- .../OM_360x320_C180/MOM_parameter_doc.short | 34 +-- .../cooling_only/BML/MOM_parameter_doc.all | 148 ++++++------- .../cooling_only/BML/MOM_parameter_doc.short | 38 ++-- .../cooling_only/EPBL/MOM_parameter_doc.all | 148 ++++++------- .../cooling_only/EPBL/MOM_parameter_doc.short | 38 ++-- .../cooling_only/KPP/MOM_parameter_doc.all | 148 ++++++------- .../cooling_only/KPP/MOM_parameter_doc.short | 38 ++-- .../mech_only/BML/MOM_parameter_doc.all | 148 ++++++------- .../mech_only/BML/MOM_parameter_doc.short | 38 ++-- .../mech_only/EPBL/MOM_parameter_doc.all | 148 ++++++------- .../mech_only/EPBL/MOM_parameter_doc.short | 38 ++-- .../mech_only/KPP/MOM_parameter_doc.all | 148 ++++++------- .../mech_only/KPP/MOM_parameter_doc.short | 38 ++-- .../BML/MOM_parameter_doc.all | 148 ++++++------- .../BML/MOM_parameter_doc.short | 38 ++-- .../EPBL/MOM_parameter_doc.all | 148 ++++++------- .../EPBL/MOM_parameter_doc.short | 38 ++-- .../KPP/MOM_parameter_doc.all | 148 ++++++------- .../KPP/MOM_parameter_doc.short | 38 ++-- .../wind_only/BML/MOM_parameter_doc.all | 148 ++++++------- .../wind_only/BML/MOM_parameter_doc.short | 38 ++-- .../wind_only/EPBL/MOM_parameter_doc.all | 148 ++++++------- .../wind_only/EPBL/MOM_parameter_doc.short | 38 ++-- .../wind_only/KPP/MOM_parameter_doc.all | 148 ++++++------- .../wind_only/KPP/MOM_parameter_doc.short | 38 ++-- ocean_only/DOME/MOM_parameter_doc.all | 94 ++++----- ocean_only/DOME/MOM_parameter_doc.short | 24 +-- .../Phillips_2layer/MOM_parameter_doc.all | 74 +++---- .../Phillips_2layer/MOM_parameter_doc.short | 12 +- .../MOM_parameter_doc.all | 148 ++++++------- .../MOM_parameter_doc.short | 30 +-- .../adjustment2d/layer/MOM_parameter_doc.all | 148 ++++++------- .../layer/MOM_parameter_doc.short | 38 ++-- .../adjustment2d/rho/MOM_parameter_doc.all | 148 ++++++------- .../adjustment2d/rho/MOM_parameter_doc.short | 38 ++-- .../adjustment2d/z/MOM_parameter_doc.all | 148 ++++++------- .../adjustment2d/z/MOM_parameter_doc.short | 38 ++-- ocean_only/benchmark/MOM_parameter_doc.all | 180 ++++++++-------- ocean_only/benchmark/MOM_parameter_doc.short | 20 +- ocean_only/circle_obcs/MOM_parameter_doc.all | 126 +++++------ .../circle_obcs/MOM_parameter_doc.short | 16 +- ocean_only/double_gyre/MOM_parameter_doc.all | 74 +++---- .../double_gyre/MOM_parameter_doc.short | 8 +- .../external_gwave/MOM_parameter_doc.all | 148 ++++++------- .../external_gwave/MOM_parameter_doc.short | 22 +- .../layer/MOM_parameter_doc.all | 148 ++++++------- .../layer/MOM_parameter_doc.short | 38 ++-- .../flow_downslope/rho/MOM_parameter_doc.all | 148 ++++++------- .../rho/MOM_parameter_doc.short | 38 ++-- .../sigma/MOM_parameter_doc.all | 148 ++++++------- .../sigma/MOM_parameter_doc.short | 38 ++-- .../flow_downslope/z/MOM_parameter_doc.all | 148 ++++++------- .../flow_downslope/z/MOM_parameter_doc.short | 38 ++-- .../global_ALE/hycom/MOM_parameter_doc.all | 178 ++++++++-------- .../global_ALE/hycom/MOM_parameter_doc.short | 20 +- .../global_ALE/layer/MOM_parameter_doc.all | 178 ++++++++-------- .../global_ALE/layer/MOM_parameter_doc.short | 20 +- ocean_only/global_ALE/z/MOM_parameter_doc.all | 178 ++++++++-------- .../global_ALE/z/MOM_parameter_doc.short | 20 +- .../lock_exchange/MOM_parameter_doc.all | 148 ++++++------- .../lock_exchange/MOM_parameter_doc.short | 22 +- .../MOM_parameter_doc.all | 148 ++++++------- .../MOM_parameter_doc.short | 22 +- .../nonBous_global/MOM_parameter_doc.all | 178 ++++++++-------- .../nonBous_global/MOM_parameter_doc.short | 20 +- .../resting/layer/MOM_parameter_doc.all | 148 ++++++------- .../resting/layer/MOM_parameter_doc.short | 38 ++-- ocean_only/resting/z/MOM_parameter_doc.all | 148 ++++++------- ocean_only/resting/z/MOM_parameter_doc.short | 38 ++-- .../seamount/layer/MOM_parameter_doc.all | 148 ++++++------- .../seamount/layer/MOM_parameter_doc.short | 38 ++-- ocean_only/seamount/rho/MOM_parameter_doc.all | 148 ++++++------- .../seamount/rho/MOM_parameter_doc.short | 38 ++-- .../seamount/sigma/MOM_parameter_doc.all | 148 ++++++------- .../seamount/sigma/MOM_parameter_doc.short | 38 ++-- ocean_only/seamount/z/MOM_parameter_doc.all | 148 ++++++------- ocean_only/seamount/z/MOM_parameter_doc.short | 38 ++-- .../single_column/BML/MOM_parameter_doc.all | 126 +++++------ .../single_column/BML/MOM_parameter_doc.short | 12 +- .../single_column/EPBL/MOM_parameter_doc.all | 126 +++++------ .../EPBL/MOM_parameter_doc.short | 12 +- .../single_column/KPP/MOM_parameter_doc.all | 126 +++++------ .../single_column/KPP/MOM_parameter_doc.short | 12 +- .../sloshing/layer/MOM_parameter_doc.all | 148 ++++++------- .../sloshing/layer/MOM_parameter_doc.short | 38 ++-- ocean_only/sloshing/rho/MOM_parameter_doc.all | 148 ++++++------- .../sloshing/rho/MOM_parameter_doc.short | 38 ++-- ocean_only/sloshing/z/MOM_parameter_doc.all | 148 ++++++------- ocean_only/sloshing/z/MOM_parameter_doc.short | 38 ++-- .../MOM_parameter_doc.all | 198 +++++++++--------- .../MOM_parameter_doc.short | 46 ++-- src/MOM6 | 2 +- 113 files changed, 5132 insertions(+), 5132 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index af966467ab..75af16f12c 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -195,6 +195,95 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = True ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -222,9 +311,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -336,92 +422,6 @@ CFC12_E2 = 0.091015 ! [PSU-1 hK-1] default = 0.091015 CFC12_E3 = -0.0153924 ! [PSU-1 hK-2] default = -0.0153924 ! A coefficient in the solubility of CFC12. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short index 54d066491e..37c752e33d 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short @@ -70,23 +70,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_OCMIP2_CFC = True ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. - -! === module ideal_age_example === - -! === module MOM_OCMIP2_CFC === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -149,6 +132,23 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! test case. ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +PARALLEL_RESTARTFILES = True ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_OCMIP2_CFC = True ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. + +! === module ideal_age_example === + +! === module MOM_OCMIP2_CFC === ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 52f073c49d..17251086c0 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -195,6 +195,95 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -222,9 +311,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -336,92 +422,6 @@ CFC12_E2 = 0.091015 ! [PSU-1 hK-1] default = 0.091015 CFC12_E3 = -0.0153924 ! [PSU-1 hK-2] default = -0.0153924 ! A coefficient in the solubility of CFC12. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short index abd14dc152..1c22e94996 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short @@ -76,20 +76,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_OCMIP2_CFC = True ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. - -! === module ideal_age_example === - -! === module MOM_OCMIP2_CFC === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -153,6 +139,20 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_OCMIP2_CFC = True ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. + +! === module ideal_age_example === + +! === module MOM_OCMIP2_CFC === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 52f073c49d..17251086c0 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -195,6 +195,95 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -222,9 +311,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -336,92 +422,6 @@ CFC12_E2 = 0.091015 ! [PSU-1 hK-1] default = 0.091015 CFC12_E3 = -0.0153924 ! [PSU-1 hK-2] default = -0.0153924 ! A coefficient in the solubility of CFC12. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short index abd14dc152..1c22e94996 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short @@ -76,20 +76,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_OCMIP2_CFC = True ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. - -! === module ideal_age_example === - -! === module MOM_OCMIP2_CFC === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -153,6 +139,20 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_OCMIP2_CFC = True ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. + +! === module ideal_age_example === + +! === module MOM_OCMIP2_CFC === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 194316cdb5..b8729202ef 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -195,6 +195,95 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -222,9 +311,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -336,92 +422,6 @@ CFC12_E2 = 0.091015 ! [PSU-1 hK-1] default = 0.091015 CFC12_E3 = -0.0153924 ! [PSU-1 hK-2] default = -0.0153924 ! A coefficient in the solubility of CFC12. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short index 83d9ba76f2..3fc68ef25c 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short @@ -73,20 +73,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_OCMIP2_CFC = True ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. - -! === module ideal_age_example === - -! === module MOM_OCMIP2_CFC === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -150,6 +136,20 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_OCMIP2_CFC = True ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. + +! === module ideal_age_example === + +! === module MOM_OCMIP2_CFC === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: 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 42f96d494b..2334fd7195 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 @@ -212,6 +212,95 @@ NK = 50 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -239,9 +328,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -322,92 +408,6 @@ SPONGE = False ! [Boolean] default = False MASK_TRACERS_IN_MASSLESS_LAYERS = False ! [Boolean] default = False ! If true, tracers will be masked out in massless layers. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: 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 a59764dde6..4adf061446 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 @@ -78,28 +78,6 @@ NK = 50 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_ADVECTION_TEST_TRACER = True ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. - -! === module ideal_age_example === - -! === module advection_test_tracer === -ADVECTION_TEST_X_ORIGIN = 19.5 ! [not defined] default = 0.0 - ! The x-coorindate of the center of the test-functions. -ADVECTION_TEST_Y_ORIGIN = 60.5 ! [not defined] default = 0.0 - ! The y-coorindate of the center of the test-functions. -ADVECTION_TEST_X_WIDTH = 1.0 ! [not defined] default = 0.0 - ! The x-width of the test-functions. -ADVECTION_TEST_Y_WIDTH = 1.0 ! [not defined] default = 0.0 - ! The y-width of the test-functions. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -163,6 +141,28 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_ADVECTION_TEST_TRACER = True ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. + +! === module ideal_age_example === + +! === module advection_test_tracer === +ADVECTION_TEST_X_ORIGIN = 19.5 ! [not defined] default = 0.0 + ! The x-coorindate of the center of the test-functions. +ADVECTION_TEST_Y_ORIGIN = 60.5 ! [not defined] default = 0.0 + ! The y-coorindate of the center of the test-functions. +ADVECTION_TEST_X_WIDTH = 1.0 ! [not defined] default = 0.0 + ! The x-width of the test-functions. +ADVECTION_TEST_Y_WIDTH = 1.0 ! [not defined] default = 0.0 + ! The y-width of the test-functions. + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index b4cd582393..47bb200393 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -212,96 +212,6 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - -! === module ideal_age_example === -DO_IDEAL_AGE = True ! [Boolean] default = True - ! If true, use an ideal age tracer that is set to 0 age - ! in the mixed layer and ages at unit rate in the interior. -DO_IDEAL_VINTAGE = False ! [Boolean] default = False - ! If true, use an ideal vintage tracer that is set to an - ! exponentially increasing value in the mixed layer and - ! is conserved thereafter. -DO_IDEAL_AGE_DATED = False ! [Boolean] default = False - ! If true, use an ideal age tracer that is everywhere 0 - ! before IDEAL_AGE_DATED_START_YEAR, but the behaves like - ! the standard ideal age tracer - i.e. is set to 0 age in - ! the mixed layer and ages at unit rate in the interior. -AGE_IC_FILE = "" ! default = "" - ! The file in which the age-tracer initial values can be - ! found, or an empty string for internal initialization. -AGE_IC_FILE_IS_Z = False ! [Boolean] default = False - ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. -TRACERS_MAY_REINIT = False ! [Boolean] default = False - ! If true, tracers may go through the initialization code - ! if they are not found in the restart files. Otherwise - ! it is a fatal error if the tracers are not found in the - ! restart files of a restarted run. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -393,6 +303,96 @@ ROTATION = "2omegasinlat" ! default = "2omegasinlat" OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 ! The rotation rate of the earth. +! === module MOM_EOS === +EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +PARALLEL_RESTARTFILES = True ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. + +! === module ideal_age_example === +DO_IDEAL_AGE = True ! [Boolean] default = True + ! If true, use an ideal age tracer that is set to 0 age + ! in the mixed layer and ages at unit rate in the interior. +DO_IDEAL_VINTAGE = False ! [Boolean] default = False + ! If true, use an ideal vintage tracer that is set to an + ! exponentially increasing value in the mixed layer and + ! is conserved thereafter. +DO_IDEAL_AGE_DATED = False ! [Boolean] default = False + ! If true, use an ideal age tracer that is everywhere 0 + ! before IDEAL_AGE_DATED_START_YEAR, but the behaves like + ! the standard ideal age tracer - i.e. is set to 0 age in + ! the mixed layer and ages at unit rate in the interior. +AGE_IC_FILE = "" ! default = "" + ! The file in which the age-tracer initial values can be + ! found, or an empty string for internal initialization. +AGE_IC_FILE_IS_Z = False ! [Boolean] default = False + ! If true, AGE_IC_FILE is in depth space, not layer space +MASK_MASSLESS_TRACERS = False ! [Boolean] default = False + ! If true, the tracers are masked out in massless layer. + ! This can be a problem with time-averages. +TRACERS_MAY_REINIT = False ! [Boolean] default = False + ! If true, tracers may go through the initialization code + ! if they are not found in the restart files. Otherwise + ! it is a fatal error if the tracers are not found in the + ! restart files of a restarted run. + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index d928fea48c..affdb899d7 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -90,23 +90,6 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. - -! === module ideal_age_example === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -179,6 +162,23 @@ CHANNEL_CONFIG = "list" ! default = "none" CHANNEL_LIST_FILE = "MOM_channels_global_025" ! default = "MOM_channel_list" ! The file from which the list of narrowed channels is read. +! === module MOM_EOS === +DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +PARALLEL_RESTARTFILES = True ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. + +! === module ideal_age_example === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index a0126c802b..f504e25104 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -212,96 +212,6 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - -! === module ideal_age_example === -DO_IDEAL_AGE = True ! [Boolean] default = True - ! If true, use an ideal age tracer that is set to 0 age - ! in the mixed layer and ages at unit rate in the interior. -DO_IDEAL_VINTAGE = False ! [Boolean] default = False - ! If true, use an ideal vintage tracer that is set to an - ! exponentially increasing value in the mixed layer and - ! is conserved thereafter. -DO_IDEAL_AGE_DATED = False ! [Boolean] default = False - ! If true, use an ideal age tracer that is everywhere 0 - ! before IDEAL_AGE_DATED_START_YEAR, but the behaves like - ! the standard ideal age tracer - i.e. is set to 0 age in - ! the mixed layer and ages at unit rate in the interior. -AGE_IC_FILE = "" ! default = "" - ! The file in which the age-tracer initial values can be - ! found, or an empty string for internal initialization. -AGE_IC_FILE_IS_Z = False ! [Boolean] default = False - ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. -TRACERS_MAY_REINIT = False ! [Boolean] default = False - ! If true, tracers may go through the initialization code - ! if they are not found in the restart files. Otherwise - ! it is a fatal error if the tracers are not found in the - ! restart files of a restarted run. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -392,6 +302,96 @@ ROTATION = "2omegasinlat" ! default = "2omegasinlat" ! USER - call a user modified routine. OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = True ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. + +! === module ideal_age_example === +DO_IDEAL_AGE = True ! [Boolean] default = True + ! If true, use an ideal age tracer that is set to 0 age + ! in the mixed layer and ages at unit rate in the interior. +DO_IDEAL_VINTAGE = False ! [Boolean] default = False + ! If true, use an ideal vintage tracer that is set to an + ! exponentially increasing value in the mixed layer and + ! is conserved thereafter. +DO_IDEAL_AGE_DATED = False ! [Boolean] default = False + ! If true, use an ideal age tracer that is everywhere 0 + ! before IDEAL_AGE_DATED_START_YEAR, but the behaves like + ! the standard ideal age tracer - i.e. is set to 0 age in + ! the mixed layer and ages at unit rate in the interior. +AGE_IC_FILE = "" ! default = "" + ! The file in which the age-tracer initial values can be + ! found, or an empty string for internal initialization. +AGE_IC_FILE_IS_Z = False ! [Boolean] default = False + ! If true, AGE_IC_FILE is in depth space, not layer space +MASK_MASSLESS_TRACERS = False ! [Boolean] default = False + ! If true, the tracers are masked out in massless layer. + ! This can be a problem with time-averages. +TRACERS_MAY_REINIT = False ! [Boolean] default = False + ! If true, tracers may go through the initialization code + ! if they are not found in the restart files. Otherwise + ! it is a fatal error if the tracers are not found in the + ! restart files of a restarted run. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index 0446a49bdc..eec1e1665c 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -85,23 +85,6 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. - -! === module ideal_age_example === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -171,6 +154,23 @@ CHANNEL_CONFIG = "list" ! default = "none" ! NetCDF file on the model grid. CHANNEL_LIST_FILE = "MOM_channels_global_025" ! default = "MOM_channel_list" ! The file from which the list of narrowed channels is read. +PARALLEL_RESTARTFILES = True ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. + +! === module ideal_age_example === ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index c0161fbfa1..ae9f066b41 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -195,6 +195,95 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -222,9 +311,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -336,92 +422,6 @@ CFC12_E2 = 0.091015 ! [PSU-1 hK-1] default = 0.091015 CFC12_E3 = -0.0153924 ! [PSU-1 hK-2] default = -0.0153924 ! A coefficient in the solubility of CFC12. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short index b7ae341039..d620a356d0 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short @@ -76,20 +76,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_OCMIP2_CFC = True ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. - -! === module ideal_age_example === - -! === module MOM_OCMIP2_CFC === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -153,6 +139,20 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_OCMIP2_CFC = True ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. + +! === module ideal_age_example === + +! === module MOM_OCMIP2_CFC === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 188e1fbb97..d7830846e0 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -195,6 +195,95 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -222,9 +311,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -336,92 +422,6 @@ CFC12_E2 = 0.091015 ! [PSU-1 hK-1] default = 0.091015 CFC12_E3 = -0.0153924 ! [PSU-1 hK-2] default = -0.0153924 ! A coefficient in the solubility of CFC12. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short index 2cb665dc14..1f12e92703 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short @@ -76,20 +76,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_OCMIP2_CFC = True ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. - -! === module ideal_age_example === - -! === module MOM_OCMIP2_CFC === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -153,6 +139,20 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_OCMIP2_CFC = True ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. + +! === module ideal_age_example === + +! === module MOM_OCMIP2_CFC === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 188e1fbb97..d7830846e0 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -195,6 +195,95 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -222,9 +311,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -336,92 +422,6 @@ CFC12_E2 = 0.091015 ! [PSU-1 hK-1] default = 0.091015 CFC12_E3 = -0.0153924 ! [PSU-1 hK-2] default = -0.0153924 ! A coefficient in the solubility of CFC12. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short index 2cb665dc14..1f12e92703 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short @@ -76,20 +76,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_OCMIP2_CFC = True ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. - -! === module ideal_age_example === - -! === module MOM_OCMIP2_CFC === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -153,6 +139,20 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_OCMIP2_CFC = True ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. + +! === module ideal_age_example === + +! === module MOM_OCMIP2_CFC === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index d5737acef3..60b2c9c065 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -212,84 +212,6 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "MILLERO_78" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" - -! === module MOM_restart === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - -! === module ideal_age_example === -DO_IDEAL_AGE = True ! [Boolean] default = True - ! If true, use an ideal age tracer that is set to 0 age - ! in the mixed layer and ages at unit rate in the interior. -DO_IDEAL_VINTAGE = False ! [Boolean] default = False - ! If true, use an ideal vintage tracer that is set to an - ! exponentially increasing value in the mixed layer and - ! is conserved thereafter. -DO_IDEAL_AGE_DATED = False ! [Boolean] default = False - ! If true, use an ideal age tracer that is everywhere 0 - ! before IDEAL_AGE_DATED_START_YEAR, but the behaves like - ! the standard ideal age tracer - i.e. is set to 0 age in - ! the mixed layer and ages at unit rate in the interior. -AGE_IC_FILE = "" ! default = "" - ! The file in which the age-tracer initial values can be - ! found, or an empty string for internal initialization. -AGE_IC_FILE_IS_Z = False ! [Boolean] default = False - ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. -TRACERS_MAY_REINIT = False ! [Boolean] default = False - ! If true, tracers may go through the initialization code - ! if they are not found in the restart files. Otherwise - ! it is a fatal error if the tracers are not found in the - ! restart files of a restarted run. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -381,6 +303,84 @@ ROTATION = "2omegasinlat" ! default = "2omegasinlat" OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 ! The rotation rate of the earth. +! === module MOM_EOS === +EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "MILLERO_78" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" + +! === module MOM_restart === +PARALLEL_RESTARTFILES = True ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. + +! === module ideal_age_example === +DO_IDEAL_AGE = True ! [Boolean] default = True + ! If true, use an ideal age tracer that is set to 0 age + ! in the mixed layer and ages at unit rate in the interior. +DO_IDEAL_VINTAGE = False ! [Boolean] default = False + ! If true, use an ideal vintage tracer that is set to an + ! exponentially increasing value in the mixed layer and + ! is conserved thereafter. +DO_IDEAL_AGE_DATED = False ! [Boolean] default = False + ! If true, use an ideal age tracer that is everywhere 0 + ! before IDEAL_AGE_DATED_START_YEAR, but the behaves like + ! the standard ideal age tracer - i.e. is set to 0 age in + ! the mixed layer and ages at unit rate in the interior. +AGE_IC_FILE = "" ! default = "" + ! The file in which the age-tracer initial values can be + ! found, or an empty string for internal initialization. +AGE_IC_FILE_IS_Z = False ! [Boolean] default = False + ! If true, AGE_IC_FILE is in depth space, not layer space +MASK_MASSLESS_TRACERS = False ! [Boolean] default = False + ! If true, the tracers are masked out in massless layer. + ! This can be a problem with time-averages. +TRACERS_MAY_REINIT = False ! [Boolean] default = False + ! If true, tracers may go through the initialization code + ! if they are not found in the restart files. Otherwise + ! it is a fatal error if the tracers are not found in the + ! restart files of a restarted run. + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short index 6798f851cd..21df6b5c5f 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short @@ -95,23 +95,6 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -TFREEZE_FORM = "MILLERO_78" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" - -! === module MOM_restart === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. - -! === module ideal_age_example === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -180,6 +163,23 @@ CHANNEL_CONFIG = "list" ! default = "none" CHANNEL_LIST_FILE = "MOM_channels_FLOR" ! default = "MOM_channel_list" ! The file from which the list of narrowed channels is read. +! === module MOM_EOS === +TFREEZE_FORM = "MILLERO_78" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" + +! === module MOM_restart === +PARALLEL_RESTARTFILES = True ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. + +! === module ideal_age_example === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: 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 b957538142..1dfc95a789 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 @@ -187,80 +187,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -356,6 +282,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short index 11b1e51d12..4ce7d27067 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short @@ -46,25 +46,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -126,6 +107,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: 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 60de032f3c..1dc0d62dc1 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 @@ -189,80 +189,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -358,6 +284,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short index 7388e53bb8..aa2b93250f 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short @@ -49,25 +49,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -129,6 +110,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: 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 1df8861be3..9f0b59e8fc 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 @@ -189,80 +189,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -358,6 +284,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short index 403b5fbf44..93c53c9295 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short @@ -49,25 +49,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -129,6 +110,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: 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 ff662fea8f..47129b69b4 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 @@ -187,80 +187,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -356,6 +282,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short index 56581306cb..94b051c559 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short @@ -46,25 +46,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -126,6 +107,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: 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 b228a6995d..c4de754de7 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 @@ -189,80 +189,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -358,6 +284,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short index e99e3a3d11..20befa5d88 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short @@ -49,25 +49,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -129,6 +110,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: 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 bd8ced041c..650b127106 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 @@ -189,80 +189,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -358,6 +284,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short index 7b9b1b2fee..b6d02a4bc0 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short @@ -49,25 +49,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -129,6 +110,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: 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 75e0cced62..55fcf22941 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 @@ -187,80 +187,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -356,6 +282,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! 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 79f4e190ff..faab566a01 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 @@ -46,25 +46,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -126,6 +107,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: 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 43c1906ef0..a1d8bcf50a 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 @@ -189,80 +189,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -358,6 +284,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 e1838dcfa8..53f0e2fb23 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 @@ -49,25 +49,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -129,6 +110,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: 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 f1918b36b0..aa1184e2ee 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 @@ -189,80 +189,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -358,6 +284,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 62ca8376a4..113d0f609d 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 @@ -49,25 +49,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -129,6 +110,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: 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 9489eca13b..85fa1b3968 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 @@ -187,80 +187,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -356,6 +282,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! 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 0ba9d5ee9b..d97bc4cfd2 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 @@ -46,25 +46,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -126,6 +107,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: 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 d56519ba23..1bca34def8 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 @@ -189,80 +189,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -358,6 +284,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 c64a0e9700..a89d645067 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 @@ -49,25 +49,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -129,6 +110,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: 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 048f62b3c7..2c3acba786 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 @@ -189,80 +189,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -358,6 +284,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 e697a5bfad..f14202295f 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 @@ -49,25 +49,6 @@ NK = 400 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -129,6 +110,25 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = -0.255 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.764 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 8ac3ac174d..2511921773 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -176,53 +176,6 @@ NK = 25 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = True ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - -! === module DOME_tracer === -DOME_TRACER_IC_FILE = "" ! default = "" - ! The name of a file from which to read the initial - ! conditions for the DOME tracers, or blank to initialize - ! them internally. -SPONGE = True ! [Boolean] default = False - ! If true, sponges may be applied anywhere in the domain. - ! The exact location and properties of those sponges are - ! specified from MOM_initialization.F90. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -337,6 +290,9 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated ! === module MOM_boundary_update === USE_FILE_OBC = False ! [Boolean] default = False @@ -348,6 +304,50 @@ USE_KELVIN_WAVE_OBC = False ! [Boolean] default = False USE_SHELFWAVE_OBC = False ! [Boolean] default = False ! If true, use the shelfwave open boundary. +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = True ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. + +! === module DOME_tracer === +DOME_TRACER_IC_FILE = "" ! default = "" + ! The name of a file from which to read the initial + ! conditions for the DOME tracers, or blank to initialize + ! them internally. +SPONGE = True ! [Boolean] default = False + ! If true, sponges may be applied anywhere in the domain. + ! The exact location and properties of those sponges are + ! specified from MOM_initialization.F90. + ! === module MOM_coord_initialization === COORD_CONFIG = "layer_ref" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/DOME/MOM_parameter_doc.short b/ocean_only/DOME/MOM_parameter_doc.short index 328c4a4067..ed98fa735e 100644 --- a/ocean_only/DOME/MOM_parameter_doc.short +++ b/ocean_only/DOME/MOM_parameter_doc.short @@ -54,18 +54,6 @@ NK = 25 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_DOME_TRACER = True ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. - -! === module DOME_tracer === -SPONGE = True ! [Boolean] default = False - ! If true, sponges may be applied anywhere in the domain. - ! The exact location and properties of those sponges are - ! specified from MOM_initialization.F90. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -142,6 +130,18 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! === module MOM_boundary_update === +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_DOME_TRACER = True ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. + +! === module DOME_tracer === +SPONGE = True ! [Boolean] default = False + ! If true, sponges may be applied anywhere in the domain. + ! The exact location and properties of those sponges are + ! specified from MOM_initialization.F90. + ! === module MOM_coord_initialization === COORD_CONFIG = "layer_ref" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index d80ed6fd19..1057637442 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -176,43 +176,6 @@ NK = 2 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 50 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -308,6 +271,43 @@ F_0 = 6.49E-05 ! [s-1] default = 0.0 BETA = 2.0E-11 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 50 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "gprime" ! diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.short b/ocean_only/Phillips_2layer/MOM_parameter_doc.short index 615b0bcaec..d54395c364 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.short +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.short @@ -55,12 +55,6 @@ NK = 2 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_restart === -MAX_FIELDS = 50 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -132,6 +126,12 @@ BETA = 2.0E-11 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +! === module MOM_restart === +MAX_FIELDS = 50 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "gprime" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index b512c34aeb..fd9351d6f3 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -189,80 +189,6 @@ NK = 600 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -358,6 +284,80 @@ F_0 = 6.8103E-05 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index 6e42aceb68..0f8df5bc05 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -59,21 +59,6 @@ NK = 600 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DS = 0.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -135,6 +120,21 @@ F_0 = 6.8103E-05 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DS = 0.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 7e04f33d89..88bbf2fbb4 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 25 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -366,6 +292,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index e9b42b942a..f182bb755a 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short @@ -64,25 +64,6 @@ NK = 25 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -148,6 +129,25 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 538038655a..1a877777fa 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 25 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -366,6 +292,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index f2a458ab8a..f2c2d16272 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -60,25 +60,6 @@ NK = 25 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -144,6 +125,25 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index a8ad71ed86..3ee801b1eb 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 25 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -366,6 +292,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index 17e67e6f8e..e65fce4dea 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -60,25 +60,6 @@ NK = 25 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -144,6 +125,25 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 7622939a4b..2f498f49c7 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -195,96 +195,6 @@ NK = 22 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - -! === module ideal_age_example === -DO_IDEAL_AGE = True ! [Boolean] default = True - ! If true, use an ideal age tracer that is set to 0 age - ! in the mixed layer and ages at unit rate in the interior. -DO_IDEAL_VINTAGE = False ! [Boolean] default = False - ! If true, use an ideal vintage tracer that is set to an - ! exponentially increasing value in the mixed layer and - ! is conserved thereafter. -DO_IDEAL_AGE_DATED = False ! [Boolean] default = False - ! If true, use an ideal age tracer that is everywhere 0 - ! before IDEAL_AGE_DATED_START_YEAR, but the behaves like - ! the standard ideal age tracer - i.e. is set to 0 age in - ! the mixed layer and ages at unit rate in the interior. -AGE_IC_FILE = "" ! default = "" - ! The file in which the age-tracer initial values can be - ! found, or an empty string for internal initialization. -AGE_IC_FILE_IS_Z = False ! [Boolean] default = False - ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. -TRACERS_MAY_REINIT = False ! [Boolean] default = False - ! If true, tracers may go through the initialization code - ! if they are not found in the restart files. Otherwise - ! it is a fatal error if the tracers are not found in the - ! restart files of a restarted run. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -388,6 +298,96 @@ ROTATION = "2omegasinlat" ! default = "2omegasinlat" ! USER - call a user modified routine. OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. + +! === module ideal_age_example === +DO_IDEAL_AGE = True ! [Boolean] default = True + ! If true, use an ideal age tracer that is set to 0 age + ! in the mixed layer and ages at unit rate in the interior. +DO_IDEAL_VINTAGE = False ! [Boolean] default = False + ! If true, use an ideal vintage tracer that is set to an + ! exponentially increasing value in the mixed layer and + ! is conserved thereafter. +DO_IDEAL_AGE_DATED = False ! [Boolean] default = False + ! If true, use an ideal age tracer that is everywhere 0 + ! before IDEAL_AGE_DATED_START_YEAR, but the behaves like + ! the standard ideal age tracer - i.e. is set to 0 age in + ! the mixed layer and ages at unit rate in the interior. +AGE_IC_FILE = "" ! default = "" + ! The file in which the age-tracer initial values can be + ! found, or an empty string for internal initialization. +AGE_IC_FILE_IS_Z = False ! [Boolean] default = False + ! If true, AGE_IC_FILE is in depth space, not layer space +MASK_MASSLESS_TRACERS = False ! [Boolean] default = False + ! If true, the tracers are masked out in massless layer. + ! This can be a problem with time-averages. +TRACERS_MAY_REINIT = False ! [Boolean] default = False + ! If true, tracers may go through the initialization code + ! if they are not found in the restart files. Otherwise + ! it is a fatal error if the tracers are not found in the + ! restart files of a restarted run. ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index 409f897777..9a9c4fbaee 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -62,16 +62,6 @@ NK = 22 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. - -! === module ideal_age_example === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -135,6 +125,16 @@ MAXIMUM_DEPTH = 5500.0 ! [m] ! === module MOM_open_boundary === ! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. + +! === module ideal_age_example === + ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 353a8f6d23..91da169cef 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -176,53 +176,6 @@ NK = 10 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = True ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - -! === module DOME_tracer === -DOME_TRACER_IC_FILE = "" ! default = "" - ! The name of a file from which to read the initial - ! conditions for the DOME tracers, or blank to initialize - ! them internally. -SPONGE = False ! [Boolean] default = False - ! If true, sponges may be applied anywhere in the domain. - ! The exact location and properties of those sponges are - ! specified from MOM_initialization.F90. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -315,6 +268,22 @@ OBC_SEGMENT_003 = "I=N,J=0:N,FLATHER,ORLANSKI" ! ! Documentation needs to be dynamic????? OBC_SEGMENT_004 = "I=0,J=N:0,FLATHER,ORLANSKI" ! ! Documentation needs to be dynamic????? +OBC_RADIATION_MAX = 10.0 ! [m s-1] default = 10.0 + ! The maximum magnitude of the baroclinic radiation + ! velocity (or speed of characteristics). This is only + ! used if one of the open boundary segments is using Orlanski. +OBC_RAD_VEL_WT = 0.3 ! [nondim] default = 0.3 + ! The relative weighting for the baroclinic radiation + ! velocities (or speed of characteristics) at the new + ! time level (1) or the running mean (0) for velocities. + ! Valid values range from 0 to 1. This is only used if + ! one of the open boundary segments is using Orlanski. +OBC_RAD_THICK_WT = 0.2 ! [nondim] default = 0.2 + ! The relative weighting for the baroclinic radiation + ! velocities (or speed of characteristics) at the new + ! time level (1) or the running mean (0) for thicknesses. + ! Valid values range from 0 to 1. This is only used if + ! one of the open boundary segments is using Orlanski. MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 ! The depth below which to mask points as land points, for which all ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. @@ -341,6 +310,9 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated ! === module MOM_boundary_update === USE_FILE_OBC = False ! [Boolean] default = False @@ -352,6 +324,50 @@ USE_KELVIN_WAVE_OBC = False ! [Boolean] default = False USE_SHELFWAVE_OBC = False ! [Boolean] default = False ! If true, use the shelfwave open boundary. +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = True ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. + +! === module DOME_tracer === +DOME_TRACER_IC_FILE = "" ! default = "" + ! The name of a file from which to read the initial + ! conditions for the DOME tracers, or blank to initialize + ! them internally. +SPONGE = False ! [Boolean] default = False + ! If true, sponges may be applied anywhere in the domain. + ! The exact location and properties of those sponges are + ! specified from MOM_initialization.F90. + ! === module MOM_coord_initialization === COORD_CONFIG = "layer_ref" ! ! This specifies how layers are to be defined: @@ -439,22 +455,6 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False ! If true, cuts way the top of the column for initial conditions ! at the depth where the hydrostatic presure matches the imposed ! surface pressure which is read from file. -OBC_RADIATION_MAX = 10.0 ! [m s-1] default = 10.0 - ! The maximum magnitude of the baroclinic radiation - ! velocity (or speed of characteristics). This is only - ! used if one of the open boundary segments is using Orlanski. -OBC_RAD_VEL_WT = 0.3 ! [nondim] default = 0.3 - ! The relative weighting for the baroclinic radiation - ! velocities (or speed of characteristics) at the new - ! time level (1) or the running mean (0) for velocities. - ! Valid values range from 0 to 1. This is only used if - ! one of the open boundary segments is using Orlanski. -OBC_RAD_THICK_WT = 0.2 ! [nondim] default = 0.2 - ! The relative weighting for the baroclinic radiation - ! velocities (or speed of characteristics) at the new - ! time level (1) or the running mean (0) for thicknesses. - ! Valid values range from 0 to 1. This is only used if - ! one of the open boundary segments is using Orlanski. OBC_USER_CONFIG = "none" ! default = "none" ! A string that sets how the user code is invoked to set open ! boundary data: diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.short b/ocean_only/circle_obcs/MOM_parameter_doc.short index c76e82ca76..4fde17881a 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.short +++ b/ocean_only/circle_obcs/MOM_parameter_doc.short @@ -49,14 +49,6 @@ NK = 10 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_DOME_TRACER = True ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. - -! === module DOME_tracer === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -145,6 +137,14 @@ ROTATION = "beta" ! default = "2omegasinlat" ! === module MOM_boundary_update === +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_DOME_TRACER = True ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. + +! === module DOME_tracer === + ! === module MOM_coord_initialization === COORD_CONFIG = "layer_ref" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index a84918e545..733ab6d5b0 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -176,43 +176,6 @@ NK = 2 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -302,6 +265,43 @@ ROTATION = "2omegasinlat" ! default = "2omegasinlat" ! USER - call a user modified routine. OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "gprime" ! diff --git a/ocean_only/double_gyre/MOM_parameter_doc.short b/ocean_only/double_gyre/MOM_parameter_doc.short index 731e4d5d72..42efd0cc21 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.short +++ b/ocean_only/double_gyre/MOM_parameter_doc.short @@ -51,10 +51,6 @@ NK = 2 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -108,6 +104,10 @@ MAXIMUM_DEPTH = 2000.0 ! [m] ! === module MOM_open_boundary === ! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "gprime" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 2a1f0cd029..4d49c14737 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 21 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.8 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -366,6 +292,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.8 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "layer_ref" ! diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index 6b0dfae92e..99cc96d5e3 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/ocean_only/external_gwave/MOM_parameter_doc.short @@ -62,17 +62,6 @@ NK = 21 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -141,6 +130,17 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "layer_ref" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 1b64e073d0..0c9b8f0d4c 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 40 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -377,6 +303,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index a31a0b1f7a..acb9a9c96e 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short @@ -53,25 +53,6 @@ NK = 40 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -142,6 +123,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index b8d09ec362..17a42aacf2 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 40 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -377,6 +303,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 19d4ea4be5..f4a845ae64 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -49,25 +49,6 @@ NK = 40 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -138,6 +119,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 2b1b7882bf..f6436056b3 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 40 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -377,6 +303,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index 05099ed946..65952a4505 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -49,25 +49,6 @@ NK = 40 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -138,6 +119,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 868019aabb..a0e1e46b95 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 40 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -377,6 +303,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index c22d1e7290..0932e87218 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -49,25 +49,6 @@ NK = 40 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -138,6 +119,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index a3bed8b129..1603e9e9d9 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -212,6 +212,95 @@ NK = 50 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -239,9 +328,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -302,92 +388,6 @@ TRACERS_MAY_REINIT = False ! [Boolean] default = False ! it is a fatal error if the tracers are not found in the ! restart files of a restarted run. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 60f3a6e56c..2dd7cc8d19 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -83,16 +83,6 @@ NK = 50 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. - -! === module ideal_age_example === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -156,6 +146,16 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. + +! === module ideal_age_example === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index a68e7659b7..2739384406 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -210,6 +210,95 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -237,9 +326,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -300,92 +386,6 @@ TRACERS_MAY_REINIT = False ! [Boolean] default = False ! it is a fatal error if the tracers are not found in the ! restart files of a restarted run. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.short b/ocean_only/global_ALE/layer/MOM_parameter_doc.short index 5cb1d1d7c5..5b8d79ac60 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.short @@ -80,16 +80,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. - -! === module ideal_age_example === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -153,6 +143,16 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. + +! === module ideal_age_example === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 001969e91c..a1e17ca05d 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -212,6 +212,95 @@ NK = 50 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -239,9 +328,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -302,92 +388,6 @@ TRACERS_MAY_REINIT = False ! [Boolean] default = False ! it is a fatal error if the tracers are not found in the ! restart files of a restarted run. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index 42fa380d5f..d017a40caa 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -83,16 +83,6 @@ NK = 50 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. - -! === module ideal_age_example === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -156,6 +146,16 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. + +! === module ideal_age_example === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 276d97926a..3e18d7fe52 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 21 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.8 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -366,6 +292,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.8 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "layer_ref" ! diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index 94bd2b7c25..ed17d75bff 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/ocean_only/lock_exchange/MOM_parameter_doc.short @@ -55,17 +55,6 @@ NK = 21 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -134,6 +123,17 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "layer_ref" ! ! This specifies how layers are to be defined: 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 d57b801da4..2d6fd86333 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 40 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.8 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -366,6 +292,80 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.8 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short index 280fdaabde..8e0152deab 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -40,17 +40,6 @@ NK = 40 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -119,6 +108,17 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index e7d6d75e24..a547b3faf9 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -195,6 +195,95 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "global_1deg" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state @@ -222,9 +311,6 @@ DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 ! temperature with pressure. ! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. LARGE_FILE_SUPPORT = True ! [Boolean] default = True @@ -285,92 +371,6 @@ TRACERS_MAY_REINIT = False ! [Boolean] default = False ! it is a fatal error if the tracers are not found in the ! restart files of a restarted run. -! === module MOM_fixed_initialization === -INPUTDIR = "INPUT" ! default = "." - ! The directory in which input files are found. - -! === module MOM_grid_init === -GRID_CONFIG = "mosaic" ! - ! A character string that determines the method for - ! defining the horizontal grid. Current options are: - ! mosaic - read the grid from a mosaic (supergrid) - ! file set by GRID_FILE. - ! cartesian - use a (flat) Cartesian grid. - ! spherical - use a simple spherical grid. - ! mercator - use a Mercator spherical grid. -GRID_FILE = "ocean_hgrid.nc" ! - ! Name of the file from which to read horizontal grid data. -TOPO_CONFIG = "file" ! - ! This specifies how bathymetry is specified: - ! file - read bathymetric information from the file - ! specified by (TOPO_FILE). - ! flat - flat bottom set to MAXIMUM_DEPTH. - ! bowl - an analytically specified bowl-shaped basin - ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. - ! spoon - a similar shape to 'bowl', but with an vertical - ! wall at the southern face. - ! halfpipe - a zonally uniform channel with a half-sine - ! profile in the meridional direction. - ! benchmark - use the benchmark test case topography. - ! Neverland - use the Neverland test case topography. - ! DOME - use a slope and channel configuration for the - ! DOME sill-overflow test case. - ! ISOMIP - use a slope and channel configuration for the - ! ISOMIP test case. - ! DOME2D - use a shelf and slope configuration for the - ! DOME2D gravity current/overflow test case. - ! Kelvin - flat but with rotated land mask. - ! seamount - Gaussian bump for spontaneous motion test case. - ! shelfwave - exponential slope for shelfwave test case. - ! supercritical - flat but with 8.95 degree land mask. - ! Phillips - ACC-like idealized topography used in the Phillips config. - ! dense - Denmark Strait-like dense water formation and overflow. - ! USER - call a user modified routine. -TOPO_FILE = "topog.nc" ! default = "topog.nc" - ! The file from which the bathymetry is read. -TOPO_VARNAME = "depth" ! default = "depth" - ! The name of the bathymetry variable in TOPO_FILE. -TOPO_EDITS_FILE = "" ! default = "" - ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. -MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 - ! If MASKING_DEPTH is unspecified, then anything shallower than - ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. - ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. - -! === module MOM_open_boundary === -! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. -OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 - ! The number of open boundary segments. -EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False - ! If true, extend OBC segments. This option is used to recover - ! legacy solutions dependent on an incomplete implementaion of OBCs. - ! This option will be obsoleted in the future. -MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 - ! The depth below which to mask points as land points, for which all - ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. -CHANNEL_CONFIG = "global_1deg" ! default = "none" - ! A parameter that determines which set of channels are - ! restricted to specific widths. Options are: - ! none - All channels have the grid width. - ! global_1deg - Sets 16 specific channels appropriate - ! for a 1-degree model, as used in CM2G. - ! list - Read the channel locations and widths from a - ! text file, like MOM_channel_list in the MOM_SIS - ! test case. - ! file - Read open face widths everywhere from a - ! NetCDF file on the model grid. -ROTATION = "2omegasinlat" ! default = "2omegasinlat" - ! This specifies how the Coriolis parameter is specified: - ! 2omegasinlat - Use twice the planetary rotation rate - ! times the sine of latitude. - ! betaplane - Use a beta-plane or f-plane. - ! USER - call a user modified routine. -OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 - ! The rotation rate of the earth. - ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index bf4d9e0dd2..1d54f4f067 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -78,16 +78,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. - -! === module ideal_age_example === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -151,6 +141,16 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. + +! === module ideal_age_example === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index b852d72f09..41a9868c38 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 9 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -366,6 +292,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/resting/layer/MOM_parameter_doc.short b/ocean_only/resting/layer/MOM_parameter_doc.short index dc1906e354..63ab58ceff 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.short +++ b/ocean_only/resting/layer/MOM_parameter_doc.short @@ -44,25 +44,6 @@ NK = 9 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -128,6 +109,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index be438be9ce..adcc288acd 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 9 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -366,6 +292,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/resting/z/MOM_parameter_doc.short b/ocean_only/resting/z/MOM_parameter_doc.short index ba0d836aae..c757f68578 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.short +++ b/ocean_only/resting/z/MOM_parameter_doc.short @@ -40,25 +40,6 @@ NK = 9 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -124,6 +105,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index cb641f4433..246daa7cd2 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 20 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -377,6 +303,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index 4888a3b194..b2d37b80fe 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/ocean_only/seamount/layer/MOM_parameter_doc.short @@ -46,25 +46,6 @@ NK = 20 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -133,6 +114,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index b8517205e3..26d7e25134 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 20 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -377,6 +303,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index cebb104026..b070a55011 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -42,25 +42,6 @@ NK = 20 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -129,6 +110,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 6f9e9135b3..7c3dc88e7e 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 20 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -377,6 +303,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index 25ef96cda6..3173fbc893 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -42,25 +42,6 @@ NK = 20 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -129,6 +110,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 558c026893..29b7ec5598 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 20 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -377,6 +303,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index 88f14dda84..0fdaf63e0c 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -42,25 +42,6 @@ NK = 20 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -129,6 +110,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index f9c60a1cfc..450282d661 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -187,69 +187,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -345,6 +282,69 @@ F_0 = 7.59943E-05 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.short b/ocean_only/single_column/BML/MOM_parameter_doc.short index 4640994624..0de1b0f376 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.short +++ b/ocean_only/single_column/BML/MOM_parameter_doc.short @@ -49,12 +49,6 @@ NK = 63 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -118,6 +112,12 @@ F_0 = 7.59943E-05 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index f0081592a8..bf294fc594 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -189,69 +189,6 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -347,6 +284,69 @@ F_0 = 7.59943E-05 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.short b/ocean_only/single_column/EPBL/MOM_parameter_doc.short index 097d980527..6acab15b50 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.short +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.short @@ -52,12 +52,6 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -121,6 +115,12 @@ F_0 = 7.59943E-05 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index fab0f95a62..dd05b3beab 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -189,69 +189,6 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -347,6 +284,69 @@ F_0 = 7.59943E-05 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.short b/ocean_only/single_column/KPP/MOM_parameter_doc.short index 2a4eecfb26..aa39a6a943 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.short +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.short @@ -52,12 +52,6 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -121,6 +115,12 @@ F_0 = 7.59943E-05 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index c71817f6c2..d435e6086d 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 10 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -369,6 +295,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index 417a7a1922..1a95ed20b3 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.short @@ -44,25 +44,6 @@ NK = 10 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -131,6 +112,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index e2687fef6d..9a6e339158 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 10 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -369,6 +295,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index 60c54027c2..5e015b1d18 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -40,25 +40,6 @@ NK = 10 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -127,6 +108,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 21a1a26982..d814969677 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -197,80 +197,6 @@ NK = 10 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -369,6 +295,80 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index c2bdf0eb23..b50c7d8171 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -40,25 +40,6 @@ NK = 10 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -127,6 +108,25 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +DRHO_DT = 0.0 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 1.0 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! ! This specifies how layers are to be defined: diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 5740d0212d..859835e50e 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -197,105 +197,6 @@ NK = 5 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. -RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 - ! When EQN_OF_STATE=LINEAR, - ! this is the density at T=0, S=0. -DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! temperature. -DRHO_DS = 0.8 ! [kg m-3 PSU-1] default = 0.8 - ! When EQN_OF_STATE=LINEAR, - ! this is the partial derivative of density with - ! salinity. -EOS_QUADRATURE = False ! [Boolean] default = False - ! If true, always use the generic (quadrature) code - ! code for the integrals of density. -TFREEZE_FORM = "LINEAR" ! default = "LINEAR" - ! TFREEZE_FORM determines which expression should be - ! used for the freezing point. Currently, the valid - ! choices are "LINEAR", "MILLERO_78", "TEOS10" -TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the freezing potential temperature at - ! S=0, P=0. -DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with salinity. -DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated -RESTARTFILE = "MOM.res" ! default = "MOM.res" - ! The name-root of the restart file. -LARGE_FILE_SUPPORT = True ! [Boolean] default = True - ! If true, use the file-size limits with NetCDF large - ! file support (4Gb), otherwise the limit is 2Gb. -MAX_FIELDS = 100 ! default = 100 - ! The maximum number of restart fields that can be used. - -! === module MOM_tracer_flow_control === -USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False - ! If true, use the USER_tracer_example tracer package. -USE_DOME_TRACER = False ! [Boolean] default = False - ! If true, use the DOME_tracer tracer package. -USE_ISOMIP_TRACER = False ! [Boolean] default = False - ! If true, use the ISOMIP_tracer tracer package. -USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_REGIONAL_DYES = False ! [Boolean] default = False - ! If true, use the regional_dyes tracer package. -USE_OIL_TRACER = False ! [Boolean] default = False - ! If true, use the oil_tracer tracer package. -USE_ADVECTION_TEST_TRACER = True ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. -USE_OCMIP2_CFC = False ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. -USE_generic_tracer = False ! [Boolean] default = False - ! If true and _USE_GENERIC_TRACER is defined as a - ! preprocessor macro, use the MOM_generic_tracer packages. -USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False - ! If true, use the pseudo salt tracer, typically run as a diagnostic. -USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False - ! If true, use the boundary impulse tracer. - -! === module advection_test_tracer === -ADVECTION_TEST_X_ORIGIN = 43.2 ! [not defined] default = 0.0 - ! The x-coorindate of the center of the test-functions. -ADVECTION_TEST_Y_ORIGIN = 86.4 ! [not defined] default = 0.0 - ! The y-coorindate of the center of the test-functions. -ADVECTION_TEST_X_WIDTH = 21.6 ! [not defined] default = 0.0 - ! The x-width of the test-functions. -ADVECTION_TEST_Y_WIDTH = 21.6 ! [not defined] default = 0.0 - ! The y-width of the test-functions. -ADVECTION_TEST_TRACER_IC_FILE = "" ! default = "" - ! The name of a file from which to read the initial - ! conditions for the tracers, or blank to initialize - ! them internally. -SPONGE = False ! [Boolean] default = False - ! If true, sponges may be applied anywhere in the domain. - ! The exact location and properties of those sponges are - ! specified from MOM_initialization.F90. -MASK_TRACERS_IN_MASSLESS_LAYERS = False ! [Boolean] default = False - ! If true, tracers will be masked out in massless layers. -TRACERS_MAY_REINIT = False ! [Boolean] default = False - ! If true, tracers may go through the initialization code - ! if they are not found in the restart files. Otherwise - ! it is a fatal error if the tracers are not found in the - ! restart files of a restarted run. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -391,6 +292,105 @@ F_0 = 0.0 ! [s-1] default = 0.0 BETA = 0.0 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. +RHO_T0_S0 = 1000.0 ! [kg m-3] default = 1000.0 + ! When EQN_OF_STATE=LINEAR, + ! this is the density at T=0, S=0. +DRHO_DT = -0.2 ! [kg m-3 K-1] default = -0.2 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! temperature. +DRHO_DS = 0.8 ! [kg m-3 PSU-1] default = 0.8 + ! When EQN_OF_STATE=LINEAR, + ! this is the partial derivative of density with + ! salinity. +EOS_QUADRATURE = False ! [Boolean] default = False + ! If true, always use the generic (quadrature) code + ! code for the integrals of density. +TFREEZE_FORM = "LINEAR" ! default = "LINEAR" + ! TFREEZE_FORM determines which expression should be + ! used for the freezing point. Currently, the valid + ! choices are "LINEAR", "MILLERO_78", "TEOS10" +TFREEZE_S0_P0 = 0.0 ! [deg C] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the freezing potential temperature at + ! S=0, P=0. +DTFREEZE_DS = -0.054 ! [deg C PSU-1] default = -0.054 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with salinity. +DTFREEZE_DP = 0.0 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = True ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. + +! === module advection_test_tracer === +ADVECTION_TEST_X_ORIGIN = 43.2 ! [not defined] default = 0.0 + ! The x-coorindate of the center of the test-functions. +ADVECTION_TEST_Y_ORIGIN = 86.4 ! [not defined] default = 0.0 + ! The y-coorindate of the center of the test-functions. +ADVECTION_TEST_X_WIDTH = 21.6 ! [not defined] default = 0.0 + ! The x-width of the test-functions. +ADVECTION_TEST_Y_WIDTH = 21.6 ! [not defined] default = 0.0 + ! The y-width of the test-functions. +ADVECTION_TEST_TRACER_IC_FILE = "" ! default = "" + ! The name of a file from which to read the initial + ! conditions for the tracers, or blank to initialize + ! them internally. +SPONGE = False ! [Boolean] default = False + ! If true, sponges may be applied anywhere in the domain. + ! The exact location and properties of those sponges are + ! specified from MOM_initialization.F90. +MASK_TRACERS_IN_MASSLESS_LAYERS = False ! [Boolean] default = False + ! If true, tracers will be masked out in massless layers. +TRACERS_MAY_REINIT = False ! [Boolean] default = False + ! If true, tracers may go through the initialization code + ! if they are not found in the restart files. Otherwise + ! it is a fatal error if the tracers are not found in the + ! restart files of a restarted run. ! === module MOM_coord_initialization === COORD_CONFIG = "ts_ref" ! diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.short b/ocean_only/torus_advection_test/MOM_parameter_doc.short index 62f1cbb90a..ab1907daa9 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.short +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.short @@ -60,29 +60,6 @@ NK = 5 ! [nondim] ! === module MOM_tracer_registry === -! === module MOM_EOS === -EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" - ! EQN_OF_STATE determines which ocean equation of state - ! should be used. Currently, the valid choices are - ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". - ! This is only used if USE_EOS is true. - -! === module MOM_restart === - -! === module MOM_tracer_flow_control === -USE_ADVECTION_TEST_TRACER = True ! [Boolean] default = False - ! If true, use the advection_test_tracer tracer package. - -! === module advection_test_tracer === -ADVECTION_TEST_X_ORIGIN = 43.2 ! [not defined] default = 0.0 - ! The x-coorindate of the center of the test-functions. -ADVECTION_TEST_Y_ORIGIN = 86.4 ! [not defined] default = 0.0 - ! The y-coorindate of the center of the test-functions. -ADVECTION_TEST_X_WIDTH = 21.6 ! [not defined] default = 0.0 - ! The x-width of the test-functions. -ADVECTION_TEST_Y_WIDTH = 21.6 ! [not defined] default = 0.0 - ! The y-width of the test-functions. - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -148,6 +125,29 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_EOS === +EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" + ! EQN_OF_STATE determines which ocean equation of state + ! should be used. Currently, the valid choices are + ! "LINEAR", "UNESCO", "WRIGHT", "NEMO" and "TEOS10". + ! This is only used if USE_EOS is true. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_ADVECTION_TEST_TRACER = True ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. + +! === module advection_test_tracer === +ADVECTION_TEST_X_ORIGIN = 43.2 ! [not defined] default = 0.0 + ! The x-coorindate of the center of the test-functions. +ADVECTION_TEST_Y_ORIGIN = 86.4 ! [not defined] default = 0.0 + ! The y-coorindate of the center of the test-functions. +ADVECTION_TEST_X_WIDTH = 21.6 ! [not defined] default = 0.0 + ! The x-width of the test-functions. +ADVECTION_TEST_Y_WIDTH = 21.6 ! [not defined] default = 0.0 + ! The y-width of the test-functions. + ! === module MOM_coord_initialization === COORD_CONFIG = "ts_ref" ! ! This specifies how layers are to be defined: diff --git a/src/MOM6 b/src/MOM6 index 993ad0f9ed..4f654e8182 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 993ad0f9ed7774d17225401db1e8b934315e8573 +Subproject commit 4f654e8182dc3dbc172b63a54b0b53ead27d0eab From 380517d85b4bb6f970d8d993ea56952134762952 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 6 Sep 2017 17:49:26 -0400 Subject: [PATCH 05/89] MOM6: Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl - NOAA-GFDL/MOM6@365356c Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl - NOAA-GFDL/MOM6@dac96f4 Added chksum calls around radiation_open_bdry_conds - NOAA-GFDL/MOM6@b3247d9 Removed trailing white space --- src/MOM6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MOM6 b/src/MOM6 index 993ad0f9ed..365356ce28 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 993ad0f9ed7774d17225401db1e8b934315e8573 +Subproject commit 365356ce28481048490a85ced0d750d05bbe496a From 595b4cda89e3b3d3e4bb4fe0978ffc8d334f7117 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 7 Sep 2017 08:05:45 -0400 Subject: [PATCH 06/89] Corrected version of FMS submodule - In the last merge, a version of FMS was pointed to that is not visible on GitHub. This happened because the merge was made from an active development branch which appears to be far ahead of, or incompatible with, the main branches. Merge requests are best made from feature branches which contain only the relevant changes and are based from the head of a main branch. - The last merge broke everything so I am fixing this without waiting for the review process. --- src/FMS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FMS b/src/FMS index c6c9533273..e654ba0178 160000 --- a/src/FMS +++ b/src/FMS @@ -1 +1 @@ -Subproject commit c6c95332730a7056d7fbc871aad19f9eac56e968 +Subproject commit e654ba0178939aebc3ed330045195beb0f4b7f5d From 06ae1dd941e4640c186de0d27403101e1dc09525 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Fri, 8 Sep 2017 14:46:28 -0400 Subject: [PATCH 07/89] SIS2: Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl - NOAA-GFDL/SIS2@d57d276 Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl - NOAA-GFDL/SIS2@6995ce7 Merge pull request #1 from Hallberg-NOAA/coupler_type_reform_rwh - NOAA-GFDL/SIS2@725d709 (*)Save gas fluxes to restarts with concurrent ice - NOAA-GFDL/SIS2@9020bf1 +Added optional gas_flux args to ice_model_init - NOAA-GFDL/SIS2@e2497e6 +Complete reformulation of SIS2 tracer fluxes - NOAA-GFDL/SIS2@3209acc +Use new coupler_type routines in the SIS2 code --- src/SIS2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SIS2 b/src/SIS2 index 65b1d23f2f..d57d276233 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit 65b1d23f2f3e3a25f1e8665a36b970ea84e726ea +Subproject commit d57d2762339896233d0deee9f5bdbeb618f99fe5 From b7a8b635475219a3f41aab956e468124f9b7edc6 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Fri, 8 Sep 2017 16:03:55 -0400 Subject: [PATCH 08/89] icebergs: Update license to LGPLv3 - NOAA-GFDL/icebergs@6595cdd Update license to LGPLv3 --- src/icebergs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/icebergs b/src/icebergs index c67f435706..6595cdd817 160000 --- a/src/icebergs +++ b/src/icebergs @@ -1 +1 @@ -Subproject commit c67f4357069182ebe237bf651da56bb39bbe52e0 +Subproject commit 6595cdd81789a67449873350ea9b69b87f44ff70 From 222ac502e8d761ef518c554ecb675d17516589c6 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Tue, 12 Sep 2017 16:10:39 -0400 Subject: [PATCH 09/89] MOM6: Merge pull request #585 from NOAA-GFDL/split_MOM_forcing_type - Commit NOAA-GFDL/MOM6@f2c7634 updated documentation files. - NOAA-GFDL/MOM6@e153f79 Merge pull request #585 from NOAA-GFDL/split_MOM_forcing_type - NOAA-GFDL/MOM6@81fa515 Merge pull request #584 from ashao/return_tracer_diabatic - NOAA-GFDL/MOM6@aa45edc Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into split_MOM_forcing_type - NOAA-GFDL/MOM6@eb4134b Relocated calls to set_derived_forcing_fields - NOAA-GFDL/MOM6@f2c7634 +Added mech_forcing type structure - NOAA-GFDL/MOM6@d8f52da Bugfix when using passive tracers with diabatic driver but no fluxes --- coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all | 4 ++-- coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short | 4 ++-- .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 4 ++-- .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short | 4 ++-- .../Concurrent_ice_1deg/MOM_parameter_doc.all | 4 ++-- .../Concurrent_ice_1deg/MOM_parameter_doc.short | 4 ++-- ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 4 ++-- ice_ocean_SIS2/Baltic/MOM_parameter_doc.short | 4 ++-- .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 4 ++-- .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short | 4 ++-- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 4 ++-- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short | 4 ++-- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 4 ++-- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 4 ++-- ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 4 ++-- ice_ocean_SIS2/SIS2/MOM_parameter_doc.short | 4 ++-- ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 4 ++-- ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short | 4 ++-- ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 4 ++-- ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short | 4 ++-- land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all | 4 ++-- .../OM_360x320_C180/MOM_parameter_doc.short | 4 ++-- .../CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all | 4 ++-- .../CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short | 4 ++-- .../CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all | 4 ++-- .../CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short | 4 ++-- .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all | 4 ++-- .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short | 4 ++-- .../CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all | 4 ++-- .../CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short | 4 ++-- .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all | 4 ++-- .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short | 4 ++-- .../CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all | 4 ++-- .../CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short | 4 ++-- .../skin_warming_wind/BML/MOM_parameter_doc.all | 4 ++-- .../skin_warming_wind/BML/MOM_parameter_doc.short | 4 ++-- .../skin_warming_wind/EPBL/MOM_parameter_doc.all | 4 ++-- .../skin_warming_wind/EPBL/MOM_parameter_doc.short | 4 ++-- .../skin_warming_wind/KPP/MOM_parameter_doc.all | 4 ++-- .../skin_warming_wind/KPP/MOM_parameter_doc.short | 4 ++-- .../CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all | 4 ++-- .../CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short | 4 ++-- .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all | 4 ++-- .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short | 4 ++-- .../CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all | 4 ++-- .../CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short | 4 ++-- ocean_only/DOME/MOM_parameter_doc.all | 4 ++-- ocean_only/DOME/MOM_parameter_doc.short | 4 ++-- ocean_only/Phillips_2layer/MOM_parameter_doc.all | 4 ++-- ocean_only/Phillips_2layer/MOM_parameter_doc.short | 4 ++-- ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all | 4 ++-- ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short | 4 ++-- ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 4 ++-- ocean_only/adjustment2d/layer/MOM_parameter_doc.short | 4 ++-- ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 4 ++-- ocean_only/adjustment2d/rho/MOM_parameter_doc.short | 4 ++-- ocean_only/adjustment2d/z/MOM_parameter_doc.all | 4 ++-- ocean_only/adjustment2d/z/MOM_parameter_doc.short | 4 ++-- ocean_only/benchmark/MOM_parameter_doc.all | 4 ++-- ocean_only/benchmark/MOM_parameter_doc.short | 4 ++-- ocean_only/circle_obcs/MOM_parameter_doc.all | 4 ++-- ocean_only/circle_obcs/MOM_parameter_doc.short | 4 ++-- ocean_only/double_gyre/MOM_parameter_doc.all | 4 ++-- ocean_only/double_gyre/MOM_parameter_doc.short | 4 ++-- ocean_only/external_gwave/MOM_parameter_doc.all | 4 ++-- ocean_only/external_gwave/MOM_parameter_doc.short | 4 ++-- ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 4 ++-- ocean_only/flow_downslope/layer/MOM_parameter_doc.short | 4 ++-- ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 4 ++-- ocean_only/flow_downslope/rho/MOM_parameter_doc.short | 4 ++-- ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 4 ++-- ocean_only/flow_downslope/sigma/MOM_parameter_doc.short | 4 ++-- ocean_only/flow_downslope/z/MOM_parameter_doc.all | 4 ++-- ocean_only/flow_downslope/z/MOM_parameter_doc.short | 4 ++-- ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 4 ++-- ocean_only/global_ALE/hycom/MOM_parameter_doc.short | 4 ++-- ocean_only/global_ALE/layer/MOM_parameter_doc.all | 4 ++-- ocean_only/global_ALE/layer/MOM_parameter_doc.short | 4 ++-- ocean_only/global_ALE/z/MOM_parameter_doc.all | 4 ++-- ocean_only/global_ALE/z/MOM_parameter_doc.short | 4 ++-- ocean_only/lock_exchange/MOM_parameter_doc.all | 4 ++-- ocean_only/lock_exchange/MOM_parameter_doc.short | 4 ++-- ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 4 ++-- ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short | 4 ++-- ocean_only/nonBous_global/MOM_parameter_doc.all | 4 ++-- ocean_only/nonBous_global/MOM_parameter_doc.short | 4 ++-- ocean_only/resting/layer/MOM_parameter_doc.all | 4 ++-- ocean_only/resting/layer/MOM_parameter_doc.short | 4 ++-- ocean_only/resting/z/MOM_parameter_doc.all | 4 ++-- ocean_only/resting/z/MOM_parameter_doc.short | 4 ++-- ocean_only/seamount/layer/MOM_parameter_doc.all | 4 ++-- ocean_only/seamount/layer/MOM_parameter_doc.short | 4 ++-- ocean_only/seamount/rho/MOM_parameter_doc.all | 4 ++-- ocean_only/seamount/rho/MOM_parameter_doc.short | 4 ++-- ocean_only/seamount/sigma/MOM_parameter_doc.all | 4 ++-- ocean_only/seamount/sigma/MOM_parameter_doc.short | 4 ++-- ocean_only/seamount/z/MOM_parameter_doc.all | 4 ++-- ocean_only/seamount/z/MOM_parameter_doc.short | 4 ++-- ocean_only/single_column/BML/MOM_parameter_doc.all | 4 ++-- ocean_only/single_column/BML/MOM_parameter_doc.short | 4 ++-- ocean_only/single_column/EPBL/MOM_parameter_doc.all | 4 ++-- ocean_only/single_column/EPBL/MOM_parameter_doc.short | 4 ++-- ocean_only/single_column/KPP/MOM_parameter_doc.all | 4 ++-- ocean_only/single_column/KPP/MOM_parameter_doc.short | 4 ++-- ocean_only/sloshing/layer/MOM_parameter_doc.all | 4 ++-- ocean_only/sloshing/layer/MOM_parameter_doc.short | 4 ++-- ocean_only/sloshing/rho/MOM_parameter_doc.all | 4 ++-- ocean_only/sloshing/rho/MOM_parameter_doc.short | 4 ++-- ocean_only/sloshing/z/MOM_parameter_doc.all | 4 ++-- ocean_only/sloshing/z/MOM_parameter_doc.short | 4 ++-- ocean_only/torus_advection_test/MOM_parameter_doc.all | 4 ++-- ocean_only/torus_advection_test/MOM_parameter_doc.short | 4 ++-- ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 4 ++-- ocean_only/tracer_mixing/rho/MOM_parameter_doc.short | 4 ++-- ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 4 ++-- ocean_only/tracer_mixing/z/MOM_parameter_doc.short | 4 ++-- ocean_only/unit_tests/MOM_parameter_doc.all | 4 ++-- ocean_only/unit_tests/MOM_parameter_doc.short | 4 ++-- src/MOM6 | 2 +- 119 files changed, 237 insertions(+), 237 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index 75af16f12c..b511b02732 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -193,8 +193,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -284,6 +282,8 @@ PARALLEL_RESTARTFILES = True ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short index 37c752e33d..39d9fce543 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short @@ -68,8 +68,6 @@ NJGLOBAL = 210 ! NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -136,6 +134,8 @@ PARALLEL_RESTARTFILES = True ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 17251086c0..612a514bc5 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -193,8 +193,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -284,6 +282,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short index 1c22e94996..ba0ca92058 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.short @@ -74,8 +74,6 @@ NJGLOBAL = 210 ! NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -139,6 +137,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 17251086c0..612a514bc5 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -193,8 +193,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -284,6 +282,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short index 1c22e94996..ba0ca92058 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.short @@ -74,8 +74,6 @@ NJGLOBAL = 210 ! NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -139,6 +137,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index b8729202ef..1a05ef1fea 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -193,8 +193,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -284,6 +282,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short index 3fc68ef25c..6ebb2068b8 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.short @@ -71,8 +71,6 @@ NJGLOBAL = 14 ! NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -136,6 +134,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === 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 2334fd7195..fb1e23fd36 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 @@ -210,8 +210,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 50 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -301,6 +299,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 4adf061446..a78f410b52 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 @@ -76,8 +76,6 @@ NJGLOBAL = 14 ! NK = 50 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -141,6 +139,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 47bb200393..19e798b34b 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -210,8 +210,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -303,6 +301,8 @@ ROTATION = "2omegasinlat" ! default = "2omegasinlat" OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 ! The rotation rate of the earth. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index affdb899d7..4e5fcedee3 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -88,8 +88,6 @@ NJGLOBAL = 1080 ! NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -162,6 +160,8 @@ CHANNEL_CONFIG = "list" ! default = "none" CHANNEL_LIST_FILE = "MOM_channels_global_025" ! default = "MOM_channel_list" ! The file from which the list of narrowed channels is read. +! === module MOM_tracer_registry === + ! === module MOM_EOS === DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 ! When TFREEZE_FORM=LINEAR, diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index f504e25104..35510687dc 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -210,8 +210,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -306,6 +304,8 @@ PARALLEL_RESTARTFILES = True ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index eec1e1665c..7906bb52d3 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -83,8 +83,6 @@ NJGLOBAL = 576 ! NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -158,6 +156,8 @@ PARALLEL_RESTARTFILES = True ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 ! When TFREEZE_FORM=LINEAR, diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index ae9f066b41..16ff44ea27 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -193,8 +193,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -284,6 +282,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short index d620a356d0..7dab5da967 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short @@ -74,8 +74,6 @@ NJGLOBAL = 210 ! NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -139,6 +137,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index d7830846e0..fc34f4f247 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -193,8 +193,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -284,6 +282,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short index 1f12e92703..d67e8ce4cc 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short @@ -74,8 +74,6 @@ NJGLOBAL = 210 ! NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -139,6 +137,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index d7830846e0..fc34f4f247 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -193,8 +193,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -284,6 +282,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short index 1f12e92703..d67e8ce4cc 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short @@ -74,8 +74,6 @@ NJGLOBAL = 210 ! NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -139,6 +137,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index 60b2c9c065..4e11d3e71f 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -210,8 +210,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -303,6 +301,8 @@ ROTATION = "2omegasinlat" ! default = "2omegasinlat" OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 ! The rotation rate of the earth. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short index 21df6b5c5f..41421ccd7f 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short @@ -93,8 +93,6 @@ NJGLOBAL = 320 ! NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -163,6 +161,8 @@ CHANNEL_CONFIG = "list" ! default = "none" CHANNEL_LIST_FILE = "MOM_channels_FLOR" ! default = "MOM_channel_list" ! The file from which the list of narrowed channels is read. +! === module MOM_tracer_registry === + ! === module MOM_EOS === TFREEZE_FORM = "MILLERO_78" ! default = "LINEAR" ! TFREEZE_FORM determines which expression should be 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 1dfc95a789..b5fffe30f7 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 @@ -185,8 +185,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -286,6 +284,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short index 4ce7d27067..b26295e97a 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short @@ -44,8 +44,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -107,6 +105,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 1dc0d62dc1..1d10e47374 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 @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short index aa2b93250f..c49608af9a 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short @@ -47,8 +47,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -110,6 +108,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 9f0b59e8fc..ada737dc95 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 @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short index 93c53c9295..0edaada4c2 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short @@ -47,8 +47,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -110,6 +108,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 47129b69b4..274304ac6e 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 @@ -185,8 +185,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -286,6 +284,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short index 94b051c559..0c0fe4b5d0 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short @@ -44,8 +44,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -107,6 +105,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 c4de754de7..0120e5a816 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 @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short index 20befa5d88..1efa91f798 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short @@ -47,8 +47,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -110,6 +108,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 650b127106..a548beeac4 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 @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short index b6d02a4bc0..311cfb4951 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short @@ -47,8 +47,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -110,6 +108,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 55fcf22941..f9b1d89f1e 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 @@ -185,8 +185,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -286,6 +284,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 faab566a01..06b6c49c26 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 @@ -44,8 +44,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -107,6 +105,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 a1d8bcf50a..84f536c6eb 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 @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 53f0e2fb23..e72d74c8a3 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 @@ -47,8 +47,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -110,6 +108,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 aa1184e2ee..81c846048d 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 @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 113d0f609d..ee7be697e2 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 @@ -47,8 +47,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -110,6 +108,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 85fa1b3968..c2a9f31a45 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 @@ -185,8 +185,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -286,6 +284,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 d97bc4cfd2..1b9da4480c 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 @@ -44,8 +44,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -107,6 +105,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 1bca34def8..92d08c2c28 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 @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 a89d645067..ac24bfd510 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 @@ -47,8 +47,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -110,6 +108,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 2c3acba786..cc15ab1471 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 @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 f14202295f..e0a3ab6c5b 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 @@ -47,8 +47,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 400 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -110,6 +108,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 2511921773..f4b3acf458 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -174,8 +174,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 25 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -304,6 +302,8 @@ USE_KELVIN_WAVE_OBC = False ! [Boolean] default = False USE_SHELFWAVE_OBC = False ! [Boolean] default = False ! If true, use the shelfwave open boundary. +! === module MOM_tracer_registry === + ! === module MOM_restart === RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. diff --git a/ocean_only/DOME/MOM_parameter_doc.short b/ocean_only/DOME/MOM_parameter_doc.short index ed98fa735e..e9cf4a61d9 100644 --- a/ocean_only/DOME/MOM_parameter_doc.short +++ b/ocean_only/DOME/MOM_parameter_doc.short @@ -52,8 +52,6 @@ RHO_0 = 1031.0 ! [kg m-3] default = 1035.0 NK = 25 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -130,6 +128,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! === module MOM_boundary_update === +! === module MOM_tracer_registry === + ! === module MOM_restart === ! === module MOM_tracer_flow_control === diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 1057637442..ff3e367287 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -174,8 +174,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 2 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -275,6 +273,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_restart === RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.short b/ocean_only/Phillips_2layer/MOM_parameter_doc.short index d54395c364..9f8d9509b5 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.short +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.short @@ -53,8 +53,6 @@ RHO_0 = 1031.0 ! [kg m-3] default = 1035.0 NK = 2 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -126,6 +124,8 @@ BETA = 2.0E-11 ! [m-1 s-1] default = 0.0 ! The northward gradient of the Coriolis parameter with ! the betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_restart === MAX_FIELDS = 50 ! default = 100 ! The maximum number of restart fields that can be used. diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index fd9351d6f3..90147fdf01 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 600 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index 0f8df5bc05..a91b69a84a 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -57,8 +57,6 @@ RHO_0 = 1027.0 ! [kg m-3] default = 1035.0 NK = 600 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -120,6 +118,8 @@ F_0 = 6.8103E-05 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 88bbf2fbb4..8d566b3732 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 25 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index f182bb755a..d29540c60b 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short @@ -62,8 +62,6 @@ ANGSTROM = 1.0E-15 ! [m] default = 1.0E-10 NK = 25 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -129,6 +127,8 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 1a877777fa..a5c3fbf1af 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 25 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index f2c2d16272..2e908b7215 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -58,8 +58,6 @@ ANGSTROM = 1.0E-15 ! [m] default = 1.0E-10 NK = 25 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -125,6 +123,8 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 3ee801b1eb..0e1eee250b 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 25 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index e65fce4dea..4020444659 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -58,8 +58,6 @@ ANGSTROM = 1.0E-15 ! [m] default = 1.0E-10 NK = 25 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -125,6 +123,8 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 2f498f49c7..1550e0274e 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -193,8 +193,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 22 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -302,6 +300,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index 9a9c4fbaee..e0dc72ec23 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -60,8 +60,6 @@ NJGLOBAL = 180 ! NK = 22 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -125,6 +123,8 @@ MAXIMUM_DEPTH = 5500.0 ! [m] ! === module MOM_open_boundary === ! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 91da169cef..3f7b3b8840 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -174,8 +174,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -324,6 +322,8 @@ USE_KELVIN_WAVE_OBC = False ! [Boolean] default = False USE_SHELFWAVE_OBC = False ! [Boolean] default = False ! If true, use the shelfwave open boundary. +! === module MOM_tracer_registry === + ! === module MOM_restart === RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.short b/ocean_only/circle_obcs/MOM_parameter_doc.short index 4fde17881a..58481feb4c 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.short +++ b/ocean_only/circle_obcs/MOM_parameter_doc.short @@ -47,8 +47,6 @@ RHO_0 = 1031.0 ! [kg m-3] default = 1035.0 NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -137,6 +135,8 @@ ROTATION = "beta" ! default = "2omegasinlat" ! === module MOM_boundary_update === +! === module MOM_tracer_registry === + ! === module MOM_restart === ! === module MOM_tracer_flow_control === diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 733ab6d5b0..dae510325c 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -174,8 +174,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 2 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -269,6 +267,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_restart === RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. diff --git a/ocean_only/double_gyre/MOM_parameter_doc.short b/ocean_only/double_gyre/MOM_parameter_doc.short index 42efd0cc21..3f4cb96b7a 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.short +++ b/ocean_only/double_gyre/MOM_parameter_doc.short @@ -49,8 +49,6 @@ NJGLOBAL = 40 ! NK = 2 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -104,6 +102,8 @@ MAXIMUM_DEPTH = 2000.0 ! [m] ! === module MOM_open_boundary === ! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +! === module MOM_tracer_registry === + ! === module MOM_restart === ! === module MOM_tracer_flow_control === diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 4d49c14737..009a532d5d 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 21 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index 99cc96d5e3..0e3749a5e6 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/ocean_only/external_gwave/MOM_parameter_doc.short @@ -60,8 +60,6 @@ ANGSTROM = 1.0E-15 ! [m] default = 1.0E-10 NK = 21 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -130,6 +128,8 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 0c9b8f0d4c..9f56a3ea5d 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 40 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -307,6 +305,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index acb9a9c96e..d4100300d1 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short @@ -51,8 +51,6 @@ NJGLOBAL = 4 ! NK = 40 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -123,6 +121,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 17a42aacf2..c591344b4f 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 40 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -307,6 +305,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index f4a845ae64..4e364b0bb9 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -47,8 +47,6 @@ NJGLOBAL = 4 ! NK = 40 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -119,6 +117,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index f6436056b3..eaa8e9b11c 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 40 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -307,6 +305,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index 65952a4505..d13eb5fc11 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -47,8 +47,6 @@ NJGLOBAL = 4 ! NK = 40 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -119,6 +117,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index a0e1e46b95..7c94657668 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 40 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -307,6 +305,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index 0932e87218..e24bee4c92 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -47,8 +47,6 @@ NJGLOBAL = 4 ! NK = 40 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -119,6 +117,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 1603e9e9d9..25c594e12f 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -210,8 +210,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 50 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -301,6 +299,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 2dd7cc8d19..2de3ef2e04 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -81,8 +81,6 @@ NJGLOBAL = 210 ! NK = 50 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -146,6 +144,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 2739384406..bccb7e4192 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -208,8 +208,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -299,6 +297,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.short b/ocean_only/global_ALE/layer/MOM_parameter_doc.short index 5b8d79ac60..b73176d59b 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.short @@ -78,8 +78,6 @@ NJGLOBAL = 210 ! NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -143,6 +141,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index a1e17ca05d..b4f1760dfb 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -210,8 +210,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 50 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -301,6 +299,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index d017a40caa..0bf8c9ea54 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -81,8 +81,6 @@ NJGLOBAL = 210 ! NK = 50 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -146,6 +144,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 3e18d7fe52..2f2b92f2ea 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 21 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index ed17d75bff..b1a6a4d699 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/ocean_only/lock_exchange/MOM_parameter_doc.short @@ -53,8 +53,6 @@ ANGSTROM = 1.0E-15 ! [m] default = 1.0E-10 NK = 21 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -123,6 +121,8 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state 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 2d6fd86333..d603e40254 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 40 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short index 8e0152deab..dc794ab79f 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -38,8 +38,6 @@ RHO_0 = 1000.0 ! [kg m-3] default = 1035.0 NK = 40 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -108,6 +106,8 @@ F_0 = 1.0E-04 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index a547b3faf9..a648b2a0a2 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -193,8 +193,6 @@ H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -284,6 +282,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index 1d54f4f067..8ab3ab21af 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -76,8 +76,6 @@ BOUSSINESQ = False ! [Boolean] default = True NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -141,6 +139,8 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 41a9868c38..e1528604f5 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 9 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/resting/layer/MOM_parameter_doc.short b/ocean_only/resting/layer/MOM_parameter_doc.short index 63ab58ceff..f632b96194 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.short +++ b/ocean_only/resting/layer/MOM_parameter_doc.short @@ -42,8 +42,6 @@ NJGLOBAL = 2 ! NK = 9 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -109,6 +107,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index adcc288acd..366c39651d 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 9 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/resting/z/MOM_parameter_doc.short b/ocean_only/resting/z/MOM_parameter_doc.short index c757f68578..575e16fe03 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.short +++ b/ocean_only/resting/z/MOM_parameter_doc.short @@ -38,8 +38,6 @@ NJGLOBAL = 2 ! NK = 9 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -105,6 +103,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 246daa7cd2..b9716fbc08 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 20 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -307,6 +305,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index b2d37b80fe..1eb078341b 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/ocean_only/seamount/layer/MOM_parameter_doc.short @@ -44,8 +44,6 @@ NJGLOBAL = 2 ! NK = 20 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -114,6 +112,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 26d7e25134..34af42fafb 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 20 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -307,6 +305,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index b070a55011..eaf32ed6bb 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -40,8 +40,6 @@ NJGLOBAL = 2 ! NK = 20 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -110,6 +108,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 7c3dc88e7e..29563dfd65 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 20 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -307,6 +305,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index 3173fbc893..1704312fd3 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -40,8 +40,6 @@ NJGLOBAL = 2 ! NK = 20 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -110,6 +108,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 29b7ec5598..f64ffb09dc 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 20 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -307,6 +305,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index 0fdaf63e0c..c5cb14d98e 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -40,8 +40,6 @@ NJGLOBAL = 2 ! NK = 20 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -110,6 +108,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 450282d661..3735d819e5 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -185,8 +185,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -286,6 +284,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.short b/ocean_only/single_column/BML/MOM_parameter_doc.short index 0de1b0f376..91bbc55cbb 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.short +++ b/ocean_only/single_column/BML/MOM_parameter_doc.short @@ -47,8 +47,6 @@ NJGLOBAL = 2 ! NK = 63 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -112,6 +110,8 @@ F_0 = 7.59943E-05 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index bf294fc594..718d26b225 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.short b/ocean_only/single_column/EPBL/MOM_parameter_doc.short index 6acab15b50..d303bf9ec0 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.short +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.short @@ -50,8 +50,6 @@ NJGLOBAL = 2 ! NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -115,6 +113,8 @@ F_0 = 7.59943E-05 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index dd05b3beab..ce9a0d3b7e 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -187,8 +187,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -288,6 +286,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "WRIGHT" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.short b/ocean_only/single_column/KPP/MOM_parameter_doc.short index aa39a6a943..4ce7830f2a 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.short +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.short @@ -50,8 +50,6 @@ NJGLOBAL = 2 ! NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/BATS" ! default = "." ! The directory in which input files are found. @@ -115,6 +113,8 @@ F_0 = 7.59943E-05 ! [s-1] default = 0.0 ! The reference value of the Coriolis parameter with the ! betaplane option. +! === module MOM_tracer_registry === + ! === module MOM_EOS === ! === module MOM_restart === diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index d435e6086d..9ee4cb61f1 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -299,6 +297,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index 1a95ed20b3..2121c880f6 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.short @@ -42,8 +42,6 @@ NJGLOBAL = 2 ! NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -112,6 +110,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 9a6e339158..fcbc055687 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -299,6 +297,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index 5e015b1d18..b72193827b 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -38,8 +38,6 @@ NJGLOBAL = 2 ! NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -108,6 +106,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index d814969677..03264c65e1 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -299,6 +297,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index b50c7d8171..144e91ba97 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -38,8 +38,6 @@ NJGLOBAL = 2 ! NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT/" ! default = "." ! The directory in which input files are found. @@ -108,6 +106,8 @@ ROTATION = "betaplane" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 859835e50e..eca1913759 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 5 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.short b/ocean_only/torus_advection_test/MOM_parameter_doc.short index ab1907daa9..175d20bc69 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.short +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.short @@ -58,8 +58,6 @@ ANGSTROM = 0.0 ! [m] default = 1.0E-10 NK = 5 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -125,6 +123,8 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index d217894cfd..683a070032 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short index caf46fcc9a..1f6f791b9b 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short @@ -51,8 +51,6 @@ ANGSTROM = 1.0E-15 ! [m] default = 1.0E-10 NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -118,6 +116,8 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index 3b34090e98..28d3896b5a 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -195,8 +195,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -296,6 +294,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short index f8f46c190b..592bd210b8 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short @@ -51,8 +51,6 @@ ANGSTROM = 1.0E-15 ! [m] default = 1.0E-10 NK = 10 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -118,6 +116,8 @@ ROTATION = "beta" ! default = "2omegasinlat" ! betaplane - Use a beta-plane or f-plane. ! USER - call a user modified routine. +! === module MOM_tracer_registry === + ! === module MOM_EOS === EQN_OF_STATE = "LINEAR" ! default = "WRIGHT" ! EQN_OF_STATE determines which ocean equation of state diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 8df602f427..3fa9765ad3 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -166,8 +166,6 @@ H_TO_M = 1.0 ! [m H-1] default = 1.0 NK = 1 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === INPUTDIR = "." ! default = "." ! The directory in which input files are found. @@ -263,6 +261,8 @@ PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated +! === module MOM_tracer_registry === + ! === module MOM_restart === RESTARTFILE = "MOM.res" ! default = "MOM.res" ! The name-root of the restart file. diff --git a/ocean_only/unit_tests/MOM_parameter_doc.short b/ocean_only/unit_tests/MOM_parameter_doc.short index 129e38217e..cd8dbb183d 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.short +++ b/ocean_only/unit_tests/MOM_parameter_doc.short @@ -37,8 +37,6 @@ NJGLOBAL = 4 ! NK = 1 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - ! === module MOM_fixed_initialization === ! === module MOM_grid_init === @@ -89,6 +87,8 @@ MAXIMUM_DEPTH = 100.0 ! [m] ! === module MOM_open_boundary === ! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +! === module MOM_tracer_registry === + ! === module MOM_restart === ! === module MOM_tracer_flow_control === diff --git a/src/MOM6 b/src/MOM6 index ab8ac34b75..e153f79ab0 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit ab8ac34b75d9df9ba3be32dcf9e598101c06bc88 +Subproject commit e153f79ab0d3b357972bec90515d360242a1f52b From 5ea008006882ae805b435f055ffdc749fc702a90 Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Tue, 12 Sep 2017 16:29:10 -0400 Subject: [PATCH 10/89] *Change barotropic solver used by CM2G63L Changed version of the barotropic splitting used by the CM2G63L test case to move to the modern version used by all other test cases and open the way to obsolete USE_LEGACY_SPLIT and related parameters. This deliberate change of settings changes the answers and MOM_parameter_doc files for CM2G63L. --- coupled_AM2_LM3_SIS/CM2G63L/MOM_input | 40 +++++--------- .../CM2G63L/MOM_parameter_doc.all | 53 ++++++++----------- .../CM2G63L/MOM_parameter_doc.short | 53 +------------------ 3 files changed, 37 insertions(+), 109 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_input b/coupled_AM2_LM3_SIS/CM2G63L/MOM_input index 48c4f05934..914d005e99 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_input +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_input @@ -2,7 +2,8 @@ the Modular Ocean Model (MOM6), a numerical ocean model developed at NOAA-GFDL. Where appropriate, parameters use usually given in MKS units. - This particular file is for the example in CM2G63L. + This particular file is for the example in CM2G63L, now modified to avoid + the use of the legacy barotropic solver. This MOM_input file typically contains only the non-default values that are needed to reproduce this example. A full list of parameters for this example @@ -52,7 +53,7 @@ NJGLOBAL = 210 ! ! STATIC_MEMORY_ this is set in MOM_memory.h at compile time. !LAYOUT = 10, 6 ! ! The processor layout that was acutally used. -IO_LAYOUT = 2, 2 ! default = 0 +IO_LAYOUT = 1, 1 ! default = 0 ! The processor layout to be used, or 0,0 to automatically ! set the io_layout to be the same as the layout. @@ -65,7 +66,7 @@ NK = 63 ! [nondim] ! Parameters providing information about the vertical grid. ! === module MOM === -USE_LEGACY_SPLIT = True ! [Boolean] default = False +USE_LEGACY_SPLIT = False ! [Boolean] default = False ! If true, use the full range of options available from ! the older GOLD-derived split time stepping code. THICKNESSDIFFUSE = True ! [Boolean] default = False @@ -110,7 +111,7 @@ SAVE_INITIAL_CONDS = True ! [Boolean] default = False ! by IC_OUTPUT_FILE. ! === module MOM_tracer_registry === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False +PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated @@ -237,17 +238,6 @@ VISBECK_L_SCALE = 3.0E+04 ! [m] default = 0.0 ! The fixed length scale in the Visbeck formula. ! === module MOM_wave_speed === -FLUX_BT_COUPLING = True ! [Boolean] default = False - ! If true, use mass fluxes to ensure consistency between - ! the baroclinic and barotropic modes. This is only used - ! if SPLIT is true. -READJUST_BT_TRANS = True ! [Boolean] default = False - ! If true, make a barotropic adjustment to the layer - ! velocities after the thermodynamic part of the step - ! to ensure that the interaction between the thermodynamics - ! and the continuity solver do not change the barotropic - ! transport. This is only used if FLUX_BT_COUPLING and - ! SPLIT are true. MONOTONIC_CONTINUITY = True ! [Boolean] default = False ! If true, CONTINUITY_PPM uses the Colella and Woodward ! monotonic limiter. The default (false) is to use a @@ -259,7 +249,7 @@ ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09 ! tolerance for SSH is 4 times this value. The default ! is 0.5*NK*ANGSTROM, and this should not be set less x ! than about 10^-15*MAXIMUM_DEPTH. -CONTINUITY_CFL_LIMIT = 1.0 ! [nondim] default = 0.5 +CONTINUITY_CFL_LIMIT = 0.5 ! [nondim] default = 0.5 ! The maximum CFL of the adjusted velocities. CONT_PPM_BETTER_ITER = False ! [Boolean] default = True ! If true, stop corrective iterations using a velocity @@ -289,7 +279,7 @@ KH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 ! viscosity, the Smagorinsky viscosity and KH. AH_VEL_SCALE = 0.05 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the cube of - ! the grid spacing to calculate the Laplacian viscosity. + ! the grid spacing to calculate the biharmonic viscosity. ! The final viscosity is the largest of this scaled ! viscosity, the Smagorinsky viscosity and AH. SMAGORINSKY_AH = True ! [Boolean] default = False @@ -363,7 +353,7 @@ BOUND_BT_CORRECTION = True ! [Boolean] default = False ! The barotropic x-halo size that is actually used. !BT y-halo = 0 ! ! The barotropic y-halo size that is actually used. -USE_BT_CONT_TYPE = False ! [Boolean] default = True +USE_BT_CONT_TYPE = True ! [Boolean] default = True ! If true, use a structure with elements that describe ! effective face areas from the summed continuity solver ! as a function the barotropic flow in coupling between @@ -373,23 +363,17 @@ NONLINEAR_BT_CONTINUITY = True ! [Boolean] default = False ! If true, use nonlinear transports in the barotropic ! continuity equation. This does not apply if ! USE_BT_CONT_TYPE is true. -RESCALE_BT_FACE_AREAS = True ! [Boolean] default = False - ! If true, the face areas used by the barotropic solver - ! are rescaled to approximately reflect the open face - ! areas of the interior layers. This probably requires - ! FLUX_BT_COUPLING to work, and should not be used with - ! USE_BT_CONT_TYPE. -BT_THICK_SCHEME = "HYBRID" ! default = "FROM_BT_CONT" +BT_THICK_SCHEME = "FROM_BT_CONT" ! default = "FROM_BT_CONT" ! A string describing the scheme that is used to set the ! open face areas used for barotropic transport and the ! relative weights of the accelerations. Valid values are: ! ARITHMETIC - arithmetic mean layer thicknesses ! HARMONIC - harmonic mean layer thicknesses - ! HYBRID (the default) - use arithmetic means for + ! HYBRID - use arithmetic means for ! layers above the shallowest bottom, the harmonic ! mean for layers below, and a weighted average for ! layers that straddle that depth - ! FROM_BT_CONT - use the average thicknesses kept + ! FROM_BT_CONT (the default) - use the average thicknesses kept ! in the h_u and h_v fields of the BT_cont_type BT_STRONG_DRAG = False ! [Boolean] default = True ! If true, use a stronger estimate of the retarding @@ -590,7 +574,7 @@ VAR_PEN_SW = True ! [Boolean] default = False ! If true, use one of the CHL_A schemes specified by ! OPACITY_SCHEME to determine the e-folding depth of ! incoming short wave radiation. -CHL_FILE = "/seawifs_1998-2006_GOLD_smoothed_2X.nc" ! +CHL_FILE = "seawifs_1998-2006_GOLD_smoothed_2X.nc" ! ! CHL_FILE is the file containing chl_a concentrations in ! the variable CHL_A. It is used when VAR_PEN_SW and ! CHL_FROM_FILE are true. diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index b511b02732..abbef9ce35 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -10,7 +10,7 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = True ! [Boolean] default = False +USE_LEGACY_SPLIT = False ! [Boolean] default = False ! If true, use the full range of options available from ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False @@ -278,7 +278,7 @@ ROTATION = "2omegasinlat" ! default = "2omegasinlat" ! USER - call a user modified routine. OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 ! The rotation rate of the earth. -PARALLEL_RESTARTFILES = True ! [Boolean] default = False +PARALLEL_RESTARTFILES = False ! [Boolean] default = False ! If true, each processor writes its own restart file, ! otherwise a single restart file is generated @@ -747,17 +747,6 @@ BEGW = 0.0 ! [nondim] default = 0.0 ! Euler (1). 0 is almost always used. ! If SPLIT is false and USE_RK2 is true, BEGW can be ! between 0 and 0.5 to damp gravity waves. -FLUX_BT_COUPLING = True ! [Boolean] default = False - ! If true, use mass fluxes to ensure consistency between - ! the baroclinic and barotropic modes. This is only used - ! if SPLIT is true. -READJUST_BT_TRANS = True ! [Boolean] default = False - ! If true, make a barotropic adjustment to the layer - ! velocities after the thermodynamic part of the step - ! to ensure that the interaction between the thermodynamics - ! and the continuity solver do not change the barotropic - ! transport. This is only used if FLUX_BT_COUPLING and - ! SPLIT are true. SPLIT_BOTTOM_STRESS = False ! [Boolean] default = False ! If true, provide the bottom stress calculated by the ! vertical viscosity to the barotropic solver. @@ -815,7 +804,7 @@ CONT_PPM_VOLUME_BASED_CFL = False ! [Boolean] default = False ! If true, use the ratio of the open face lengths to the ! tracer cell areas when estimating CFL numbers. The ! default is set by CONT_PPM_AGGRESS_ADJUST. -CONTINUITY_CFL_LIMIT = 1.0 ! [nondim] default = 0.5 +CONTINUITY_CFL_LIMIT = 0.5 ! [nondim] default = 0.5 ! The maximum CFL of the adjusted velocities. CONT_PPM_BETTER_ITER = False ! [Boolean] default = True ! If true, stop corrective iterations using a velocity @@ -999,14 +988,27 @@ MAX_TRUNC_FILE_SIZE_PER_PE = 50 ! default = 50 BOUND_BT_CORRECTION = True ! [Boolean] default = False ! If true, the corrective pseudo mass-fluxes into the ! barotropic solver are limited to values that require - ! less than 0.1*MAXVEL to be accommodated. + ! less than maxCFL_BT_cont to be accommodated. +BT_CONT_CORR_BOUNDS = True ! [Boolean] default = True + ! If true, and BOUND_BT_CORRECTION is true, use the + ! BT_cont_type variables to set limits determined by + ! MAXCFL_BT_CONT on the CFL number of the velocites + ! that are likely to be driven by the corrective mass fluxes. +ADJUST_BT_CONT = False ! [Boolean] default = False + ! If true, adjust the curve fit to the BT_cont type + ! that is used by the barotropic solver to match the + ! transport about which the flow is being linearized. GRADUAL_BT_ICS = False ! [Boolean] default = False ! If true, adjust the initial conditions for the ! barotropic solver to the values from the layered ! solution over a whole timestep instead of instantly. ! This is a decent approximation to the inclusion of ! sum(u dh_dt) while also correcting for truncation errors. -USE_BT_CONT_TYPE = False ! [Boolean] default = True +BT_USE_VISC_REM_U_UH0 = False ! [Boolean] default = False + ! If true, use the viscous remnants when estimating the + ! barotropic velocities that were used to calculate uh0 + ! and vh0. False is probably the better choice. +USE_BT_CONT_TYPE = True ! [Boolean] default = True ! If true, use a structure with elements that describe ! effective face areas from the summed continuity solver ! as a function the barotropic flow in coupling between @@ -1020,12 +1022,6 @@ NONLIN_BT_CONT_UPDATE_PERIOD = 1 ! [nondim] default = 1 ! If NONLINEAR_BT_CONTINUITY is true, this is the number ! of barotropic time steps between updates to the face ! areas, or 0 to update only before the barotropic stepping. -RESCALE_BT_FACE_AREAS = True ! [Boolean] default = False - ! If true, the face areas used by the barotropic solver - ! are rescaled to approximately reflect the open face - ! areas of the interior layers. This probably requires - ! FLUX_BT_COUPLING to work, and should not be used with - ! USE_BT_CONT_TYPE. BT_MASS_SOURCE_LIMIT = 0.0 ! [nondim] default = 0.0 ! The fraction of the initial depth of the ocean that can ! be added to or removed from the bartropic solution @@ -1048,7 +1044,7 @@ SADOURNY = True ! [Boolean] default = True ! the Arakawa & Hsu scheme is used. If the internal ! deformation radius is not resolved, the Sadourny scheme ! should probably be used. -BT_THICK_SCHEME = "HYBRID" ! default = "FROM_BT_CONT" +BT_THICK_SCHEME = "FROM_BT_CONT" ! default = "FROM_BT_CONT" ! A string describing the scheme that is used to set the ! open face areas used for barotropic transport and the ! relative weights of the accelerations. Valid values are: @@ -1060,10 +1056,7 @@ BT_THICK_SCHEME = "HYBRID" ! default = "FROM_BT_CONT" ! layers that straddle that depth ! FROM_BT_CONT - use the average thicknesses kept ! in the h_u and h_v fields of the BT_cont_type -APPLY_BT_DRAG = True ! [Boolean] default = True - ! If defined, bottom drag is applied within the - ! barotropic solver. -BT_STRONG_DRAG = False ! [Boolean] default = True +BT_STRONG_DRAG = False ! [Boolean] default = False ! If true, use a stronger estimate of the retarding ! effects of strong bottom drag, by making it implicit ! with the barotropic time-step instead of implicit with @@ -1071,9 +1064,9 @@ BT_STRONG_DRAG = False ! [Boolean] default = True ! barotropic steps. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed - ! MAXVEL. This should only be used as a desperate + ! CFL_TRUNCATE. This should only be used as a desperate ! debugging measure. -MAXCFL_BT_CONT = 0.1 ! [nondim] default = 0.1 +MAXCFL_BT_CONT = 0.25 ! [nondim] default = 0.25 ! The maximum permitted CFL number associated with the ! barotropic accelerations from the summed velocities ! times the time-derivatives of thicknesses. @@ -1641,7 +1634,7 @@ OPACITY_SCHEME = "MANIZZA_05" ! default = "MANIZZA_05" ! MOREL_88 - Use Morel, JGR, 1988. CHL_FROM_FILE = True ! [Boolean] default = True ! If true, chl_a is read from a file. -CHL_FILE = "/seawifs_1998-2006_GOLD_smoothed_2X.nc" ! +CHL_FILE = "seawifs_1998-2006_GOLD_smoothed_2X.nc" ! ! CHL_FILE is the file containing chl_a concentrations in ! the variable CHL_A. It is used when VAR_PEN_SW and ! CHL_FROM_FILE are true. diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short index 39d9fce543..c9ddfc67cb 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.short @@ -1,9 +1,6 @@ ! This file was written by the model and records the non-default parameters used at run-time. ! === module MOM === -USE_LEGACY_SPLIT = True ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. THICKNESSDIFFUSE = True ! [Boolean] default = False ! If true, interface heights are diffused with a ! coefficient of KHTH. @@ -130,9 +127,6 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! test case. ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated ! === module MOM_tracer_registry === @@ -268,17 +262,6 @@ KV_BBL_MIN = 0.0 ! [m2 s-1] default = 1.0E-04 ! The minimum viscosities in the bottom boundary layer. KV_TBL_MIN = 0.0 ! [m2 s-1] default = 1.0E-04 ! The minimum viscosities in the top boundary layer. -FLUX_BT_COUPLING = True ! [Boolean] default = False - ! If true, use mass fluxes to ensure consistency between - ! the baroclinic and barotropic modes. This is only used - ! if SPLIT is true. -READJUST_BT_TRANS = True ! [Boolean] default = False - ! If true, make a barotropic adjustment to the layer - ! velocities after the thermodynamic part of the step - ! to ensure that the interaction between the thermodynamics - ! and the continuity solver do not change the barotropic - ! transport. This is only used if FLUX_BT_COUPLING and - ! SPLIT are true. ! === module MOM_continuity === @@ -294,8 +277,6 @@ ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09 ! tolerance for SSH is 4 times this value. The default ! is 0.5*NK*ANGSTROM, and this should not be set less x ! than about 10^-15*MAXIMUM_DEPTH. -CONTINUITY_CFL_LIMIT = 1.0 ! [nondim] default = 0.5 - ! The maximum CFL of the adjusted velocities. CONT_PPM_BETTER_ITER = False ! [Boolean] default = True ! If true, stop corrective iterations using a velocity ! based criterion and only stop if the iteration is @@ -361,41 +342,11 @@ MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 BOUND_BT_CORRECTION = True ! [Boolean] default = False ! If true, the corrective pseudo mass-fluxes into the ! barotropic solver are limited to values that require - ! less than 0.1*MAXVEL to be accommodated. -USE_BT_CONT_TYPE = False ! [Boolean] default = True - ! If true, use a structure with elements that describe - ! effective face areas from the summed continuity solver - ! as a function the barotropic flow in coupling between - ! the barotropic and baroclinic flow. This is only used - ! if SPLIT is true. + ! less than maxCFL_BT_cont to be accommodated. NONLINEAR_BT_CONTINUITY = True ! [Boolean] default = False ! If true, use nonlinear transports in the barotropic ! continuity equation. This does not apply if ! USE_BT_CONT_TYPE is true. -RESCALE_BT_FACE_AREAS = True ! [Boolean] default = False - ! If true, the face areas used by the barotropic solver - ! are rescaled to approximately reflect the open face - ! areas of the interior layers. This probably requires - ! FLUX_BT_COUPLING to work, and should not be used with - ! USE_BT_CONT_TYPE. -BT_THICK_SCHEME = "HYBRID" ! default = "FROM_BT_CONT" - ! A string describing the scheme that is used to set the - ! open face areas used for barotropic transport and the - ! relative weights of the accelerations. Valid values are: - ! ARITHMETIC - arithmetic mean layer thicknesses - ! HARMONIC - harmonic mean layer thicknesses - ! HYBRID (the default) - use arithmetic means for - ! layers above the shallowest bottom, the harmonic - ! mean for layers below, and a weighted average for - ! layers that straddle that depth - ! FROM_BT_CONT - use the average thicknesses kept - ! in the h_u and h_v fields of the BT_cont_type -BT_STRONG_DRAG = False ! [Boolean] default = True - ! If true, use a stronger estimate of the retarding - ! effects of strong bottom drag, by making it implicit - ! with the barotropic time-step instead of implicit with - ! the baroclinic time-step and dividing by the number of - ! barotropic steps. DT_BT_FILTER = 0.0 ! [sec or nondim] default = -0.25 ! A time-scale over which the barotropic mode solutions ! are filtered, in seconds if positive, or as a fraction @@ -599,7 +550,7 @@ VAR_PEN_SW = True ! [Boolean] default = False ! If true, use one of the CHL_A schemes specified by ! OPACITY_SCHEME to determine the e-folding depth of ! incoming short wave radiation. -CHL_FILE = "/seawifs_1998-2006_GOLD_smoothed_2X.nc" ! +CHL_FILE = "seawifs_1998-2006_GOLD_smoothed_2X.nc" ! ! CHL_FILE is the file containing chl_a concentrations in ! the variable CHL_A. It is used when VAR_PEN_SW and ! CHL_FROM_FILE are true. From 47f9e96d8da1f233c20c734dabb2e06b741e7fd9 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 13 Sep 2017 09:39:05 -0400 Subject: [PATCH 11/89] Cleaned up MOM_input for CM2G63L - 5ea0080068 updated MOM_input and generated files but a diff between MOM_input and MOM_parameter_doc.short (which should only reveal the boiler plate at the top of the file) showed that MOM_input was very out of date. I've updated MOM_input to reflect the latest documentation/order so that the diff is minimal. - IO_LAYOUT had been changed but MOM_parameter_doc.layout was not updated - now corrected. --- coupled_AM2_LM3_SIS/CM2G63L/MOM_input | 388 +++++++++--------- .../CM2G63L/MOM_parameter_doc.layout | 2 +- 2 files changed, 192 insertions(+), 198 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_input b/coupled_AM2_LM3_SIS/CM2G63L/MOM_input index 914d005e99..348bd4fd2a 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_input +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_input @@ -10,68 +10,11 @@ can be found in the corresponding MOM_parameter_doc.all file which is generated by the model at run-time. */ -TRIPOLAR_N = True ! [Boolean] default = False - ! Use tripolar connectivity at the northern edge of the - ! domain. With TRIPOLAR_N, NIGLOBAL must be even. -!SYMMETRIC_MEMORY_ = False ! [Boolean] - ! If defined, the velocity point data domain includes - ! every face of the thickness points. In other words, - ! some arrays are larger than others, depending on where - ! they are on the staggered grid. Also, the starting - ! index of the velocity-point arrays is usually 0, not 1. - ! This can only be set at compile time. -!STATIC_MEMORY_ = False ! [Boolean] - ! If STATIC_MEMORY_ is defined, the principle variables - ! will have sizes that are statically determined at - ! compile time. Otherwise the sizes are not determined - ! until run time. The STATIC option is substantially - ! faster, but does not allow the PE count to be changed - ! at run time. This can only be set at compile time. -NIHALO = 4 ! default = 2 - ! The number of halo points on each side in the - ! x-direction. With STATIC_MEMORY_ this is set as NIHALO_ - ! in MOM_memory.h at compile time; without STATIC_MEMORY_ - ! the default is NIHALO_ in MOM_memory.h (if defined) or 2. -NJHALO = 4 ! default = 2 - ! The number of halo points on each side in the - ! y-direction. With STATIC_MEMORY_ this is set as NJHALO_ - ! in MOM_memory.h at compile time; without STATIC_MEMORY_ - ! the default is NJHALO_ in MOM_memory.h (if defined) or 2. -NIGLOBAL = 360 ! - ! The total number of thickness grid points in the - ! x-direction in the physical domain. With STATIC_MEMORY_ - ! this is set in MOM_memory.h at compile time. -NJGLOBAL = 210 ! - ! The total number of thickness grid points in the - ! y-direction in the physical domain. With STATIC_MEMORY_ - ! this is set in MOM_memory.h at compile time. -!NIPROC = 10 ! - ! The number of processors in the x-direction. With - ! STATIC_MEMORY_ this is set in MOM_memory.h at compile time. -!NJPROC = 6 ! - ! The number of processors in the x-direction. With - ! STATIC_MEMORY_ this is set in MOM_memory.h at compile time. -!LAYOUT = 10, 6 ! - ! The processor layout that was acutally used. -IO_LAYOUT = 1, 1 ! default = 0 - ! The processor layout to be used, or 0,0 to automatically - ! set the io_layout to be the same as the layout. - -! === module MOM_grid === -! Parameters providing information about the vertical grid. -NK = 63 ! [nondim] - ! The number of model layers. - -! === module MOM_verticalGrid === -! Parameters providing information about the vertical grid. ! === module MOM === -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. THICKNESSDIFFUSE = True ! [Boolean] default = False - ! If true, interfaces or isopycnal surfaces are diffused, - ! depending on the value of FULL_THICKNESSDIFFUSE. + ! If true, interface heights are diffused with a + ! coefficient of KHTH. THICKNESSDIFFUSE_FIRST = True ! [Boolean] default = False ! If true, do thickness diffusion before dynamics. ! This is only used if THICKNESSDIFFUSE is true. @@ -83,8 +26,10 @@ DT = 3600.0 ! [s] DT_THERM = 7200.0 ! [s] default = 3600.0 ! The thermodynamic and tracer advection time step. ! Ideally DT_THERM should be an integer multiple of DT - ! and less than the forcing or coupling time-step. - ! By default DT_THERM is set to DT. + ! and less than the forcing or coupling time-step, unless + ! THERMO_SPANS_COUPLING is true, in which case DT_THERM + ! can be an integer multiple of the coupling timestep. By + ! default DT_THERM is set to DT. MIN_Z_DIAG_INTERVAL = 2.16E+04 ! [s] default = 0.0 ! The minimum amount of time in seconds between ! calculations of depth-space diagnostics. Making this @@ -110,38 +55,30 @@ SAVE_INITIAL_CONDS = True ! [Boolean] default = False ! If true, write the initial conditions to a file given ! by IC_OUTPUT_FILE. -! === module MOM_tracer_registry === -PARALLEL_RESTARTFILES = False ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated +! === module MOM_domains === +TRIPOLAR_N = True ! [Boolean] default = False + ! Use tripolar connectivity at the northern edge of the + ! domain. With TRIPOLAR_N, NIGLOBAL must be even. +NIGLOBAL = 360 ! + ! The total number of thickness grid points in the + ! x-direction in the physical domain. With STATIC_MEMORY_ + ! this is set in MOM_memory.h at compile time. +NJGLOBAL = 210 ! + ! The total number of thickness grid points in the + ! y-direction in the physical domain. With STATIC_MEMORY_ + ! this is set in MOM_memory.h at compile time. -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. -USE_OCMIP2_CFC = True ! [Boolean] default = False - ! If true, use the MOM_OCMIP2_CFC tracer package. +! === module MOM_hor_index === +! Sets the horizontal array index types. -! === module ideal_age_example === +! === module MOM_verticalGrid === +! Parameters providing information about the vertical grid. +NK = 63 ! [nondim] + ! The number of model layers. -! === module MOM_OCMIP2_CFC === +! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. -COORD_CONFIG = "file" ! - ! This specifies how layers are to be defined: - ! file - read coordinate information from the file - ! specified by (COORD_FILE). - ! linear - linear based on interfaces not layesrs. - ! ts_ref - use reference temperature and salinity - ! ts_range - use range of temperature and salinity - ! (T_REF and S_REF) to determine surface density - ! and GINT calculate internal densities. - ! gprime - use reference density (RHO_0) for surface - ! density and GINT calculate internal densities. - ! ts_profile - use temperature and salinity profiles - ! (read from COORD_FILE) to set layer densities. - ! USER - call a user modified routine. -COORD_FILE = "Vertical_coordinate.nc" ! - ! The file from which the coordinate densities are read. ! === module MOM_grid_init === GRID_CONFIG = "mosaic" ! @@ -166,11 +103,19 @@ TOPO_CONFIG = "file" ! ! halfpipe - a zonally uniform channel with a half-sine ! profile in the meridional direction. ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. ! DOME2D - use a shelf and slope configuration for the ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. ! USER - call a user modified routine. MAXIMUM_DEPTH = 6000.0 ! [m] ! The maximum depth of the ocean. @@ -178,7 +123,10 @@ MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 ! If MASKING_DEPTH is unspecified, then anything shallower than ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. ! If MASKING_DEPTH is specified, then all depths shallower than - ! MINIMUM_DEPTH but depper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. CHANNEL_CONFIG = "global_1deg" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: @@ -190,24 +138,73 @@ CHANNEL_CONFIG = "global_1deg" ! default = "none" ! test case. ! file - Read open face widths everywhere from a ! NetCDF file on the model grid. + +! === module MOM_tracer_registry === + +! === module MOM_EOS === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_OCMIP2_CFC = True ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. + +! === module ideal_age_example === + +! === module MOM_OCMIP2_CFC === + +! === module MOM_coord_initialization === +COORD_CONFIG = "file" ! + ! This specifies how layers are to be defined: + ! ALE or none - used to avoid defining layers in ALE mode + ! file - read coordinate information from the file + ! specified by (COORD_FILE). + ! BFB - Custom coords for buoyancy-forced basin case + ! based on SST_S, T_BOT and DRHO_DT. + ! linear - linear based on interfaces not layers + ! layer_ref - linear based on layer densities + ! ts_ref - use reference temperature and salinity + ! ts_range - use range of temperature and salinity + ! (T_REF and S_REF) to determine surface density + ! and GINT calculate internal densities. + ! gprime - use reference density (RHO_0) for surface + ! density and GINT calculate internal densities. + ! ts_profile - use temperature and salinity profiles + ! (read from COORD_FILE) to set layer densities. + ! USER - call a user modified routine. +COORD_FILE = "Vertical_coordinate.nc" ! + ! The file from which the coordinate densities are read. + +! === module MOM_grid === +! Parameters providing information about the lateral grid. + +! === module MOM_state_initialization === INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False ! If true, intialize the layer thicknesses, temperatures, ! and salnities from a Z-space file on a latitude- ! longitude grid. + +! === module MOM_initialize_layers_from_Z === TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc" ! The name of the z-space input file used to initialize - ! the layer thicknesses, temperatures and salinities. + ! temperatures (T) and salinities (S). If T and S are not + ! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE + ! must be set. Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp" ! The name of the potential temperature variable in - ! TEMP_SALT_Z_INIT_FILE. + ! TEMP_Z_INIT_FILE. Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt" ! The name of the salinity variable in - ! TEMP_SALT_Z_INIT_FILE. + ! SALT_Z_INIT_FILE. ADJUST_THICKNESS = True ! [Boolean] default = False ! If true, all mass below the bottom removed if the ! topography is shallower than the thickness input file ! would indicate. +! === module MOM_diag_mediator === + ! === module MOM_MEKE === ! === module MOM_lateral_mixing_coeffs === @@ -237,7 +234,49 @@ VARMIX_KTOP = 6 ! [nondim] default = 2 VISBECK_L_SCALE = 3.0E+04 ! [m] default = 0.0 ! The fixed length scale in the Visbeck formula. -! === module MOM_wave_speed === +! === module MOM_set_visc === +CHANNEL_DRAG = True ! [Boolean] default = False + ! If true, the bottom drag is exerted directly on each + ! layer proportional to the fraction of the bottom it + ! overlies. +PRANDTL_TURB = 0.0 ! [nondim] default = 1.0 + ! The turbulent Prandtl number applied to shear + ! instability. +DYNAMIC_VISCOUS_ML = True ! [Boolean] default = False + ! If true, use a bulk Richardson number criterion to + ! determine the mixed layer thickness for viscosity. +ML_OMEGA_FRAC = 1.0 ! [nondim] default = 0.0 + ! When setting the decay scale for turbulence, use this + ! fraction of the absolute rotation rate blended with the + ! local value of f, as sqrt((1-of)*f^2 + of*4*omega^2). +HBBL = 10.0 ! [m] + ! The thickness of a bottom boundary layer with a + ! viscosity of KVBBL if BOTTOMDRAGLAW is not defined, or + ! the thickness over which near-bottom velocities are + ! averaged for the drag law if BOTTOMDRAGLAW is defined + ! but LINEAR_DRAG is not. +DRAG_BG_VEL = 0.1 ! [m s-1] default = 0.0 + ! DRAG_BG_VEL is either the assumed bottom velocity (with + ! LINEAR_DRAG) or an unresolved velocity that is + ! combined with the resolved velocity to estimate the + ! velocity magnitude. DRAG_BG_VEL is only used when + ! BOTTOMDRAGLAW is defined. +BBL_THICK_MIN = 0.1 ! [m] default = 0.0 + ! The minimum bottom boundary layer thickness that can be + ! used with BOTTOMDRAGLAW. This might be + ! Kv / (cdrag * drag_bg_vel) to give Kv as the minimum + ! near-bottom viscosity. +KV = 1.0E-04 ! [m2 s-1] + ! The background kinematic viscosity in the interior. + ! The molecular value, ~1e-6 m2 s-1, may be used. +KV_BBL_MIN = 0.0 ! [m2 s-1] default = 1.0E-04 + ! The minimum viscosities in the bottom boundary layer. +KV_TBL_MIN = 0.0 ! [m2 s-1] default = 1.0E-04 + ! The minimum viscosities in the top boundary layer. + +! === module MOM_continuity === + +! === module MOM_continuity_PPM === MONOTONIC_CONTINUITY = True ! [Boolean] default = False ! If true, CONTINUITY_PPM uses the Colella and Woodward ! monotonic limiter. The default (false) is to use a @@ -249,8 +288,6 @@ ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09 ! tolerance for SSH is 4 times this value. The default ! is 0.5*NK*ANGSTROM, and this should not be set less x ! than about 10^-15*MAXIMUM_DEPTH. -CONTINUITY_CFL_LIMIT = 0.5 ! [nondim] default = 0.5 - ! The maximum CFL of the adjusted velocities. CONT_PPM_BETTER_ITER = False ! [Boolean] default = True ! If true, stop corrective iterations using a velocity ! based criterion and only stop if the iteration is @@ -258,6 +295,8 @@ CONT_PPM_BETTER_ITER = False ! [Boolean] default = True CONT_PPM_USE_VISC_REM_MAX = False ! [Boolean] default = True ! If true, use more appropriate limiting bounds for ! corrections in strongly viscous columns. + +! === module MOM_CoriolisAdv === CORIOLIS_EN_DIS = True ! [Boolean] default = False ! If true, two estimates of the thickness fluxes are used ! to estimate the Coriolis term, and the one that @@ -269,6 +308,10 @@ BOUND_CORIOLIS = True ! [Boolean] default = False ! always effectively false with CORIOLIS_EN_DIS defined and ! CORIOLIS_SCHEME set to SADOURNY75_ENERGY. +! === module MOM_PressureForce === + +! === module MOM_PressureForce_AFV === + ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. @@ -276,12 +319,12 @@ KH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the grid ! spacing to calculate the Laplacian viscosity. ! The final viscosity is the largest of this scaled - ! viscosity, the Smagorinsky viscosity and KH. + ! viscosity, the Smagorinsky and Leith viscosities, and KH. AH_VEL_SCALE = 0.05 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the cube of ! the grid spacing to calculate the biharmonic viscosity. ! The final viscosity is the largest of this scaled - ! viscosity, the Smagorinsky viscosity and AH. + ! viscosity, the Smagorinsky and Leith viscosities, and AH. SMAGORINSKY_AH = True ! [Boolean] default = False ! If true, use a biharmonic Smagorinsky nonlinear eddy ! viscosity. @@ -290,16 +333,6 @@ SMAG_BI_CONST = 0.06 ! [nondim] default = 0.0 ! typically 0.015 - 0.06. ! === module MOM_vert_friction === -CHANNEL_DRAG = True ! [Boolean] default = False - ! If true, the bottom drag is exerted directly on each - ! layer proportional to the fraction of the bottom it - ! overlies. -PRANDTL_TURB = 0.0 ! [nondim] default = 1.0 - ! The turbulent Prandtl number applied to shear - ! instability. -DYNAMIC_VISCOUS_ML = True ! [Boolean] default = False - ! If true, use a bulk Richardson number criterion to - ! determine the mixed layer thickness for viscosity. U_TRUNC_FILE = "U_velocity_truncations" ! default = "" ! The absolute path to a file into which the accelerations ! leading to zonal velocity truncations are written. @@ -310,77 +343,21 @@ V_TRUNC_FILE = "V_velocity_truncations" ! default = "" ! leading to meridional velocity truncations are written. ! Undefine this for efficiency if this diagnostic is not ! needed. -KV = 1.0E-04 ! [m2 s-1] - ! The background kinematic viscosity in the interior. - ! The molecular value, ~1e-6 m2 s-1, may be used. -HBBL = 10.0 ! [m] - ! The thickness of a bottom boundary layer with a - ! viscosity of KVBBL if BOTTOMDRAGLAW is not defined, or - ! the thickness over which near-bottom velocities are - ! averaged for the drag law if BOTTOMDRAGLAW is defined - ! but LINEAR_DRAG is not. -KV_BBL_MIN = 0.0 ! [m2 s-1] default = 1.0E-04 -KV_TBL_MIN = 0.0 ! [m2 s-1] default = 1.0E-04 MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 ! The maximum velocity allowed before the velocity ! components are truncated. ! === module MOM_PointAccel === -! === module MOM_set_visc === -ML_OMEGA_FRAC = 1.0 ! [nondim] default = 0.0 - ! When setting the decay scale for turbulence, use this - ! fraction of the absolute rotation rate blended with the - ! local value of f, as sqrt((1-of)*f^2 + of*4*omega^2). -DRAG_BG_VEL = 0.1 ! [m s-1] default = 0.0 - ! DRAG_BG_VEL is either the assumed bottom velocity (with - ! LINEAR_DRAG) or an unresolved velocity that is - ! combined with the resolved velocity to estimate the - ! velocity magnitude. DRAG_BG_VEL is only used when - ! BOTTOMDRAGLAW is defined. -BBL_THICK_MIN = 0.1 ! [m] default = 0.0 - ! The minimum bottom boundary layer thickness that can be - ! used with BOTTOMDRAGLAW. This might be - ! Kv / (cdrag * drag_bg_vel) to give Kv as the minimum - ! near-bottom viscosity. - ! === module MOM_barotropic === BOUND_BT_CORRECTION = True ! [Boolean] default = False ! If true, the corrective pseudo mass-fluxes into the ! barotropic solver are limited to values that require - ! less than 0.1*MAXVEL to be accommodated. -!BT x-halo = 0 ! - ! The barotropic x-halo size that is actually used. -!BT y-halo = 0 ! - ! The barotropic y-halo size that is actually used. -USE_BT_CONT_TYPE = True ! [Boolean] default = True - ! If true, use a structure with elements that describe - ! effective face areas from the summed continuity solver - ! as a function the barotropic flow in coupling between - ! the barotropic and baroclinic flow. This is only used - ! if SPLIT is true. + ! less than maxCFL_BT_cont to be accommodated. NONLINEAR_BT_CONTINUITY = True ! [Boolean] default = False ! If true, use nonlinear transports in the barotropic ! continuity equation. This does not apply if ! USE_BT_CONT_TYPE is true. -BT_THICK_SCHEME = "FROM_BT_CONT" ! default = "FROM_BT_CONT" - ! A string describing the scheme that is used to set the - ! open face areas used for barotropic transport and the - ! relative weights of the accelerations. Valid values are: - ! ARITHMETIC - arithmetic mean layer thicknesses - ! HARMONIC - harmonic mean layer thicknesses - ! HYBRID - use arithmetic means for - ! layers above the shallowest bottom, the harmonic - ! mean for layers below, and a weighted average for - ! layers that straddle that depth - ! FROM_BT_CONT (the default) - use the average thicknesses kept - ! in the h_u and h_v fields of the BT_cont_type -BT_STRONG_DRAG = False ! [Boolean] default = True - ! If true, use a stronger estimate of the retarding - ! effects of strong bottom drag, by making it implicit - ! with the barotropic time-step instead of implicit with - ! the baroclinic time-step and dividing by the number of - ! barotropic steps. DT_BT_FILTER = 0.0 ! [sec or nondim] default = -0.25 ! A time-scale over which the barotropic mode solutions ! are filtered, in seconds if positive, or as a fraction @@ -411,8 +388,9 @@ KHTH_MAX = 900.0 ! [m2 s-1] default = 0.0 ! === module MOM_mixed_layer_restrat === MIXEDLAYER_RESTRAT = True ! [Boolean] default = False ! If true, a density-gradient dependent re-stratifying - ! flow is imposed in the mixed layer. - ! This is only used if BULKMIXEDLAYER is true. + ! flow is imposed in the mixed layer. Can be used in ALE mode + ! without restriction but in layer mode can only be used if + ! BULKMIXEDLAYER is true. FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! A nondimensional coefficient that is proportional to ! the ratio of the deformation radius to the dominant @@ -422,6 +400,8 @@ FOX_KEMPER_ML_RESTRAT_COEF = 20.0 ! [nondim] default = 0.0 ! geostrophic kinetic energy or 1 plus the square of the ! grid spacing over the deformation radius, as detailed ! by Fox-Kemper et al. (2010) + +! === module MOM_diag_to_Z === Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! The file that specifies the vertical grid for ! depth-space diagnostics, or blank to disable @@ -432,6 +412,34 @@ Z_OUTPUT_GRID_FILE = "OM3_zgrid.nc" ! default = "" ! === module MOM_diabatic_driver === ! The following parameters are used for diabatic processes. + +! === module MOM_KPP === +! This is the MOM wrapper to CVmix:KPP +! See http://code.google.com/p/cvmix/ + +! === module MOM_diffConvection === +! This module implements enhanced diffusivity as a +! function of static stability, N^2. +CONVECTION% +%CONVECTION + +! === module MOM_entrain_diffusive === +MAX_ENT_IT = 20 ! default = 5 + ! The maximum number of iterations that may be used to + ! calculate the interior diapycnal entrainment. +TOLERANCE_ENT = 1.0E-05 ! [m] default = 2.683281572999748E-05 + ! The tolerance with which to solve for entrainment values. + +! === module MOM_geothermal === +GEOTHERMAL_SCALE = 0.001 ! [W m-2 or various] default = 0.0 + ! The constant geothermal heat flux, a rescaling + ! factor for the heat flux read from GEOTHERMAL_FILE, or + ! 0 to disable the geothermal heating. +GEOTHERMAL_FILE = "geothermal_heating_cm2g.nc" ! default = "" + ! The file from which the geothermal heating is to be + ! read, or blank to use a constant heating rate. + +! === module MOM_set_diffusivity === ML_RADIATION = True ! [Boolean] default = False ! If true, allow a fraction of TKE available from wind ! work to penetrate below the base of the mixed layer @@ -504,33 +512,11 @@ MAX_RINO_IT = 25 ! [nondim] default = 50 ! The maximum number of iterations that may be used to ! estimate the Richardson number driven mixing. -! === module MOM_KPP === -! This is the MOM wrapper to CVmix:KPP -! See http://code.google.com/p/cvmix/ -KPP% -%KPP - -! === module MOM_diffConvection === -! This module implements enhanced diffusivity as a -! function of static stability, N^2. -CONVECTION% -%CONVECTION - -! === module MOM_entrain_diffusive === -MAX_ENT_IT = 20 ! default = 5 - ! The maximum number of iterations that may be used to - ! calculate the interior diapycnal entrainment. -TOLERANCE_ENT = 1.0E-05 ! [m] default = 2.683281572999748E-05 - ! The tolerance with which to solve for entrainment values. +! === module MOM_CVMix_shear === +! Parameterization of shear-driven turbulence via CVMix (various options) -! === module MOM_geothermal === -GEOTHERMAL_SCALE = 0.001 ! [W m-2 or various] default = 0.0 - ! The constant geothermal heat flux, a rescaling - ! factor for the heat flux read from GEOTHERMAL_FILE, or - ! 0 to disable the geothermal heating. -GEOTHERMAL_FILE = "geothermal_heating_cm2g.nc" ! default = "" - ! The file from which the geothermal heating is to be - ! read, or blank to use a constant heating rate. +! === module MOM_diabatic_aux === +! The following parameters are used for auxiliary diabatic processes. ! === module MOM_mixed_layer === BULK_RI_ML = 0.05 ! [nondim] @@ -556,9 +542,10 @@ ML_PRESORT_NK_CONV_ADJ = 4 ! [nondim] default = 0 ! Convectively mix the first ML_PRESORT_NK_CONV_ADJ ! layers before sorting when ML_RESORT is true. CORRECT_ABSORPTION_DEPTH = True ! [Boolean] default = False - ! If true, the depth at which penetrating shortwave - ! radiation is absorbed is corrected by moving some of - ! the heating upward in the water column. + ! If true, the average depth at which penetrating shortwave + ! radiation is absorbed is adjusted to match the average + ! heating depth of an exponential profile by moving some + ! of the heating upward in the water column. DO_RIVERMIX = True ! [Boolean] default = False ! If true, apply additional mixing whereever there is ! runoff, so that it is mixed down to RIVERMIX_DEPTH, @@ -603,11 +590,14 @@ ML_KHTR_SCALE = 0.0 ! [nondim] default = 1.0 ! horizontal diffusivity in the mixed layer to the ! epipycnal diffusivity. The valid range is 0 to 1. +! === module MOM_neutral_diffusion === +! This module implements neutral diffusion of tracers + ! === module ocean_model_init === ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. -OCEAN_SURFACE_STAGGER = "B" ! default = "B" +OCEAN_SURFACE_STAGGER = "B" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is ! returned to the coupler. Valid values include @@ -622,7 +612,7 @@ MAX_P_SURF = 7.0E+04 ! [Pa] default = -1.0 ! the ice-ocean heat fluxes are treated explicitly. No ! limit is applied if a negative value is used. USE_LIMITED_PATM_SSH = False ! [Boolean] default = True - ! If true, return the the sea surface height with the + ! If true, return the sea surface height with the ! correction for the atmospheric (and sea-ice) pressure ! limited by max_p_surf instead of the full atmospheric ! pressure. @@ -639,9 +629,13 @@ GUST_2D_FILE = "gustiness_qscat.nc" ! ! The file in which the wind gustiness is found in ! variable gustiness. +! === module MOM_restart === + ! === module MOM_sum_output === MAXTRUNC = 1000000 ! [truncations save_interval-1] default = 0 ! The run will be stopped, and the day set to a very ! large value if the velocity is truncated more than ! MAXTRUNC times between energy saves. Set MAXTRUNC to 0 ! to stop if there is any truncation of velocities. + +! === module MOM_file_parser === diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.layout b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.layout index a13157fe5a..e10824d332 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.layout +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.layout @@ -55,7 +55,7 @@ NJPROC = 6 ! ! STATIC_MEMORY_ this is set in MOM_memory.h at compile time. LAYOUT = 10, 6 ! ! The processor layout that was acutally used. -IO_LAYOUT = 2, 2 ! default = 1 +IO_LAYOUT = 1, 1 ! default = 1 ! The processor layout to be used, or 0,0 to automatically ! set the io_layout to be the same as the layout. NIBLOCK = 1 ! default = 1 From 3d01bfbf484bc4be41a60ffa4c4cbfa483f4983a Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Wed, 13 Sep 2017 13:41:00 -0400 Subject: [PATCH 12/89] MOM6: +Obsoleted USE_LEGACY_SPLIT Removed the option to use the very old GOLD algorithm for the barotropic solver. Also removed the modules MOM_dynamics_legacy_split and MOM_legacy_barotropic This change was required to simplify the introduction of new interfaces that clearly separate the dynamics, tracer advection and thermodynamics update phases of the algorithm. Because there are no longer any test cases that have USE_LEGACY_SPLIT=True, all answers are bitwise identical, but the MOM_parameter_doc.all files for all test cases with dynamics change. Also updated the versions of FMS and SIS2, but these are minor changes. MOM6 commit NOAA-GFDL/MOM6@baed1fad97b9abb70c461dfd939b56d5ce8d3d46 --- coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all | 3 --- coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 3 --- coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all | 3 --- ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 3 --- .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 3 --- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 3 --- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 3 --- ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 3 --- ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 3 --- ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 3 --- land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all | 3 --- ocean_only/DOME/MOM_parameter_doc.all | 3 --- ocean_only/Phillips_2layer/MOM_parameter_doc.all | 3 --- ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 3 --- ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 3 --- ocean_only/adjustment2d/z/MOM_parameter_doc.all | 3 --- ocean_only/benchmark/MOM_parameter_doc.all | 3 --- ocean_only/circle_obcs/MOM_parameter_doc.all | 3 --- ocean_only/double_gyre/MOM_parameter_doc.all | 3 --- ocean_only/external_gwave/MOM_parameter_doc.all | 3 --- ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 3 --- ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 3 --- ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 3 --- ocean_only/flow_downslope/z/MOM_parameter_doc.all | 3 --- ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 3 --- ocean_only/global_ALE/layer/MOM_parameter_doc.all | 3 --- ocean_only/global_ALE/z/MOM_parameter_doc.all | 3 --- ocean_only/lock_exchange/MOM_parameter_doc.all | 3 --- ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 3 --- ocean_only/nonBous_global/MOM_parameter_doc.all | 3 --- ocean_only/resting/layer/MOM_parameter_doc.all | 3 --- ocean_only/resting/z/MOM_parameter_doc.all | 3 --- ocean_only/seamount/layer/MOM_parameter_doc.all | 3 --- ocean_only/seamount/rho/MOM_parameter_doc.all | 3 --- ocean_only/seamount/sigma/MOM_parameter_doc.all | 3 --- ocean_only/seamount/z/MOM_parameter_doc.all | 3 --- ocean_only/sloshing/layer/MOM_parameter_doc.all | 3 --- ocean_only/sloshing/rho/MOM_parameter_doc.all | 3 --- ocean_only/sloshing/z/MOM_parameter_doc.all | 3 --- ocean_only/torus_advection_test/MOM_parameter_doc.all | 3 --- src/FMS | 2 +- src/MOM6 | 2 +- src/SIS2 | 2 +- 43 files changed, 3 insertions(+), 123 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index abbef9ce35..2a03244f78 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 612a514bc5..d40c6ec1f8 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 612a514bc5..d40c6ec1f8 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 1a05ef1fea..87613e4779 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, 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 fb1e23fd36..4e15b2464f 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 @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 19e798b34b..dd4fe4f9a5 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 35510687dc..f0c0f11483 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 16ff44ea27..b9ecb3c38f 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index fc34f4f247..f299a11dca 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index fc34f4f247..f299a11dca 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index 4e11d3e71f..6589ecbef8 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index f4b3acf458..f323fd4e7a 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index ff3e367287..f32a16f290 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 8d566b3732..856a3eb393 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index a5c3fbf1af..25b84c74da 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 0e1eee250b..1f07000f55 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 1550e0274e..24dbf7b270 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 3f7b3b8840..0a6c55a165 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index dae510325c..7f3ec905df 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 009a532d5d..4f4efcc392 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 9f56a3ea5d..6bc33339e3 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index c591344b4f..bafd3d725d 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index eaa8e9b11c..425dd5f0c1 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 7c94657668..5bad3e82b7 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 25c594e12f..e852b60149 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index bccb7e4192..5b54973753 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index b4f1760dfb..dd51eb39ab 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 2f2b92f2ea..71ba7a0272 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all index d603e40254..8811037126 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index a648b2a0a2..5e2ef4ba0e 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index e1528604f5..bd91d31b01 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 366c39651d..ae50b9b052 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index b9716fbc08..8758988e83 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 34af42fafb..8231eaa6ec 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 29563dfd65..df98099326 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index f64ffb09dc..0fa6dd99bf 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 9ee4cb61f1..6f23cd8462 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index fcbc055687..a8572402c9 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 03264c65e1..fabcc0421f 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index eca1913759..c66035d056 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/src/FMS b/src/FMS index e654ba0178..c2cfbd3911 160000 --- a/src/FMS +++ b/src/FMS @@ -1 +1 @@ -Subproject commit e654ba0178939aebc3ed330045195beb0f4b7f5d +Subproject commit c2cfbd3911c01416a703f8cc9bfa47c7846ae293 diff --git a/src/MOM6 b/src/MOM6 index e153f79ab0..baed1fad97 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit e153f79ab0d3b357972bec90515d360242a1f52b +Subproject commit baed1fad97b9abb70c461dfd939b56d5ce8d3d46 diff --git a/src/SIS2 b/src/SIS2 index d57d276233..17245e81b2 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit d57d2762339896233d0deee9f5bdbeb618f99fe5 +Subproject commit 17245e81b26c95eff4cc4d26ec6347f9cea3e96d From 44db22bd3c79c5661e825478b5abe9a08f8285ec Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 14 Sep 2017 09:36:54 -0400 Subject: [PATCH 13/89] Updated parameter files for tracer-mixing - Commit 3d01bfbf484b missed tracer_mixing/rho and /z . --- ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 3 --- ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 3 --- 2 files changed, 6 deletions(-) diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 683a070032..f07c6f76e5 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index 28d3896b5a..b4be5bf091 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -10,9 +10,6 @@ DO_UNIT_TESTS = False ! [Boolean] default = False ! If True, exercises unit tests at model start up. SPLIT = True ! [Boolean] default = True ! Use the split time stepping if true. -USE_LEGACY_SPLIT = False ! [Boolean] default = False - ! If true, use the full range of options available from - ! the older GOLD-derived split time stepping code. CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False ! If true, the in-situ density is used to calculate the ! effective sea level that is returned to the coupler. If false, From 776b6e6a1f8330f1daa610b20aff2a837f21eb8b Mon Sep 17 00:00:00 2001 From: Matthew Harrison Date: Thu, 14 Sep 2017 10:06:10 -0400 Subject: [PATCH 14/89] Switch to updated version of FMS for MOM6#586 --- src/FMS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FMS b/src/FMS index e654ba0178..c2cfbd3911 160000 --- a/src/FMS +++ b/src/FMS @@ -1 +1 @@ -Subproject commit e654ba0178939aebc3ed330045195beb0f4b7f5d +Subproject commit c2cfbd3911c01416a703f8cc9bfa47c7846ae293 From 578e6f1e03bd0ec5e0da06090104b6fb243e3c09 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 14 Sep 2017 13:10:04 -0400 Subject: [PATCH 15/89] Reset SIS2 and FMS submodule versions - Commit 3d01bfbf484b incorrectly updated the versions of SIS2 and FMS. This happened because the feature branch "obsolete_legacy_split" was made on top of a commit that had this different versions. --- src/FMS | 2 +- src/SIS2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/FMS b/src/FMS index c2cfbd3911..e654ba0178 160000 --- a/src/FMS +++ b/src/FMS @@ -1 +1 @@ -Subproject commit c2cfbd3911c01416a703f8cc9bfa47c7846ae293 +Subproject commit e654ba0178939aebc3ed330045195beb0f4b7f5d diff --git a/src/SIS2 b/src/SIS2 index 17245e81b2..d57d276233 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit 17245e81b26c95eff4cc4d26ec6347f9cea3e96d +Subproject commit d57d2762339896233d0deee9f5bdbeb618f99fe5 From 95d1e3c2cadfc4258efcf8b399ab73f5b653735e Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 18 Sep 2017 09:01:18 -0400 Subject: [PATCH 16/89] OM4: Remove _pow2 variables from diag_table - Since we have explicitly square of requested variables (e.g. tossq) we do not need to also write out the _pow2 version. There seems to be something wrong with the _pow2 diagnostics anyway, which @StephenGriffies has reported to FMS. - Close #158. --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 4 ---- ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup | 3 --- ice_ocean_SIS2/OM4_05/diag_table | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index 0ba24ec9fd..cc6e312903 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -60,7 +60,6 @@ "ocean_model", "dxCv", "dxCv", "ocean_static", "all", "none", "none", 2 "ocean_model", "dyCv", "dyCv", "ocean_static", "all", "none", "none", 2 - # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table H1: scalar fields such as tracers, cell mass/volume, sea level, MLD # Generally save annuals, and sometimes monthly and daily. @@ -479,7 +478,6 @@ "ocean_model", "e", "e", "ocean_annual", "all", "mean", "none",2 #"ocean_model", "e", "e", "ocean_month", "all", "mean", "none",2 "ocean_model", "speed", "speed", "ocean_annual", "all", "mean", "none",2 -#"ocean_model", "speed", "speed_pow2", "ocean_annual", "all", "pow2", "none",2 "ocean_model", "KE", "KE", "ocean_annual", "all", "mean", "none",2 "ocean_model", "mass_wt", "mass_wt", "ocean_annual", "all", "mean", "none",2 @@ -519,8 +517,6 @@ "ocean_model", "MEKE_KH", "MEKE_KH", "ocean_annual", "all", "mean", "none",2 "ocean_model", "subML_N2", "subML_N2", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "zos", "zos_pow2", "ocean_annual", "all", "pow2", "none",2 - "ocean_model", "tos", "tos_pow2", "ocean_annual", "all", "pow2", "none",2 "ocean_model", "tos", "tos_max", "ocean_annual", "all", "max", "none",2 "ocean_model", "tos", "tos_min", "ocean_annual", "all", "min", "none",2 diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup index fadf064347..c0cd3268a2 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup @@ -478,7 +478,6 @@ "ocean_model", "e", "e", "ocean_annual", "all", "mean", "none",2 #"ocean_model", "e", "e", "ocean_month", "all", "mean", "none",2 "ocean_model", "speed", "speed", "ocean_annual", "all", "mean", "none",2 -#"ocean_model", "speed", "speed_pow2", "ocean_annual", "all", "pow2", "none",2 "ocean_model", "KE", "KE", "ocean_annual", "all", "mean", "none",2 "ocean_model", "mass_wt", "mass_wt", "ocean_annual", "all", "mean", "none",2 @@ -518,8 +517,6 @@ "ocean_model", "MEKE_KH", "MEKE_KH", "ocean_annual", "all", "mean", "none",2 "ocean_model", "subML_N2", "subML_N2", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "zos", "zos_pow2", "ocean_annual", "all", "pow2", "none",2 - "ocean_model", "tos", "tos_pow2", "ocean_annual", "all", "pow2", "none",2 "ocean_model", "tos", "tos_max", "ocean_annual", "all", "max", "none",2 "ocean_model", "tos", "tos_min", "ocean_annual", "all", "min", "none",2 diff --git a/ice_ocean_SIS2/OM4_05/diag_table b/ice_ocean_SIS2/OM4_05/diag_table index 7be2f83538..14e92aa14c 100644 --- a/ice_ocean_SIS2/OM4_05/diag_table +++ b/ice_ocean_SIS2/OM4_05/diag_table @@ -1,2 +1,2 @@ -OM4_SIS2_cgrid_025 +OM4_SIS2_cgrid_05 1900 1 1 0 0 0 From ede50cc3cbf3fbb2cfea8819b8ade0ecb4e7ff71 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 18 Sep 2017 12:24:49 -0400 Subject: [PATCH 17/89] MOM6:Merge pull request #594 from adcroft/cmor_missing_value - Commit 3a04ca3 updates MOM_parameter_doc.all files with new default value for DIAG_MISVAL. - NOAA-GFDL/MOM6@3a04ca3 Merge pull request #594 from adcroft/cmor_missing_value - NOAA-GFDL/MOM6@2109349 Merge pull request #592 from adcroft/mask_areacello - NOAA-GFDL/MOM6@c175587 Changed default missing value - NOAA-GFDL/MOM6@0dc506a Mask areacello in diagnostics - NOAA-GFDL/MOM6@5249bbb Removed debugging added in PR #586 - NOAA-GFDL/MOM6@9d1b04f Merge pull request #586 from MJHarrison-GFDL/new_ALE_sponges - NOAA-GFDL/MOM6@3a7bf08 remove trailing whitespace - NOAA-GFDL/MOM6@9465031 fix to retain previous answers - NOAA-GFDL/MOM6@38f588b updates for off-grid/time-varying sponges - NOAA-GFDL/MOM6@6bd2d98 Updates in support of ALE sponges from files - NOAA-GFDL/MOM6@27289eb Updates for ALE sponges --- coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all | 2 +- coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 2 +- coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 2 +- .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 2 +- land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all | 2 +- .../CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all | 2 +- .../CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all | 2 +- .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all | 2 +- ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all | 2 +- ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all | 2 +- ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all | 2 +- .../CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all | 2 +- .../skin_warming_wind/EPBL/MOM_parameter_doc.all | 2 +- .../CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all | 2 +- ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all | 2 +- ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all | 2 +- ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all | 2 +- ocean_only/DOME/MOM_parameter_doc.all | 2 +- ocean_only/Phillips_2layer/MOM_parameter_doc.all | 2 +- ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all | 2 +- ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 2 +- ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 2 +- ocean_only/adjustment2d/z/MOM_parameter_doc.all | 2 +- ocean_only/benchmark/MOM_parameter_doc.all | 2 +- ocean_only/circle_obcs/MOM_parameter_doc.all | 2 +- ocean_only/double_gyre/MOM_parameter_doc.all | 2 +- ocean_only/external_gwave/MOM_parameter_doc.all | 2 +- ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 2 +- ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 2 +- ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 2 +- ocean_only/flow_downslope/z/MOM_parameter_doc.all | 2 +- ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 2 +- ocean_only/global_ALE/layer/MOM_parameter_doc.all | 2 +- ocean_only/global_ALE/z/MOM_parameter_doc.all | 2 +- ocean_only/lock_exchange/MOM_parameter_doc.all | 2 +- ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 2 +- ocean_only/nonBous_global/MOM_parameter_doc.all | 2 +- ocean_only/resting/layer/MOM_parameter_doc.all | 2 +- ocean_only/resting/z/MOM_parameter_doc.all | 2 +- ocean_only/seamount/layer/MOM_parameter_doc.all | 2 +- ocean_only/seamount/rho/MOM_parameter_doc.all | 2 +- ocean_only/seamount/sigma/MOM_parameter_doc.all | 2 +- ocean_only/seamount/z/MOM_parameter_doc.all | 2 +- ocean_only/single_column/BML/MOM_parameter_doc.all | 2 +- ocean_only/single_column/EPBL/MOM_parameter_doc.all | 2 +- ocean_only/single_column/KPP/MOM_parameter_doc.all | 2 +- ocean_only/sloshing/layer/MOM_parameter_doc.all | 2 +- ocean_only/sloshing/rho/MOM_parameter_doc.all | 2 +- ocean_only/sloshing/z/MOM_parameter_doc.all | 2 +- ocean_only/torus_advection_test/MOM_parameter_doc.all | 2 +- ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 2 +- ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 2 +- ocean_only/unit_tests/MOM_parameter_doc.all | 2 +- src/MOM6 | 2 +- 60 files changed, 60 insertions(+), 60 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index 2a03244f78..3cd8a7588a 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -535,7 +535,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000030" ! default = "available_diags.000030" ! A file into which to write a list of all available diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index d40c6ec1f8..b782ff5be1 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -535,7 +535,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000030" ! default = "available_diags.000030" ! A file into which to write a list of all available diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index d40c6ec1f8..b782ff5be1 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -535,7 +535,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000030" ! default = "available_diags.000030" ! A file into which to write a list of all available diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 87613e4779..e1a6370b62 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -535,7 +535,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 4e15b2464f..579100a0e4 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 @@ -607,7 +607,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index dd4fe4f9a5..8f8603118e 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -646,7 +646,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index f0c0f11483..065d47f77a 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -646,7 +646,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index b9ecb3c38f..4a0b851316 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -549,7 +549,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index f299a11dca..08ced6647a 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -549,7 +549,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index f299a11dca..08ced6647a 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -549,7 +549,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index 6589ecbef8..bc91ac8332 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -584,7 +584,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000144" ! default = "available_diags.000144" ! A file into which to write a list of all available 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 b5fffe30f7..747fa46e60 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 @@ -481,7 +481,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 1d10e47374..df45f4ff89 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 @@ -577,7 +577,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 ada737dc95..6b605be11e 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 @@ -577,7 +577,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 274304ac6e..7158fd528f 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 @@ -481,7 +481,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 0120e5a816..52ae36737d 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 @@ -577,7 +577,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 a548beeac4..7212fa6411 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 @@ -577,7 +577,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 f9b1d89f1e..42c1eb62d0 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 @@ -481,7 +481,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 84f536c6eb..5c58091a72 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 @@ -577,7 +577,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 81c846048d..07b81ce376 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 @@ -577,7 +577,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 c2a9f31a45..9871c7d41f 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 @@ -481,7 +481,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 92d08c2c28..d4db824e87 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 @@ -577,7 +577,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 cc15ab1471..f5c1137109 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 @@ -577,7 +577,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index f323fd4e7a..9dc85c7556 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -457,7 +457,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index f32a16f290..c9b111bc62 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -422,7 +422,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 90147fdf01..a9eeef4ca5 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -577,7 +577,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 856a3eb393..412fe2f9c8 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -505,7 +505,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 25b84c74da..420cd085a6 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -648,7 +648,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 1f07000f55..383d518008 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -602,7 +602,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 24dbf7b270..40ddb07ce6 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -518,7 +518,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 0a6c55a165..2d623d8a66 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -470,7 +470,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 7f3ec905df..3b62c46579 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -393,7 +393,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 4f4efcc392..60a3f844f8 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -492,7 +492,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 6bc33339e3..173219244c 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -500,7 +500,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index bafd3d725d..fa9ef0ec24 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -645,7 +645,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 425dd5f0c1..19b9cb23af 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -599,7 +599,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 5bad3e82b7..fb2629dfaa 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -599,7 +599,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index e852b60149..fd95a6d4f6 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -639,7 +639,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 5b54973753..54c65bafa3 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -499,7 +499,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index dd51eb39ab..15460fa730 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -591,7 +591,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 71ba7a0272..b838db3c28 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -495,7 +495,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available 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 8811037126..978374a023 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -588,7 +588,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 5e2ef4ba0e..2948b8e05e 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -498,7 +498,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index bd91d31b01..0c9f3b0b71 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -489,7 +489,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index ae50b9b052..1f637e16c7 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -588,7 +588,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 8758988e83..7a783aa022 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -520,7 +520,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 8231eaa6ec..b055f38435 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -663,7 +663,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index df98099326..8bcbf3b4bc 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -617,7 +617,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 0fa6dd99bf..70796aaf7f 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -617,7 +617,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 3735d819e5..6fbc6a1949 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -462,7 +462,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 718d26b225..1f07052b3d 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -549,7 +549,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index ce9a0d3b7e..e5df023da0 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -549,7 +549,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 6f23cd8462..09e69ddc25 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -492,7 +492,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index a8572402c9..394e975264 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -637,7 +637,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index fabcc0421f..609e767955 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -591,7 +591,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index c66035d056..fcf0996248 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -509,7 +509,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index f07c6f76e5..034505bdcf 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -649,7 +649,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index b4be5bf091..a4b467d910 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -603,7 +603,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 3fa9765ad3..1900f363ab 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -388,7 +388,7 @@ DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = -1.0E+34 ! [not defined] default = -1.0E+34 +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" ! A file into which to write a list of all available diff --git a/src/MOM6 b/src/MOM6 index 1048b8c1a3..3a04ca3c7b 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 1048b8c1a320788d2755b1890e06ce3f4e4b3705 +Subproject commit 3a04ca3c7bed7ebf569b7e35b2b92f3ecd4b2564 From 04c5e6401e5efc25d3e13e50234ac7fb001fd4b2 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 18 Sep 2017 15:05:23 -0400 Subject: [PATCH 18/89] MOM6: Merge pull request #593 from adcroft/fix_cell_measures - NOAA-GFDL/MOM6@b51eb51 Merge pull request #593 from adcroft/fix_cell_measures - NOAA-GFDL/MOM6@acf846b Restore cell measures for dynamic variables --- src/MOM6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MOM6 b/src/MOM6 index 3a04ca3c7b..b51eb513d8 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 3a04ca3c7bed7ebf569b7e35b2b92f3ecd4b2564 +Subproject commit b51eb513d8c24a3f6b3b135b5ac63f7b4922c005 From ecc935bd2415bccc75cbf32f917eb3564d216c26 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 18 Sep 2017 16:26:37 -0400 Subject: [PATCH 19/89] MOM6: Merge pull request #595 from adcroft/add_static_cell_measures - Updates available diagnostics - Also update OM4 diag_table - NOAA-GFDL/MOM6@03308f3 Merge pull request #595 from adcroft/add_static_cell_measures - NOAA-GFDL/MOM6@1547ece Adds cell methods to static variables --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 3 +++ ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup | 6 ++++-- .../global_ALE/layer/available_diags.000000 | 21 +++++++++++++++++++ .../global_ALE/z/available_diags.000000 | 21 +++++++++++++++++++ src/MOM6 | 2 +- 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index cc6e312903..72ddd4f52e 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -59,6 +59,9 @@ "ocean_model", "dyCu", "dyCu", "ocean_static", "all", "none", "none", 2 "ocean_model", "dxCv", "dxCv", "ocean_static", "all", "none", "none", 2 "ocean_model", "dyCv", "dyCv", "ocean_static", "all", "none", "none", 2 + "ocean_model", "areacello_cu","areacello_cu","ocean_static", "all", "none", "none", 2 + "ocean_model", "areacello_cv","areacello_cv","ocean_static", "all", "none", "none", 2 + "ocean_model", "areacello_bu","areacello_bu","ocean_static", "all", "none", "none", 2 # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table H1: scalar fields such as tracers, cell mass/volume, sea level, MLD diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup index c0cd3268a2..4c24a9e315 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup @@ -40,7 +40,7 @@ "ocean_model", "areacello", "areacello", "ocean_static", "all", "none", "none", 2 "ocean_model", "deptho", "deptho", "ocean_static", "all", "none", "none", 2 #"ocean_model", "basin", "basin", "ocean_static", "all", "none", "none", 2 # in /archive/gold/datasets/OM4_025/ - "ocean_model", "hfgeou", "hfgeou" "ocean_static", "all", "none", "none", 2 # for static geothermal heat + "ocean_model", "hfgeou", "hfgeou", "ocean_static", "all", "none", "none", 2 # for static geothermal heat # Extra static geometry data beyond CMIP6/OMIP Table 2.1 "ocean_model", "Coriolis", "Coriolis", "ocean_static", "all", "none", "none", 2 @@ -62,7 +62,9 @@ "ocean_model", "dyCu", "dyCu", "ocean_static", "all", "none", "none", 2 "ocean_model", "dxCv", "dxCv", "ocean_static", "all", "none", "none", 2 "ocean_model", "dyCv", "dyCv", "ocean_static", "all", "none", "none", 2 - + "ocean_model", "areacello_cu","areacello_cu","ocean_static", "all", "none", "none", 2 + "ocean_model", "areacello_cv","areacello_cv","ocean_static", "all", "none", "none", 2 + "ocean_model", "areacello_bu","areacello_bu","ocean_static", "all", "none", "none", 2 # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table H1: scalar fields such as tracers, cell mass/volume, sea level, MLD diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 93bbce45d5..ee6ea2ab94 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -29,6 +29,27 @@ ! long_name: Ocean Grid-Cell Area ! units: m2 ! standard_name: cell_area +"ocean_model", "area_u" [Unused] + ! long_name: Surface area of x-direction flow (U) cells + ! units: m2 +"ocean_model", "areacello_cu" [Unused] + ! long_name: Ocean Grid-Cell Area + ! units: m2 + ! standard_name: cell_area +"ocean_model", "area_v" [Unused] + ! long_name: Surface area of y-direction flow (V) cells + ! units: m2 +"ocean_model", "areacello_cv" [Unused] + ! long_name: Ocean Grid-Cell Area + ! units: m2 + ! standard_name: cell_area +"ocean_model", "area_q" [Unused] + ! long_name: Surface area of B-grid flow (Q) cells + ! units: m2 +"ocean_model", "areacello_bu" [Unused] + ! long_name: Ocean Grid-Cell Area + ! units: m2 + ! standard_name: cell_area "ocean_model", "depth_ocean" [Used] ! long_name: Depth of the ocean at tracer points ! units: m diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 564582ac23..e4bfc906ad 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -29,6 +29,27 @@ ! long_name: Ocean Grid-Cell Area ! units: m2 ! standard_name: cell_area +"ocean_model", "area_u" [Unused] + ! long_name: Surface area of x-direction flow (U) cells + ! units: m2 +"ocean_model", "areacello_cu" [Unused] + ! long_name: Ocean Grid-Cell Area + ! units: m2 + ! standard_name: cell_area +"ocean_model", "area_v" [Unused] + ! long_name: Surface area of y-direction flow (V) cells + ! units: m2 +"ocean_model", "areacello_cv" [Unused] + ! long_name: Ocean Grid-Cell Area + ! units: m2 + ! standard_name: cell_area +"ocean_model", "area_q" [Unused] + ! long_name: Surface area of B-grid flow (Q) cells + ! units: m2 +"ocean_model", "areacello_bu" [Unused] + ! long_name: Ocean Grid-Cell Area + ! units: m2 + ! standard_name: cell_area "ocean_model", "depth_ocean" [Used] ! long_name: Depth of the ocean at tracer points ! units: m diff --git a/src/MOM6 b/src/MOM6 index b51eb513d8..03308f3188 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit b51eb513d8c24a3f6b3b135b5ac63f7b4922c005 +Subproject commit 03308f3188f6c74ed3e3cb0eb59630af5b5b65a6 From b312c2120b5eb02cf25815971cf7015b5a092c8d Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 18 Sep 2017 17:00:40 -0400 Subject: [PATCH 20/89] OM4: Cleanup MOM_input - Non-answer changing updates to MOM_input to bring parameter order and documentation up to date with MOM_parameter.short --- ice_ocean_SIS2/OM4_025/MOM_input | 50 ++++++++++++++++-------------- ice_ocean_SIS2/OM4_05/MOM_input | 52 +++++++++++++++++--------------- 2 files changed, 55 insertions(+), 47 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/MOM_input b/ice_ocean_SIS2/OM4_025/MOM_input index ca9e2fcf83..4970df01a8 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_input +++ b/ice_ocean_SIS2/OM4_025/MOM_input @@ -97,25 +97,6 @@ NJGLOBAL = 1080 ! NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - -! === module MOM_EOS === -DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. - -! === module ideal_age_example === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -143,6 +124,7 @@ TOPO_CONFIG = "file" ! ! halfpipe - a zonally uniform channel with a half-sine ! profile in the meridional direction. ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a slope and channel configuration for the @@ -187,9 +169,29 @@ CHANNEL_CONFIG = "list" ! default = "none" CHANNEL_LIST_FILE = "MOM_channels_global_025" ! default = "MOM_channel_list" ! The file from which the list of narrowed channels is read. +! === module MOM_tracer_registry === + +! === module MOM_EOS === +DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === +PARALLEL_RESTARTFILES = True ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. + +! === module ideal_age_example === + ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: + ! ALE or none - used to avoid defining layers in ALE mode ! file - read coordinate information from the file ! specified by (COORD_FILE). ! BFB - Custom coords for buoyancy-forced basin case @@ -296,13 +298,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False ! === module MOM_initialize_layers_from_Z === TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc" ! The name of the z-space input file used to initialize - ! the layer thicknesses, temperatures and salinities. + ! temperatures (T) and salinities (S). If T and S are not + ! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE + ! must be set. Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp" ! The name of the potential temperature variable in - ! TEMP_SALT_Z_INIT_FILE. + ! TEMP_Z_INIT_FILE. Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt" ! The name of the salinity variable in - ! TEMP_SALT_Z_INIT_FILE. + ! SALT_Z_INIT_FILE. Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False ! If True, then remap straight to model coordinate from file. @@ -438,7 +442,7 @@ AH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the cube of ! the grid spacing to calculate the biharmonic viscosity. ! The final viscosity is the largest of this scaled - ! viscosity, the Smagorinsky viscosity and AH. + ! viscosity, the Smagorinsky and Leith viscosities, and AH. SMAGORINSKY_AH = True ! [Boolean] default = False ! If true, use a biharmonic Smagorinsky nonlinear eddy ! viscosity. diff --git a/ice_ocean_SIS2/OM4_05/MOM_input b/ice_ocean_SIS2/OM4_05/MOM_input index ac557224d8..8b153db101 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_input +++ b/ice_ocean_SIS2/OM4_05/MOM_input @@ -83,25 +83,6 @@ NJGLOBAL = 576 ! NK = 75 ! [nondim] ! The number of model layers. -! === module MOM_tracer_registry === - -! === module MOM_EOS === -DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 - ! When TFREEZE_FORM=LINEAR, - ! this is the derivative of the freezing potential - ! temperature with pressure. - -! === module MOM_restart === -PARALLEL_RESTARTFILES = True ! [Boolean] default = False - ! If true, each processor writes its own restart file, - ! otherwise a single restart file is generated - -! === module MOM_tracer_flow_control === -USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False - ! If true, use the ideal_age_example tracer package. - -! === module ideal_age_example === - ! === module MOM_fixed_initialization === INPUTDIR = "INPUT" ! default = "." ! The directory in which input files are found. @@ -129,6 +110,7 @@ TOPO_CONFIG = "file" ! ! halfpipe - a zonally uniform channel with a half-sine ! profile in the meridional direction. ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a slope and channel configuration for the @@ -170,10 +152,30 @@ CHANNEL_CONFIG = "list" ! default = "none" ! NetCDF file on the model grid. CHANNEL_LIST_FILE = "MOM_channels_global_025" ! default = "MOM_channel_list" ! The file from which the list of narrowed channels is read. +PARALLEL_RESTARTFILES = True ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_tracer_registry === + +! === module MOM_EOS === +DTFREEZE_DP = -7.75E-08 ! [deg C Pa-1] default = 0.0 + ! When TFREEZE_FORM=LINEAR, + ! this is the derivative of the freezing potential + ! temperature with pressure. + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === +USE_IDEAL_AGE_TRACER = True ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. + +! === module ideal_age_example === ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! ! This specifies how layers are to be defined: + ! ALE or none - used to avoid defining layers in ALE mode ! file - read coordinate information from the file ! specified by (COORD_FILE). ! BFB - Custom coords for buoyancy-forced basin case @@ -285,13 +287,15 @@ INIT_LAYERS_FROM_Z_FILE = True ! [Boolean] default = False ! === module MOM_initialize_layers_from_Z === TEMP_SALT_Z_INIT_FILE = "WOA05_pottemp_salt.nc" ! default = "temp_salt_z.nc" ! The name of the z-space input file used to initialize - ! the layer thicknesses, temperatures and salinities. + ! temperatures (T) and salinities (S). If T and S are not + ! in the same file, TEMP_Z_INIT_FILE and SALT_Z_INIT_FILE + ! must be set. Z_INIT_FILE_PTEMP_VAR = "PTEMP" ! default = "ptemp" ! The name of the potential temperature variable in - ! TEMP_SALT_Z_INIT_FILE. + ! TEMP_Z_INIT_FILE. Z_INIT_FILE_SALT_VAR = "SALT" ! default = "salt" ! The name of the salinity variable in - ! TEMP_SALT_Z_INIT_FILE. + ! SALT_Z_INIT_FILE. Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False ! If True, then remap straight to model coordinate from file. Z_INIT_REMAP_GENERAL = True ! [Boolean] default = False @@ -448,7 +452,7 @@ AH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the cube of ! the grid spacing to calculate the biharmonic viscosity. ! The final viscosity is the largest of this scaled - ! viscosity, the Smagorinsky viscosity and AH. + ! viscosity, the Smagorinsky and Leith viscosities, and AH. SMAGORINSKY_AH = True ! [Boolean] default = False ! If true, use a biharmonic Smagorinsky nonlinear eddy ! viscosity. @@ -552,7 +556,7 @@ Z_OUTPUT_GRID_FILE = "analysis_vgrid_lev35.v1.nc" ! default = "" ! The file that specifies the vertical grid for ! depth-space diagnostics, or blank to disable ! depth-space output. -!NK_ZSPACE (from file) = -1 ! [nondim] +!NK_ZSPACE (from file) = 35 ! [nondim] ! The number of depth-space levels. This is determined ! from the size of the variable zw in the output grid file. From aed7f0fca1b488c8b4ec3122e45f30191cd4d649 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 18 Sep 2017 17:03:09 -0400 Subject: [PATCH 21/89] Fix for NCI Jenkins fail, MESO_025_23L - Removed USE_LEGACY_SPLIT flag from input in MESO_025_23L. - Commit f6957cfcd51ded24d8 should have updated MESO_025_23L but was missed because it is not actively tested at GFDL. Thanks @nicjhan for keeping this test alive. --- ocean_only/MESO_025_23L/MOM_input | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ocean_only/MESO_025_23L/MOM_input b/ocean_only/MESO_025_23L/MOM_input index b5aa4e0957..e0a6045d73 100644 --- a/ocean_only/MESO_025_23L/MOM_input +++ b/ocean_only/MESO_025_23L/MOM_input @@ -380,11 +380,6 @@ ANALYTIC_FV_PGF = True ! If defined the pressure gradient forces ! numerical thermobaric instability. ! Specify the scheme for the barotropic solver. -USE_LEGACY_SPLIT = True ! If defined, use the split time stepping - ! code that gives acces to the full range of - ! options that were available in GOLD. If - ! false, only the prefered options can be - ! used in the streamlined code. FLUX_BT_COUPLING = False ! If defined, use mass fluxes to ensure ! consistency between the baroclinic and ! barotropic modes. From 4af5297632fb4bf84123f8875b8bfe4c33153b46 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Tue, 19 Sep 2017 15:05:29 -0400 Subject: [PATCH 22/89] Adds sftof to OM4 diag_table - Updates MOM6 to provide sftof. - Added sftof diagnostic to static sectino of OM4 diag_table - Closes #156. - NOAA-GFDL/MOM6@3d60b91 Merge pull request #596 from adcroft/sftof_static_diag - NOAA-GFDL/MOM6@913e71a Adds static diagnostic sftof --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 1 + ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup | 1 + ocean_only/global_ALE/layer/available_diags.000000 | 7 +++++++ ocean_only/global_ALE/z/available_diags.000000 | 7 +++++++ src/MOM6 | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index 72ddd4f52e..879448920c 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -38,6 +38,7 @@ "ocean_model", "deptho", "deptho", "ocean_static", "all", "none", "none", 2 #"ocean_model", "basin", "basin", "ocean_static", "all", "none", "none", 2 # in /archive/gold/datasets/OM4_025/ "ocean_model", "hfgeou", "hfgeou", "ocean_static", "all", "none", "none", 2 # for static geothermal heat + "ocean_model", "sftof", "sftof", "ocean_static", "all", "none", "none", 2 # Extra static geometry data beyond CMIP6/OMIP Table 2.1 "ocean_model", "Coriolis", "Coriolis", "ocean_static", "all", "none", "none", 2 diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup index 4c24a9e315..262b07f9e7 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup @@ -41,6 +41,7 @@ "ocean_model", "deptho", "deptho", "ocean_static", "all", "none", "none", 2 #"ocean_model", "basin", "basin", "ocean_static", "all", "none", "none", 2 # in /archive/gold/datasets/OM4_025/ "ocean_model", "hfgeou", "hfgeou", "ocean_static", "all", "none", "none", 2 # for static geothermal heat + "ocean_model", "sftof", "sftof", "ocean_static", "all", "none", "none", 2 # Extra static geometry data beyond CMIP6/OMIP Table 2.1 "ocean_model", "Coriolis", "Coriolis", "ocean_static", "all", "none", "none", 2 diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index ee6ea2ab94..40c3463c96 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -91,6 +91,13 @@ "ocean_model", "dyCv" [Unused] ! long_name: Delta(y) at v points (meter) ! units: m +"ocean_model", "area_t_percent" [Unused] + ! long_name: Percentage of cell area covered by ocean + ! units: % +"ocean_model", "sftof" [Unused] + ! long_name: Sea Area Fraction + ! units: % + ! standard_name: SeaAreaFraction "ocean_model", "MEKE" [Used] ! long_name: Mesoscale Eddy Kinetic Energy ! units: meter2 second-2 diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index e4bfc906ad..66b70730fb 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -91,6 +91,13 @@ "ocean_model", "dyCv" [Unused] ! long_name: Delta(y) at v points (meter) ! units: m +"ocean_model", "area_t_percent" [Unused] + ! long_name: Percentage of cell area covered by ocean + ! units: % +"ocean_model", "sftof" [Unused] + ! long_name: Sea Area Fraction + ! units: % + ! standard_name: SeaAreaFraction "ocean_model", "MEKE" [Used] ! long_name: Mesoscale Eddy Kinetic Energy ! units: meter2 second-2 diff --git a/src/MOM6 b/src/MOM6 index 03308f3188..3d60b91ae5 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 03308f3188f6c74ed3e3cb0eb59630af5b5b65a6 +Subproject commit 3d60b91ae501c188c575244cd77128bd16e30a51 From 47cb72e7a644c415ccc3e121a01c0b29c2d659d4 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Fri, 15 Sep 2017 15:33:45 -0400 Subject: [PATCH 23/89] Initial commit of CMIP6 offline diag script - basin average overturning - basin average heat transports --- tools/analysis/CMIP6_offline_diags.py | 235 ++++++++++++++++++++++++++ tools/analysis/m6toolbox.py | 28 +++ 2 files changed, 263 insertions(+) create mode 100755 tools/analysis/CMIP6_offline_diags.py diff --git a/tools/analysis/CMIP6_offline_diags.py b/tools/analysis/CMIP6_offline_diags.py new file mode 100755 index 0000000000..5039c00cce --- /dev/null +++ b/tools/analysis/CMIP6_offline_diags.py @@ -0,0 +1,235 @@ +#!/usr/bin/env python + +import argparse +import m6toolbox +import netCDF4 as nc +import numpy as np +import os +import sys +import matplotlib.pyplot as plt + +##-- RefineDiag Script for CMIP6 +## +## Variables we intend to provide in z-coordinates: +## +## msftyyz -> vmo (ocean_z) * both 0.25 and 0.5 resolutions +## msftyzmpa -> vhGM (ocean_z) * applies only to 0.5 resolution +## msftyzsmpa -> vhml (ocean_z) * both 0.25 and 0.5 resolutions +## +## +## Variables we intend to provide in rho-coordinates: +## (potenital density referenced to 2000 m) +## +## msftyrho -> vmo +## msftyrhompa -> vhGM * applies only to 0.5 resolution +## +## +## 2-D variables we intent to provide: +## +## hfy -> T_ady_2d + ndiff_tracer_trans_y_2d_T * T_ady_2d needs to be converted to Watts (Cp = 3992.) +## ndiff_tracer_trans_y_2d_T already in Watts +## advective term in both 0.25 and 0.5 resolutions +## diffusive term only in 0.5 resolution +## +## hfx -> same recipie as above, expect for x-dimension +## hfbasin -> summed line of hfy in each basin +## +## +## Outstanding issues +## 1.) regirdding of vh, vhGM to rho-corrdinates +## 2.) vhGM and vhML units need to be in kg s-1 +## 2.) save out RHO_0 and Cp somewhere in netCDF files to key off of +## +## +## CMIP variables that will NOT be provided: +## +## hfbasinpmadv, hfbasinpsmadv, hfbasinpmdiff, hfbasinpadv +## (We advect the tracer with the residual mean velocity; individual terms cannot be diagnosed) +## +## htovgyre, htovovrt, sltovgyre, sltovovrt +## (Code for offline calculation not ready.) +## +##-- + +def run(): + parser = argparse.ArgumentParser(description='''CMIP6 RefineDiag Script for OM4''') + parser.add_argument('infile', type=str, help='''Input file''') + parser.add_argument('-b','--basinfile', type=str, default='', required=True, help='''File containing OM4 basin masks''') + parser.add_argument('-o','--outfile', type=str, default=None, help='''Output file name''') + args = parser.parse_args() + main(args) + +def main(args): + #-- Define Regions and their associated masks + # Note: The Atlantic should include other smaller bays/seas that are + # included in the definition used in meridional_overturning.py + + region = np.array(['atlantic_arctic_ocean','indian_pacific_ocean','global_ocean']) + + #-- Read basin masks + f_basin = nc.Dataset(args.basinfile) + basin_code = f_basin.variables['basin'][:] + + atlantic_arctic_mask = basin_code * 0. + atlantic_arctic_mask[(basin_code==2) | (basin_code==4) | (basin_code==6) | (basin_code==7) | (basin_code==8)] = 1. + + indo_pacific_mask = basin_code * 0. + indo_pacific_mask[(basin_code==3) | (basin_code==5)] = 1. + + #-- Read model data + f_in = nc.Dataset(args.infile) + + #-- Read in existing dimensions from history netcdf file + yh = f_in.variables['yh'] + z_l = f_in.variables['z_l'] + z_i = f_in.variables['z_i'] + tax = f_in.variables['time'] + + #-- msftyyz + varname = 'vmo' + msftyyz = np.ma.ones((len(tax),3,len(z_l),len(yh)))*0. + msftyyz[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) + msftyyz[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) + msftyyz[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) + msftyyz[msftyyz.mask] = 1.e20 + msftyyz = np.ma.array(msftyyz,fill_value=1.e20) + msftyyz.long_name = 'Ocean Y Overturning Mass Streamfunction' + msftyyz.units = 'kg s-1' + msftyyz.cell_methods = 'z_l:sum yh:sum basin:mean time:mean' + msftyyz.time_avg_info = 'average_T1,average_T2,average_DT' + msftyyz.standard_name = 'ocean_y_overturning_mass_streamfunction' + + #-- msftyzmpa + varname = 'vhGM' + msftyzmpa = np.ma.ones((len(tax),3,len(z_l),len(yh)))*0. + msftyzmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) + msftyzmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) + msftyzmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) + msftyzmpa[msftyzmpa.mask] = 1.e20 + msftyzmpa = np.ma.array(msftyzmpa,fill_value=1.e20) + msftyzmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' + msftyzmpa.units = 'kg s-1' + msftyzmpa.cell_methods = 'z_l:sum yh:sum basin:mean time:mean' + msftyzmpa.time_avg_info = 'average_T1,average_T2,average_DT' + msftyzmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ + 'mesoscale_advection' + + #-- msftyzsmpa + varname = 'vhml' + msftyzsmpa = np.ma.ones((len(tax),3,len(z_l),len(yh)))*0. + msftyzsmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) + msftyzsmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) + msftyzsmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) + msftyzsmpa[msftyzsmpa.mask] = 1.e20 + msftyzsmpa = np.ma.array(msftyzsmpa,fill_value=1.e20) + msftyzsmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized submesoscale advection' + msftyzsmpa.units = 'kg s-1' + msftyzsmpa.cell_methods = 'z_l:sum yh:sum basin:mean time:mean' + msftyzsmpa.time_avg_info = 'average_T1,average_T2,average_DT' + msftyzsmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ + 'submesoscale_advection' + + #-- Read time bounds + nv = f_in.variables['nv'] + average_T1 = f_in.variables['average_T1'] + average_T2 = f_in.variables['average_T2'] + average_DT = f_in.variables['average_DT'] + time_bnds = f_in.variables['time_bnds'] + + #-- Generate output filename + if args.outfile is None: + if hasattr(f_in,'filename'): + args.outfile = f_in.filename + else: + args.outfile = os.path.basename(args.infile) + args.outfile = args.outfile.split('.') + args.outfile[-2] = args.outfile[-2]+'_refined' + args.outfile = '.'.join(args.outfile) + + #-- Write output file + try: + os.remove(args.outfile) + except: + pass + + if os.path.exists(args.outfile): + raise IOError('Output netCDF file already exists.') + exit(1) + + f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') + f_out.setncatts(f_in.__dict__) + f_out.filename = args.outfile + + time_dim = f_out.createDimension('time', size=None) + basin_dim = f_out.createDimension('basin', size=3) + strlen_dim = f_out.createDimension('strlen', size=21) + yh_dim = f_out.createDimension('yh', size=len(yh[:])) + z_l_dim = f_out.createDimension('z_l', size=len(z_l[:])) + z_i_dim = f_out.createDimension('z_i', size=len(z_i[:])) + nv_dim = f_out.createDimension('nv', size=len(nv[:])) + + time_out = f_out.createVariable('time', np.float64, ('time')) + #basin_out = f_out.createVariable('basin', np.int32, ('basin')) + yh_out = f_out.createVariable('yh', np.float64, ('yh')) + region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) + z_l_out = f_out.createVariable('z_l', np.float64, ('z_l')) + z_i_out = f_out.createVariable('z_i', np.float64, ('z_i')) + nv_out = f_out.createVariable('nv', np.float64, ('nv')) + + msftyyz_out = f_out.createVariable('msftyyz', np.float32, ('time', 'basin', 'z_l', 'yh'), fill_value=1.e20) + msftyyz_out.missing_value = 1.e20 + + msftyzsmpa_out = f_out.createVariable('msftyzsmpa', np.float32, ('time', 'basin', 'z_l', 'yh'), fill_value=1.e20) + msftyzsmpa_out.missing_value = 1.e20 + + msftyzmpa_out = f_out.createVariable('msftyzmpa', np.float32, ('time', 'basin', 'z_l', 'yh'), fill_value=1.e20) + msftyzmpa_out.missing_value = 1.e20 + + average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) + average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) + average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) + time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) + + time_out.setncatts(tax.__dict__) + yh_out.setncatts(yh.__dict__) + z_l_out.setncatts(z_l.__dict__) + z_i_out.setncatts(z_i.__dict__) + nv_out.setncatts(nv.__dict__) + + for k in msftyyz.__dict__.keys(): + if k[0] != '_': msftyyz_out.setncattr(k,msftyyz.__dict__[k]) + + for k in msftyzsmpa.__dict__.keys(): + if k[0] != '_': msftyzsmpa_out.setncattr(k,msftyzsmpa.__dict__[k]) + + for k in msftyzmpa.__dict__.keys(): + if k[0] != '_': msftyzmpa_out.setncattr(k,msftyzmpa.__dict__[k]) + + average_T1_out.setncatts(average_T1.__dict__) + average_T2_out.setncatts(average_T2.__dict__) + average_DT_out.setncatts(average_DT.__dict__) + time_bnds_out.setncatts(time_bnds.__dict__) + + time_out[:] = np.array(tax[:]) + yh_out[:] = np.array(yh[:]) + z_l_out[:] = np.array(z_l[:]) + z_i_out[:] = np.array(z_i[:]) + nv_out[:] = np.array(nv[:]) + + msftyyz_out[:] = np.ma.array(msftyyz[:]) + msftyzsmpa_out[:] = np.ma.array(msftyzsmpa[:]) + msftyzmpa_out[:] = np.ma.array(msftyzmpa[:]) + + average_T1_out[:] = average_T1[:] + average_T2_out[:] = average_T2[:] + average_DT_out[:] = average_DT[:] + time_bnds_out[:] = time_bnds[:] + + region_out[:] = nc.stringtochar(region) + + f_out.close() + + exit(0) + +if __name__ == '__main__': + run() diff --git a/tools/analysis/m6toolbox.py b/tools/analysis/m6toolbox.py index ba44ae2252..7d925e6a85 100644 --- a/tools/analysis/m6toolbox.py +++ b/tools/analysis/m6toolbox.py @@ -169,6 +169,34 @@ def maskFromDepth(depth, zCellTop): wet[depth>-zCellTop] = 1 return wet +def MOCpsi(vh, vmsk=None): + """Sums 'vh' zonally and cumulatively in the vertical to yield an overturning stream function, psi(y,z).""" + shape = list(vh.shape); shape[-3] += 1 + psi = np.zeros(shape[:-1]) + if len(shape)==3: + for k in range(shape[-3]-1,0,-1): + if vmsk is None: psi[k-1,:] = psi[k,:] - vh[k-1].sum(axis=-1) + else: psi[k-1,:] = psi[k,:] - (vmsk*vh[k-1]).sum(axis=-1) + else: + for n in range(shape[0]): + for k in range(shape[-3]-1,0,-1): + if vmsk is None: psi[n,k-1,:] = psi[n,k,:] - vh[n,k-1].sum(axis=-1) + else: psi[n,k-1,:] = psi[n,k,:] - (vmsk*vh[n,k-1]).sum(axis=-1) + return psi + + +def moc_maskedarray(vh,mask=None): + if mask is not None: + _mask = np.ma.masked_where(np.not_equal(mask,1.),mask) + else: + _mask = 1. + _vh = np.ma.masked_where(np.ma.equal(vh,0.),vh) + _vh = _vh * _mask + _vh = _vh[:,::-1,:] # flip z-axis so running sum is from ocean floor to surface + _vh = np.ma.cumsum(np.ma.sum(_vh,axis=-1),axis=1) + _vh = _vh[:,::-1,:] # flip z-axis back to original order + return _vh + def nearestJI(x, y, xy0): """ Find (j,i) of cell with center nearest to (x0,y0). From 7173edbf2fc7f7629efa94a74ef1b6f237bdb997 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 20 Sep 2017 10:39:53 -0400 Subject: [PATCH 24/89] MOC reported on interfaces, not levels - z_i now used instead of z_l - MOC at the bottom-most interface is 0. by definition - topo masking appears to be correct --- tools/analysis/CMIP6_offline_diags.py | 18 +++++++++--------- tools/analysis/m6toolbox.py | 12 +++++++----- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/tools/analysis/CMIP6_offline_diags.py b/tools/analysis/CMIP6_offline_diags.py index 5039c00cce..c22db96398 100755 --- a/tools/analysis/CMIP6_offline_diags.py +++ b/tools/analysis/CMIP6_offline_diags.py @@ -87,7 +87,7 @@ def main(args): #-- msftyyz varname = 'vmo' - msftyyz = np.ma.ones((len(tax),3,len(z_l),len(yh)))*0. + msftyyz = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. msftyyz[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyyz[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyyz[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) @@ -95,13 +95,13 @@ def main(args): msftyyz = np.ma.array(msftyyz,fill_value=1.e20) msftyyz.long_name = 'Ocean Y Overturning Mass Streamfunction' msftyyz.units = 'kg s-1' - msftyyz.cell_methods = 'z_l:sum yh:sum basin:mean time:mean' + msftyyz.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' msftyyz.time_avg_info = 'average_T1,average_T2,average_DT' msftyyz.standard_name = 'ocean_y_overturning_mass_streamfunction' #-- msftyzmpa varname = 'vhGM' - msftyzmpa = np.ma.ones((len(tax),3,len(z_l),len(yh)))*0. + msftyzmpa = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. msftyzmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyzmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyzmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) @@ -109,14 +109,14 @@ def main(args): msftyzmpa = np.ma.array(msftyzmpa,fill_value=1.e20) msftyzmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' msftyzmpa.units = 'kg s-1' - msftyzmpa.cell_methods = 'z_l:sum yh:sum basin:mean time:mean' + msftyzmpa.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' msftyzmpa.time_avg_info = 'average_T1,average_T2,average_DT' msftyzmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ 'mesoscale_advection' #-- msftyzsmpa varname = 'vhml' - msftyzsmpa = np.ma.ones((len(tax),3,len(z_l),len(yh)))*0. + msftyzsmpa = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. msftyzsmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyzsmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyzsmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) @@ -124,7 +124,7 @@ def main(args): msftyzsmpa = np.ma.array(msftyzsmpa,fill_value=1.e20) msftyzsmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized submesoscale advection' msftyzsmpa.units = 'kg s-1' - msftyzsmpa.cell_methods = 'z_l:sum yh:sum basin:mean time:mean' + msftyzsmpa.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' msftyzsmpa.time_avg_info = 'average_T1,average_T2,average_DT' msftyzsmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ 'submesoscale_advection' @@ -176,13 +176,13 @@ def main(args): z_i_out = f_out.createVariable('z_i', np.float64, ('z_i')) nv_out = f_out.createVariable('nv', np.float64, ('nv')) - msftyyz_out = f_out.createVariable('msftyyz', np.float32, ('time', 'basin', 'z_l', 'yh'), fill_value=1.e20) + msftyyz_out = f_out.createVariable('msftyyz', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=1.e20) msftyyz_out.missing_value = 1.e20 - msftyzsmpa_out = f_out.createVariable('msftyzsmpa', np.float32, ('time', 'basin', 'z_l', 'yh'), fill_value=1.e20) + msftyzsmpa_out = f_out.createVariable('msftyzsmpa', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=1.e20) msftyzsmpa_out.missing_value = 1.e20 - msftyzmpa_out = f_out.createVariable('msftyzmpa', np.float32, ('time', 'basin', 'z_l', 'yh'), fill_value=1.e20) + msftyzmpa_out = f_out.createVariable('msftyzmpa', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=1.e20) msftyzmpa_out.missing_value = 1.e20 average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) diff --git a/tools/analysis/m6toolbox.py b/tools/analysis/m6toolbox.py index 7d925e6a85..75e79870c4 100644 --- a/tools/analysis/m6toolbox.py +++ b/tools/analysis/m6toolbox.py @@ -190,11 +190,13 @@ def moc_maskedarray(vh,mask=None): _mask = np.ma.masked_where(np.not_equal(mask,1.),mask) else: _mask = 1. - _vh = np.ma.masked_where(np.ma.equal(vh,0.),vh) - _vh = _vh * _mask - _vh = _vh[:,::-1,:] # flip z-axis so running sum is from ocean floor to surface - _vh = np.ma.cumsum(np.ma.sum(_vh,axis=-1),axis=1) - _vh = _vh[:,::-1,:] # flip z-axis back to original order + _vh = vh * _mask + _vh_btm = np.ma.expand_dims(_vh[:,-1,:,:]*0.,axis=1) + _vh = np.ma.concatenate((_vh,_vh_btm),axis=1) + _vh = np.ma.sum(_vh,axis=-1) + _vh = _vh[:,::-1] # flip z-axis so running sum is from ocean floor to surface + _vh = np.ma.cumsum(_vh,axis=1) + _vh = _vh[:,::-1] # flip z-axis back to original order return _vh def nearestJI(x, y, xy0): From 4ef960ef200bdc1a7b4a4e1f24509f1908224e31 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 21 Sep 2017 21:18:35 -0400 Subject: [PATCH 25/89] MOM6: Merge pull request #601 from adcroft/fix_units_vhml_vhgm - Updates available_diags - Merge NOAA-GFDL/MOM6@a4cc554 closes #162 - Merge NOAA-GFDL/MOM6@950718f updates #165 and #154 - NOAA-GFDL/MOM6@a2101cf Merge branch 'adcroft-fix_uhml_units' into dev/gfdl - NOAA-GFDL/MOM6@11ad230 Add units for uhml,vhml - NOAA-GFDL/MOM6@fc732ac Merge pull request #604 from breichl/user/bgr/EPBL_OSBL_DIAG - NOAA-GFDL/MOM6@c4ebae8 Merge pull request #606 from adcroft/diag_rfcn1 - NOAA-GFDL/MOM6@2350dba Merge pull request #605 from NOAA-GFDL/halo_update_clock - NOAA-GFDL/MOM6@8dada7e Fixes allocation issue for diagnostics in rho coords - NOAA-GFDL/MOM6@4ac331c Merge pull request #603 from ashao/remapped_boundary_flux_tendencies - NOAA-GFDL/MOM6@a204620 Use clock argument in halo update calls - NOAA-GFDL/MOM6@9be672e Add cmor description to ePBL_h_ML diagnostic - NOAA-GFDL/MOM6@4cfab37 +Added optional clock arg to halo update routines - NOAA-GFDL/MOM6@950718f Merge pull request #601 from adcroft/fix_units_vhml_vhgm - NOAA-GFDL/MOM6@78724e3 Merge pull request #600 from nikizadehgfdl/user/nnz/fix_OMP_issue_similar_588 - NOAA-GFDL/MOM6@a8f0b99 Change units of parameterized transport to kg s-1 - NOAA-GFDL/MOM6@a4cc554 Merge pull request #597 from ashao/update_grid_after_boundaryfluxes - NOAA-GFDL/MOM6@f9f97de Merge pull request #598 from NOAA-GFDL/input_filename_F - NOAA-GFDL/MOM6@baa8039 Merge pull request #599 from adcroft/diag_rfcn1 - NOAA-GFDL/MOM6@2987394 Progress towards conservative boundary flux tendencies - NOAA-GFDL/MOM6@eaa407a Fix OMP issue similar to 588 - NOAA-GFDL/MOM6@5cf60bf Generate profile for diagnostic density coordinate - NOAA-GFDL/MOM6@9006d33 Removed trailing white space - NOAA-GFDL/MOM6@3f10926 +Added 'F' input_filename option - NOAA-GFDL/MOM6@a972015 Fix for nonzero remapped vertical diffusion tendencies - NOAA-GFDL/MOM6@c4f6b72 Reordered diagnostic calls at end of step_MOM --- .../global_ALE/layer/available_diags.000000 | 32 ++++++------ .../global_ALE/z/available_diags.000000 | 52 +++++++++---------- src/MOM6 | 2 +- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 40c3463c96..7e6e8cdaa8 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -985,35 +985,35 @@ ! cell_methods: z_l:mean "ocean_model", "uhGM" [Unused] ! long_name: Time Mean Diffusive Zonal Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xq:point yh:sum zl:sum "ocean_model", "uhGM_xyave" [Unused] ! long_name: Time Mean Diffusive Zonal Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: zl:sum "ocean_model_z", "uhGM" [Unused] ! long_name: Time Mean Diffusive Zonal Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xq:point yh:sum z_l:sum "ocean_model_z", "uhGM_xyave" [Unused] ! long_name: Time Mean Diffusive Zonal Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: z_l:sum "ocean_model", "vhGM" [Unused] ! long_name: Time Mean Diffusive Meridional Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xh:sum yq:point zl:sum "ocean_model", "vhGM_xyave" [Unused] ! long_name: Time Mean Diffusive Meridional Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: zl:sum "ocean_model_z", "vhGM" [Unused] ! long_name: Time Mean Diffusive Meridional Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xh:sum yq:point z_l:sum "ocean_model_z", "vhGM_xyave" [Unused] ! long_name: Time Mean Diffusive Meridional Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: z_l:sum "ocean_model", "GMwork" [Used] (CMOR equivalent is "tnkebto") ! long_name: Integrated Tendency of Ocean Mesoscale Eddy KE from Parameterized Eddy Advection @@ -1202,35 +1202,35 @@ ! cell_methods: z_i:point "ocean_model", "uhml" [Unused] ! long_name: Zonal Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xq:point yh:sum zl:sum "ocean_model", "uhml_xyave" [Unused] ! long_name: Zonal Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: zl:sum "ocean_model_z", "uhml" [Unused] ! long_name: Zonal Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xq:point yh:sum z_l:sum "ocean_model_z", "uhml_xyave" [Unused] ! long_name: Zonal Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: z_l:sum "ocean_model", "vhml" [Unused] ! long_name: Meridional Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xh:sum yq:point zl:sum "ocean_model", "vhml_xyave" [Unused] ! long_name: Meridional Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: zl:sum "ocean_model_z", "vhml" [Unused] ! long_name: Meridional Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xh:sum yq:point z_l:sum "ocean_model_z", "vhml_xyave" [Unused] ! long_name: Meridional Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: z_l:sum "ocean_model", "MLu_restrat_time" [Unused] ! long_name: Mixed Layer Zonal Restratification Timescale diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 66b70730fb..51a7985728 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -1025,35 +1025,35 @@ ! cell_methods: z_l:mean "ocean_model", "uhGM" [Unused] ! long_name: Time Mean Diffusive Zonal Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xq:point yh:sum zl:sum "ocean_model", "uhGM_xyave" [Unused] ! long_name: Time Mean Diffusive Zonal Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: zl:sum "ocean_model_z", "uhGM" [Unused] ! long_name: Time Mean Diffusive Zonal Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xq:point yh:sum z_l:sum "ocean_model_z", "uhGM_xyave" [Unused] ! long_name: Time Mean Diffusive Zonal Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: z_l:sum "ocean_model", "vhGM" [Unused] ! long_name: Time Mean Diffusive Meridional Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xh:sum yq:point zl:sum "ocean_model", "vhGM_xyave" [Unused] ! long_name: Time Mean Diffusive Meridional Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: zl:sum "ocean_model_z", "vhGM" [Unused] ! long_name: Time Mean Diffusive Meridional Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xh:sum yq:point z_l:sum "ocean_model_z", "vhGM_xyave" [Unused] ! long_name: Time Mean Diffusive Meridional Thickness Flux - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: z_l:sum "ocean_model", "GMwork" [Used] (CMOR equivalent is "tnkebto") ! long_name: Integrated Tendency of Ocean Mesoscale Eddy KE from Parameterized Eddy Advection @@ -1242,35 +1242,35 @@ ! cell_methods: z_i:point "ocean_model", "uhml" [Unused] ! long_name: Zonal Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xq:point yh:sum zl:sum "ocean_model", "uhml_xyave" [Unused] ! long_name: Zonal Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: zl:sum "ocean_model_z", "uhml" [Unused] ! long_name: Zonal Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xq:point yh:sum z_l:sum "ocean_model_z", "uhml_xyave" [Unused] ! long_name: Zonal Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: z_l:sum "ocean_model", "vhml" [Unused] ! long_name: Meridional Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xh:sum yq:point zl:sum "ocean_model", "vhml_xyave" [Unused] ! long_name: Meridional Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: zl:sum "ocean_model_z", "vhml" [Unused] ! long_name: Meridional Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: xh:sum yq:point z_l:sum "ocean_model_z", "vhml_xyave" [Unused] ! long_name: Meridional Thickness Flux to Restratify Mixed Layer - ! units: meter3 second-1 + ! units: kg s-1 ! cell_methods: z_l:sum "ocean_model", "MLu_restrat_time" [Unused] ! long_name: Mixed Layer Zonal Restratification Timescale @@ -2293,35 +2293,35 @@ "ocean_model", "boundary_forcing_heat_tendency" [Unused] ! long_name: Boundary forcing heat tendency ! units: Watts/m2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "boundary_forcing_heat_tendency_xyave" [Unused] ! long_name: Boundary forcing heat tendency ! units: Watts/m2 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "boundary_forcing_heat_tendency" [Unused] ! long_name: Boundary forcing heat tendency ! units: Watts/m2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "boundary_forcing_heat_tendency_xyave" [Unused] ! long_name: Boundary forcing heat tendency ! units: Watts/m2 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "boundary_forcing_salt_tendency" [Unused] ! long_name: Boundary forcing salt tendency ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "boundary_forcing_salt_tendency_xyave" [Unused] ! long_name: Boundary forcing salt tendency ! units: kg m-2 s-1 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "boundary_forcing_salt_tendency" [Unused] ! long_name: Boundary forcing salt tendency ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "boundary_forcing_salt_tendency_xyave" [Unused] ! long_name: Boundary forcing salt tendency ! units: kg m-2 s-1 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "boundary_forcing_heat_tendency_2d" [Unused] ! long_name: Depth integrated boundary forcing of ocean heat ! units: Watts/m2 @@ -2745,7 +2745,7 @@ ! standard_name: nondownwelling_shortwave_flux_in_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_h_ML" [Unused] - ! long_name: Surface mixed layer depth + ! long_name: Surface boundary layer depth ! units: meter ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_TKE_wind" [Unused] @@ -2821,7 +2821,7 @@ ! units: non-dim ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_OSBL" [Unused] - ! long_name: Boundary layer depth from the iteration. + ! long_name: ePBL Surface Boundary layer depth. ! units: meter ! cell_methods: xh:mean yh:mean "ocean_model", "MLD_EKMAN" [Unused] diff --git a/src/MOM6 b/src/MOM6 index 3d60b91ae5..a2101cf16e 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 3d60b91ae501c188c575244cd77128bd16e30a51 +Subproject commit a2101cf16e68a6583ecd3cad0852e3b55be10493 From 9984e3683301b1128e45c3865ad60ae51131a163 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 21 Sep 2017 21:33:48 -0400 Subject: [PATCH 26/89] OM4: Adds monthly z-space transports - Adds vmo, vhml, vhGM to ocean_month_z - Adds umo, uhml, uhGM to ocean_annual_z - Keeps vmo, vhml, vhGM in ocean_annual_z - Closes #152 --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 6 ++++++ ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index 879448920c..3424520eaf 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -157,18 +157,24 @@ #"ocean_model", "vo", "vo", "ocean_month", "all", "mean", "none",2 #"ocean_model", "umo", "umo", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","umo", "umo", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","umo", "umo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vmo", "vmo", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","vmo", "vmo", "ocean_annual_z", "all", "mean", "none",2 + "ocean_model_z","vmo", "vmo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "wmo", "wmo", "ocean_annual", "all", "mean", "none",2 # needs to be coded #"ocean_model", "wmo", "wmo", "ocean_month", "all", "mean", "none",2 # needs to be coded #"ocean_model", "uhml", "uhml", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","uhml", "uhml", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","uhml", "uhml", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vhml", "vhml", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","vhml", "vhml", "ocean_annual_z", "all", "mean", "none",2 + "ocean_model_z","vhml", "vhml", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "uhGM", "uhGM", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","uhGM", "uhGM", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","uhGM", "uhGM", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vhGM", "vhGM", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","vhGM", "vhGM", "ocean_annual_z", "all", "mean", "none",2 + "ocean_model_z","vhGM", "vhGM", "ocean_month_z", "all", "mean", "none",2 "ocean_model_z","uh", "uh", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","vh", "vh", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","T_adx", "T_adx", "ocean_annual_z", "all", "mean", "none",2 diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup index 262b07f9e7..1499b799fc 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup @@ -156,18 +156,24 @@ #"ocean_model", "vo", "vo", "ocean_month", "all", "mean", "none",2 #"ocean_model", "umo", "umo", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","umo", "umo", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","umo", "umo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vmo", "vmo", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","vmo", "vmo", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","vmo", "vmo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "wmo", "wmo", "ocean_annual", "all", "mean", "none",2 # needs to be coded #"ocean_model", "wmo", "wmo", "ocean_month", "all", "mean", "none",2 # needs to be coded #"ocean_model", "uhml", "uhml", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","uhml", "uhml", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","uhml", "uhml", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vhml", "vhml", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","vhml", "vhml", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","vhml", "vhml", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "uhGM", "uhGM", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","uhGM", "uhGM", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","uhGM", "uhGM", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vhGM", "vhGM", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","vhGM", "vhGM", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","vhGM", "vhGM", "ocean_month_z", "all", "mean", "none",2 "ocean_model_z","uh", "uh", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","vh", "vh", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","T_adx", "T_adx", "ocean_annual_z", "all", "mean", "none",2 From 3327f1be1b0b085d2a49eb6c5cee8b298b4a3c03 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 21 Sep 2017 21:43:49 -0400 Subject: [PATCH 27/89] OM4: Clean up diag_table.MOM6_spinup - Disabling of diagnostics was using a mix of "#" and "# " which made scanning the table hard and diffing with diag_table.MOM6 impossible to read. - This is a white space change and not a change in diags. --- ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup | 100 +++++++++--------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup index 1499b799fc..29f0c558c2 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup @@ -71,9 +71,9 @@ # CMIP6/OMIP Table H1: scalar fields such as tracers, cell mass/volume, sea level, MLD # Generally save annuals, and sometimes monthly and daily. "ocean_model", "pbo", "pbo", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "pbo", "pbo", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "pbo", "pbo", "ocean_month", "all", "mean", "none",2 "ocean_model", "pso", "pso", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "pso", "pso", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "pso", "pso", "ocean_month", "all", "mean", "none",2 "ocean_model", "masscello", "masscello", "ocean_annual", "all", "mean", "none",2 #"ocean_model", "masscello", "masscello", "ocean_month", "all", "mean", "none",2 "ocean_model", "masso", "masso", "ocean_scalar_month", "all", "mean", "none",2 # global sum masscello @@ -84,14 +84,14 @@ "ocean_model", "volo", "volo", "ocean_scalar_annual", "all", "mean", "none",2 # global sum thkcello "ocean_model", "zos", "zos", "ocean_annual", "all", "mean", "none",2 "ocean_model", "zos", "zos", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "zos", "zos", "ocean_daily", "all", "mean", "none",2 +#"ocean_model", "zos", "zos", "ocean_daily", "all", "mean", "none",2 "ocean_model", "zossq", "zossq", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "zossq", "zossq", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "zossq", "zossq", "ocean_month", "all", "mean", "none",2 #"ocean_model", "zostoga", "zostoga", "ocean_month", "all", "mean", "none",2 # to be done offline "ocean_model", "thetao", "thetao", "ocean_annual", "all", "mean", "none",2 # if use pre-TEOS10 #"ocean_model", "thetao", "thetao", "ocean_month", "all", "mean", "none",2 # if use pre-TEOS10 "ocean_model_z", "thetao", "thetao", "ocean_annual_z", "all", "mean", "none",2 # if use pre-TEOS10 -# "ocean_model_z", "thetao", "thetao", "ocean_month_z", "all", "mean", "none",2 # if use pre-TEOS10 +#"ocean_model_z", "thetao", "thetao", "ocean_month_z", "all", "mean", "none",2 # if use pre-TEOS10 "ocean_model_z", "thetao_xyave", "thetao_xyave", "ocean_annual_z", "all", "mean", "none",2 # if use pre-TEOS10 "ocean_model", "thetaoga", "thetaoga", "ocean_scalar_month", "all", "mean", "none",2 # global mean theta "ocean_model", "thetaoga", "thetaoga", "ocean_scalar_annual", "all", "mean", "none",2 # global mean theta @@ -101,41 +101,41 @@ #"ocean_model", "bigthetaoga", "bigthetaoga", "ocean_scalar_month", "all", "mean", "none",2 # if use TEOS10 "ocean_model", "tos", "tos", "ocean_annual", "all", "mean", "none",2 "ocean_model", "tos", "tos", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "tos", "tos", "ocean_daily", "all", "mean", "none",2 +#"ocean_model", "tos", "tos", "ocean_daily", "all", "mean", "none",2 "ocean_model", "tosga", "tosga", "ocean_scalar_annual", "all", "mean", "none",2 "ocean_model", "tosga", "tosga", "ocean_scalar_month", "all", "mean", "none",2 -# "ocean_model", "tossq", "tossq", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "tossq", "tossq", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "tossq", "tossq", "ocean_daily", "all", "mean", "none",2 +#"ocean_model", "tossq", "tossq", "ocean_annual", "all", "mean", "none",2 +#"ocean_model", "tossq", "tossq", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "tossq", "tossq", "ocean_daily", "all", "mean", "none",2 "ocean_model", "tob", "tob", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "tob", "tob", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "tob", "tob", "ocean_month", "all", "mean", "none",2 "ocean_model", "so", "so", "ocean_annual", "all", "mean", "none",2 #"ocean_model", "so", "so", "ocean_month", "all", "mean", "none",2 "ocean_model_z", "so", "so", "ocean_annual_z", "all", "mean", "none",2 -# "ocean_model_z", "so", "so", "ocean_month_z", "all", "mean", "none",2 +#"ocean_model_z", "so", "so", "ocean_month_z", "all", "mean", "none",2 "ocean_model_z", "so_xyave", "so_xyave", "ocean_annual_z", "all", "mean", "none",2 "ocean_model", "soga", "soga", "ocean_scalar_annual", "all", "mean", "none",2 "ocean_model", "soga", "soga", "ocean_scalar_month", "all", "mean", "none",2 "ocean_model", "sos", "sos", "ocean_annual", "all", "mean", "none",2 "ocean_model", "sos", "sos", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "sos", "sos", "ocean_daily", "all", "mean", "none",2 +#"ocean_model", "sos", "sos", "ocean_daily", "all", "mean", "none",2 "ocean_model", "sosga", "sosga", "ocean_scalar_annual", "all", "mean", "none",2 "ocean_model", "sosga", "sosga", "ocean_scalar_month", "all", "mean", "none",2 -# "ocean_model", "sossq", "sossq", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "sossq", "sossq", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "sossq", "sossq", "ocean_daily", "all", "mean", "none",2 +#"ocean_model", "sossq", "sossq", "ocean_annual", "all", "mean", "none",2 +#"ocean_model", "sossq", "sossq", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "sossq", "sossq", "ocean_daily", "all", "mean", "none",2 "ocean_model", "sob", "sob", "ocean_annual", "all", "mean", "none",2 "ocean_model", "sob", "sob", "ocean_month", "all", "mean", "none",2 "ocean_model_z", "obvfsq", "obvfsq", "ocean_annual_z", "all", "mean", "none",2 -# "ocean_model_z", "obvfsq", "obvfsq", "ocean_month_z", "all", "mean", "none",2 +#"ocean_model_z", "obvfsq", "obvfsq", "ocean_month_z", "all", "mean", "none",2 "ocean_model_z", "agessc", "agessc", "ocean_annual_z", "all", "mean", "none",2 #"ocean_model", "cfc11", "cfc11", "ocean_annual", "all", "mean", "none",2 # get from generic tracer module #"ocean_model", "cfc12", "cfc12", "ocean_annual", "all", "mean", "none",2 # get from generic tracer module #"ocean_model", "sf6", "sf6", "ocean_annual", "all", "mean", "none",2 # get from generic tracer module "ocean_model", "mlotst" "mlotst", "ocean_annual", "all", "mean", "none",2 "ocean_model", "mlotst" "mlotst", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "mlotstsq" "mlotstsq", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "mlotstsq" "mlotstsq", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "mlotstsq" "mlotstsq", "ocean_annual", "all", "mean", "none",2 +#"ocean_model", "mlotstsq" "mlotstsq", "ocean_month", "all", "mean", "none",2 #"ocean_model", "msftbarot" "msftbarot", "ocean_month", "all", "mean", "none",2 # to be done offline @@ -148,11 +148,11 @@ # Offline calculations needed for meridional overturning streamfunctions. #"ocean_model", "uo", "uo", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","uo", "uo", "ocean_annual_z", "all", "mean", "none",2 -# "ocean_model_z","uo", "uo", "ocean_month_z", "all", "mean", "none",2 +#"ocean_model_z","uo", "uo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "uo", "uo", "ocean_month", "all", "mean", "none",2 #"ocean_model", "vo", "vo", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","vo", "vo", "ocean_annual_z", "all", "mean", "none",2 -# "ocean_model_z","vo", "vo", "ocean_month_z", "all", "mean", "none",2 +#"ocean_model_z","vo", "vo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vo", "vo", "ocean_month", "all", "mean", "none",2 #"ocean_model", "umo", "umo", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","umo", "umo", "ocean_annual_z", "all", "mean", "none",2 @@ -196,8 +196,8 @@ "ocean_model", "umo_2d", "umo_2d", "ocean_annual", "all", "mean", "none",2 "ocean_model", "vmo_2d", "vmo_2d", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "umo_2d", "umo_2d", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "vmo_2d", "vmo_2d", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "umo_2d", "umo_2d", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "vmo_2d", "vmo_2d", "ocean_month", "all", "mean", "none",2 # Sections for CMIP6/OMIP choke points Table J1 @@ -341,8 +341,8 @@ # extra mass flux information beyond CMIP6/OMIP Table K1 "ocean_model", "net_massout", "net_massout", "ocean_annual", "all", "mean", "none",2 "ocean_model", "net_massin", "net_massin", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "net_massout", "net_massout", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "net_massin", "net_massin", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "net_massout", "net_massout", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "net_massin", "net_massin", "ocean_month", "all", "mean", "none",2 # ----------------------------------------------------------------------------------------- @@ -356,7 +356,7 @@ # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table K3: boundary heat fluxes -# "ocean_model", "hfgeou", "hfgeou", "ocean_annual", "all", "mean", "none",2 # geothermal heat flux is static +#"ocean_model", "hfgeou", "hfgeou", "ocean_annual", "all", "mean", "none",2 # geothermal heat flux is static "ocean_model", "hfrainds", "hfrainds", "ocean_annual", "all", "mean", "none",2 "ocean_model", "hfevapds", "hfevapds", "ocean_annual", "all", "mean", "none",2 "ocean_model", "hfrunoffds", "hfrunoffds", "ocean_annual", "all", "mean", "none",2 @@ -367,11 +367,11 @@ "ocean_model", "rlntds", "rlntds", "ocean_annual", "all", "mean", "none",2 "ocean_model", "hflso", "hflso", "ocean_annual", "all", "mean", "none",2 "ocean_model", "hfsso", "hfsso", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "rsntds", "rsntds" "ocean_annual", "all", "mean", "none",2 - "ocean_model", "rsdo", "rsdo" "ocean_annual", "all", "mean", "none",2 - "ocean_model", "hfds", "hfds" "ocean_annual", "all", "mean", "none",2 + "ocean_model", "rsntds", "rsntds", "ocean_annual", "all", "mean", "none",2 + "ocean_model", "rsdo", "rsdo", "ocean_annual", "all", "mean", "none",2 + "ocean_model", "hfds", "hfds", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "hfgeou", "hfgeou", "ocean_month", "all", "mean", "none",2 # geothermal heat flux is static +#"ocean_model", "hfgeou", "hfgeou", "ocean_month", "all", "mean", "none",2 # geothermal heat flux is static "ocean_model", "hfrainds", "hfrainds", "ocean_month", "all", "mean", "none",2 # heat content of lprec,fprec,condensate "ocean_model", "hfevapds", "hfevapds", "ocean_month", "all", "mean", "none",2 # heat content of mass leaving ocean "ocean_model", "hfrunoffds", "hfrunoffds", "ocean_month", "all", "mean", "none",2 # heat content of lrunoff,frunoff @@ -383,9 +383,9 @@ "ocean_model", "rlntds", "rlntds", "ocean_month", "all", "mean", "none",2 # longwave down "ocean_model", "hflso", "hflso", "ocean_month", "all", "mean", "none",2 # latent heat for evap+melt "ocean_model", "hfsso", "hfsso", "ocean_month", "all", "mean", "none",2 # sensible from air-sea and ice-sea - "ocean_model", "rsntds", "rsntds" "ocean_month", "all", "mean", "none",2 # shortwave -# "ocean_model", "rsdo", "rsdo" "ocean_month", "all", "mean", "none",2 # penetrative shortwave flux at interface - "ocean_model", "hfds", "hfds" "ocean_month", "all", "mean", "none",2 # total heat entering ocean surface + "ocean_model", "rsntds", "rsntds", "ocean_month", "all", "mean", "none",2 # shortwave +#"ocean_model", "rsdo", "rsdo", "ocean_month", "all", "mean", "none",2 # penetrative shortwave flux at interface + "ocean_model", "hfds", "hfds", "ocean_month", "all", "mean", "none",2 # total heat entering ocean surface # Extra heat flux terms beyond Table K3 from CMIP6/OMIP "ocean_model", "net_heat_coupler", "net_heat_coupler", "ocean_annual", "all", "mean", "none",2 @@ -451,8 +451,8 @@ "ocean_model_z", "S_advection_xy", "S_advection_xy", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z", "Th_tendency_vert_remap", "Th_tendency_vert_remap", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z", "Sh_tendency_vert_remap", "Sh_tendency_vert_remap", "ocean_annual_z", "all", "mean", "none",2 - "ocean_model", "boundary_forcing_heat_tendency", "boundary_forcing_heat_tendency", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "boundary_forcing_salt_tendency", "boundary_forcing_salt_tendency", "ocean_annual", "all", "mean", "none",2 + "ocean_model_z","boundary_forcing_heat_tendency", "boundary_forcing_heat_tendency", "ocean_annual_z", "all", "mean", "none",2 + "ocean_model_z","boundary_forcing_salt_tendency", "boundary_forcing_salt_tendency", "ocean_annual_z", "all", "mean", "none",2 # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table M1: vertical tracer diffusivities and potential energy dissipation @@ -476,10 +476,10 @@ # ----------------------------------------------------------------------------------------- # High-frequency -# "ocean_model", "SSU", "ssu", "ocean_daily", "all", "mean", "none",2 -# "ocean_model", "SSV", "ssv", "ocean_daily", "all", "mean", "none",2 -# "ocean_model", "tos", "tos_max", "ocean_daily", "all", "max", "none",2 -# "ocean_model", "tos", "tos_min", "ocean_daily", "all", "min", "none",2 +#"ocean_model", "SSU", "ssu", "ocean_daily", "all", "mean", "none",2 +#"ocean_model", "SSV", "ssv", "ocean_daily", "all", "mean", "none",2 +#"ocean_model", "tos", "tos_max", "ocean_daily", "all", "max", "none",2 +#"ocean_model", "tos", "tos_min", "ocean_daily", "all", "min", "none",2 # ----------------------------------------------------------------------------------------- # various fields @@ -492,8 +492,8 @@ "ocean_model", "temp_layer_ave", "temp_layer_ave", "ocean_annual", "all", "mean", "none",2 "ocean_model", "salt_layer_ave", "salt_layer_ave", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "temp_layer_ave", "temp_layer_ave", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "salt_layer_ave", "salt_layer_ave", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "temp_layer_ave", "temp_layer_ave", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "salt_layer_ave", "salt_layer_ave", "ocean_month", "all", "mean", "none",2 "ocean_model_z", "Kd_interface", "Kd_interface", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z", "Kd_shear", "Kd_shear", "ocean_annual_z", "all", "mean", "none",2 @@ -507,16 +507,16 @@ "ocean_model", "MLD_003", "MLD_003", "ocean_month", "all", "mean", "none",2 "ocean_model", "MLD_003", "MLD_003_min", "ocean_annual", "all", "min", "none",2 "ocean_model", "MLD_003", "MLD_003_max", "ocean_annual", "all", "max", "none",2 -# "ocean_model", "MLD_restrat", "MLD_restrat", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "udml_restrat", "udml_restrat", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "vdml_restrat", "vdml_restrat", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "uml_restrat", "uml_restrat", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "vml_restrat", "vml_restrat", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "MLD_restrat", "MLD_restrat", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "udml_restrat", "udml_restrat", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "vdml_restrat", "vdml_restrat", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "uml_restrat", "uml_restrat", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "vml_restrat", "vml_restrat", "ocean_month", "all", "mean", "none",2 "ocean_model", "LT_Enhancement", "LT_Enhancement", "ocean_annual", "all", "mean", "none",2 "ocean_model", "MSTAR", "MSTAR", "ocean_annual", "all", "mean", "none",2 -# "ocean_model", "LT_Enhancement", "LT_Enhancement", "ocean_month", "all", "mean", "none",2 -# "ocean_model", "MSTAR", "MSTAR", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "LT_Enhancement", "LT_Enhancement", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "MSTAR", "MSTAR", "ocean_month", "all", "mean", "none",2 #"ocean_model", "vintage", "vintage", "ocean_annual", "all", "mean", "none",2 @@ -558,9 +558,9 @@ # ----------------------------------------------------------------------------------------- # Monthly snapshots -# "ocean_model", "mass_wt", "mass_wt", "ocean_month_snap", "all", "none", "none",2 -# "ocean_model", "opottempmint","opottempmint","ocean_month_snap", "all", "none", "none",2 -# "ocean_model", "somint", "somint", "ocean_month_snap", "all", "none", "none",2 +#"ocean_model", "mass_wt", "mass_wt", "ocean_month_snap", "all", "none", "none",2 +#"ocean_model", "opottempmint","opottempmint","ocean_month_snap", "all", "none", "none",2 +#"ocean_model", "somint", "somint", "ocean_month_snap", "all", "none", "none",2 # ----------------------------------------------------------------------------------------- # tracer concentration time tendencies due to various processes From f38fcd1e98c3774f6d725d059edcad671d963ff2 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 21 Sep 2017 21:45:49 -0400 Subject: [PATCH 28/89] OM4: Adds rho-space transports to diag_table - umo,vmo, uhml,vhml, uhGM,vhGM are in ocean_annual_rho2 - vmo, vhml, vhGM are in ocean_month_rho2 - Closes #154 --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 13 +++++++++++++ ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index 3424520eaf..5df4f5d7a4 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -4,8 +4,10 @@ "ocean_month_snap", 1, "months", 1, "days", "time" "ocean_month", 1, "months", 1, "days", "time" "ocean_month_z", 1, "months", 1, "days", "time" +"ocean_month_rho2", 1, "months", 1, "days", "time" "ocean_annual", 12, "months", 1, "days", "time" "ocean_annual_z", 12, "months", 1, "days", "time" +"ocean_annual_rho2", 12, "months", 1, "days", "time" "ocean_scalar_month", 1, "months", 1, "days", "time" "ocean_scalar_annual", 12, "months", 1, "days", "time" "ocean_static", -1, "months", 1, "days", "time" # ocean_static is a protected name. Do not change this line. @@ -190,6 +192,17 @@ "ocean_model", "ndiff_tracer_trans_x_2d_S","ndiff_tracer_trans_x_2d_S", "ocean_annual", "all", "mean", "none",2 "ocean_model", "ndiff_tracer_trans_y_2d_S","ndiff_tracer_trans_y_2d_S", "ocean_annual", "all", "mean", "none",2 +# Density space diagnostics (not necessarily using CMIP names but needed to generate CMIP output in post-processing) + "ocean_model_rho2","umo", "umo", "ocean_annual_rho2", "all", "mean", "none",2 + "ocean_model_rho2","uhGM", "uhGM", "ocean_annual_rho2", "all", "mean", "none",2 + "ocean_model_rho2","uhml", "uhml", "ocean_annual_rho2", "all", "mean", "none",2 + "ocean_model_rho2","vmo", "vmo", "ocean_annual_rho2", "all", "mean", "none",2 + "ocean_model_rho2","vhGM", "vhGM", "ocean_annual_rho2", "all", "mean", "none",2 + "ocean_model_rho2","vhml", "vhml", "ocean_annual_rho2", "all", "mean", "none",2 + "ocean_model_rho2","vmo", "vmo", "ocean_month_rho2", "all", "mean", "none",2 + "ocean_model_rho2","vhGM", "vhGM", "ocean_month_rho2", "all", "mean", "none",2 + "ocean_model_rho2","vhml", "vhml", "ocean_month_rho2", "all", "mean", "none",2 + # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table J1: in support of mass transport through straits # net transport of mass through straits is either done offline using diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup index 29f0c558c2..c3662f0790 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup @@ -189,6 +189,17 @@ "ocean_model", "ndiff_tracer_trans_x_2d_S","ndiff_tracer_trans_x_2d_S", "ocean_annual", "all", "mean", "none",2 "ocean_model", "ndiff_tracer_trans_y_2d_S","ndiff_tracer_trans_y_2d_S", "ocean_annual", "all", "mean", "none",2 +# Density space diagnostics (not necessarily using CMIP names but needed to generate CMIP output in post-processing) +#"ocean_model_rho2","umo", "umo", "ocean_annual_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","uhGM", "uhGM", "ocean_annual_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","uhml", "uhml", "ocean_annual_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","vmo", "vmo", "ocean_annual_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","vhGM", "vhGM", "ocean_annual_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","vhml", "vhml", "ocean_annual_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","vmo", "vmo", "ocean_month_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","vhGM", "vhGM", "ocean_month_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","vhml", "vhml", "ocean_month_rho2", "all", "mean", "none",2 + # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table J1: in support of mass transport through straits # net transport of mass through straits is either done offline using From 6618238c660e9185e644290a096f31ac46518b44 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 21 Sep 2017 21:57:38 -0400 Subject: [PATCH 29/89] OM4: Moved boundary_forcing_heat_tendency to annual_z - Moved both boundary_forcing_heat_tendency and boundary_forcing_saln_tendency to ocean_annual_z. - Updates #161 --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index 5df4f5d7a4..427b7df146 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -465,8 +465,8 @@ "ocean_model_z", "S_advection_xy", "S_advection_xy", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z", "Th_tendency_vert_remap", "Th_tendency_vert_remap", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z", "Sh_tendency_vert_remap", "Sh_tendency_vert_remap", "ocean_annual_z", "all", "mean", "none",2 - "ocean_model", "boundary_forcing_heat_tendency", "boundary_forcing_heat_tendency", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "boundary_forcing_salt_tendency", "boundary_forcing_salt_tendency", "ocean_annual", "all", "mean", "none",2 + "ocean_model_z","boundary_forcing_heat_tendency", "boundary_forcing_heat_tendency", "ocean_annual_z", "all", "mean", "none",2 + "ocean_model_z","boundary_forcing_salt_tendency", "boundary_forcing_salt_tendency", "ocean_annual_z", "all", "mean", "none",2 # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table M1: vertical tracer diffusivities and potential energy dissipation From 1bc3e6ede41d484372b8b71b496a63922ab435e6 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 21 Sep 2017 22:03:14 -0400 Subject: [PATCH 30/89] OM4: Adds omldamax to ocean_daily! - The cloud people want want daily max of BLD defined by ePBL. - Closes #169. --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 1 + 1 file changed, 1 insertion(+) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index 427b7df146..e7cb45cab9 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -494,6 +494,7 @@ "ocean_model", "SSV", "ssv", "ocean_daily", "all", "mean", "none",2 #"ocean_model", "tos", "tos_max", "ocean_daily", "all", "max", "none",2 #"ocean_model", "tos", "tos_min", "ocean_daily", "all", "min", "none",2 + "ocean_model", "ePBL_h_ML", "omldamax", "ocean_daily", "all", "max", "none",2 # ----------------------------------------------------------------------------------------- # various fields From 474b575d9260f5ab45998d3fe355e552deff0d54 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 21 Sep 2017 22:05:13 -0400 Subject: [PATCH 31/89] OM4: Enables rho-space diagnostics - Commit f38fcd1e98c3774f should have had these input parameter changes that enable the rho-space diagnostics. My bad. - Commit f38fcd1e98c3774f also should have closed #166. - Properly close #154. --- ice_ocean_SIS2/OM4_025/MOM_input | 24 +++++++++++++++++++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 21 +++++++++++++--- .../OM4_025/MOM_parameter_doc.short | 22 +++++++++++++++++ 3 files changed, 64 insertions(+), 3 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/MOM_input b/ice_ocean_SIS2/OM4_025/MOM_input index 4970df01a8..7beb5adc2c 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_input +++ b/ice_ocean_SIS2/OM4_025/MOM_input @@ -311,6 +311,30 @@ Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False ! If True, then remap straight to model coordinate from file. ! === module MOM_diag_mediator === +NUM_DIAG_COORDS = 2 ! default = 1 + ! The number of diagnostic vertical coordinates to use. + ! For each coordinate, an entry in DIAG_COORDS must be provided. +DIAG_COORDS = "z Z ZSTAR,rho2 RHO2 RHO" ! default = "z Z ZSTAR" + ! A list of string tuples associating diag_table modules to + ! a coordinate definition used for diagnostics. Each string + ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 + ! Set the default missing value to use for diagnostics. +DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09" + ! Determines how to specify the coordinate + ! resolution. Valid options are: + ! PARAM - use the vector-parameter DIAG_COORD_RES_Z + ! UNIFORM[:N] - uniformly distributed + ! FILE:string - read from a file. The string specifies + ! the filename and variable name, separated + ! by a comma or space, e.g. FILE:lev.nc,dz + ! or FILE:lev.nc,interfaces=zw + ! WOA09[:N] - the WOA09 vertical grid (approximately) + ! FNC1:string - FNC1:dz_min,H_total,power,precision + ! HYBRID:string - read from a file. The string specifies + ! the filename and two variable names, separated + ! by a comma or space, for sigma-2 and dz. e.g. + ! HYBRID:vgrid.nc,sigma2,dz ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 8f8603118e..d6d7e5c6a6 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -639,13 +639,13 @@ SPONGE = False ! [Boolean] default = False ! specified via SPONGE_CONFIG. ! === module MOM_diag_mediator === -NUM_DIAG_COORDS = 1 ! default = 1 +NUM_DIAG_COORDS = 2 ! default = 1 ! The number of diagnostic vertical coordinates to use. ! For each coordinate, an entry in DIAG_COORDS must be provided. -DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" +DIAG_COORDS = "z Z ZSTAR", "rho2 RHO2 RHO" ! ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string - ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". + ! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME". DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" @@ -666,6 +666,21 @@ DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09" ! the filename and two variable names, separated ! by a comma or space, for sigma-2 and dz. e.g. ! HYBRID:vgrid.nc,sigma2,dz +DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09" + ! Determines how to specify the coordinate + ! resolution. Valid options are: + ! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2 + ! UNIFORM[:N] - uniformly distributed + ! FILE:string - read from a file. The string specifies + ! the filename and variable name, separated + ! by a comma or space, e.g. FILE:lev.nc,dz + ! or FILE:lev.nc,interfaces=zw + ! WOA09[:N] - the WOA09 vertical grid (approximately) + ! FNC1:string - FNC1:dz_min,H_total,power,precision + ! HYBRID:string - read from a file. The string specifies + ! the filename and two variable names, separated + ! by a comma or space, for sigma-2 and dz. e.g. + ! HYBRID:vgrid.nc,sigma2,dz ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index 4e5fcedee3..8ba31cc043 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -302,6 +302,28 @@ Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False ! If True, then remap straight to model coordinate from file. ! === module MOM_diag_mediator === +NUM_DIAG_COORDS = 2 ! default = 1 + ! The number of diagnostic vertical coordinates to use. + ! For each coordinate, an entry in DIAG_COORDS must be provided. +DIAG_COORDS = "z Z ZSTAR", "rho2 RHO2 RHO" ! + ! A list of string tuples associating diag_table modules to + ! a coordinate definition used for diagnostics. Each string + ! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME". +DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09" + ! Determines how to specify the coordinate + ! resolution. Valid options are: + ! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2 + ! UNIFORM[:N] - uniformly distributed + ! FILE:string - read from a file. The string specifies + ! the filename and variable name, separated + ! by a comma or space, e.g. FILE:lev.nc,dz + ! or FILE:lev.nc,interfaces=zw + ! WOA09[:N] - the WOA09 vertical grid (approximately) + ! FNC1:string - FNC1:dz_min,H_total,power,precision + ! HYBRID:string - read from a file. The string specifies + ! the filename and two variable names, separated + ! by a comma or space, for sigma-2 and dz. e.g. + ! HYBRID:vgrid.nc,sigma2,dz ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False From 62bb9e6e18b3c2d819201e34d0cf5ccbedc3b4f3 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 21 Sep 2017 22:26:11 -0400 Subject: [PATCH 32/89] MOM6: Merge pull request #607 from ashao/remapped_vert_remap_tendencies - Fixes diagnostic address in 6618238c660e9 - Closes #161 - NOAA-GFDL/MOM6@7762123 Merge pull request #607 from ashao/remapped_vert_remap_tendencies - NOAA-GFDL/MOM6@d4beae0 Add optional check for dt in ALE_main for diagnostic remap - NOAA-GFDL/MOM6@8fbac9e Forgot to add the interface for diag_update_remap_grids to previous commit - NOAA-GFDL/MOM6@aade1ca Update diagnostic target grid for ALE remapping tendencies --- src/MOM6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MOM6 b/src/MOM6 index a2101cf16e..776212307a 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit a2101cf16e68a6583ecd3cad0852e3b55be10493 +Subproject commit 776212307ae15b17fb48ead11c89fdffd5b9830d From b557cef3050c4b4b48d33709cfd6ebe71ae06bfa Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Fri, 22 Sep 2017 09:08:00 -0400 Subject: [PATCH 33/89] OM4_05: Enabled rho-space diagnostics - In 474b575d92, I enabled rho-space diagnostics for OM4_025 but OM4_05 uses the same diag_tables (with in the FRE xml) so Om4_05 should have been updated at the same time. - Also removed redundant DIAG_MISVAL from OM4_025 MOM_input. - Closes #154 for OM4_05. --- ice_ocean_SIS2/OM4_025/MOM_input | 2 -- ice_ocean_SIS2/OM4_05/MOM_input | 22 +++++++++++++++++++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 21 +++++++++++++++--- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 22 +++++++++++++++++++ 4 files changed, 62 insertions(+), 5 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/MOM_input b/ice_ocean_SIS2/OM4_025/MOM_input index 7beb5adc2c..63f2891f4f 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_input +++ b/ice_ocean_SIS2/OM4_025/MOM_input @@ -318,8 +318,6 @@ DIAG_COORDS = "z Z ZSTAR,rho2 RHO2 RHO" ! default = "z Z ZSTAR" ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". -DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 - ! Set the default missing value to use for diagnostics. DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09" ! Determines how to specify the coordinate ! resolution. Valid options are: diff --git a/ice_ocean_SIS2/OM4_05/MOM_input b/ice_ocean_SIS2/OM4_05/MOM_input index 8b153db101..7bc9083d05 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_input +++ b/ice_ocean_SIS2/OM4_05/MOM_input @@ -303,6 +303,28 @@ Z_INIT_REMAP_GENERAL = True ! [Boolean] default = False ! If true, allows initialization directly to general coordinates. ! === module MOM_diag_mediator === +NUM_DIAG_COORDS = 2 ! default = 1 + ! The number of diagnostic vertical coordinates to use. + ! For each coordinate, an entry in DIAG_COORDS must be provided. +DIAG_COORDS = "z Z ZSTAR,rho2 RHO2 RHO" ! default = "z Z ZSTAR" + ! A list of string tuples associating diag_table modules to + ! a coordinate definition used for diagnostics. Each string + ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". +DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09" + ! Determines how to specify the coordinate + ! resolution. Valid options are: + ! PARAM - use the vector-parameter DIAG_COORD_RES_Z + ! UNIFORM[:N] - uniformly distributed + ! FILE:string - read from a file. The string specifies + ! the filename and variable name, separated + ! by a comma or space, e.g. FILE:lev.nc,dz + ! or FILE:lev.nc,interfaces=zw + ! WOA09[:N] - the WOA09 vertical grid (approximately) + ! FNC1:string - FNC1:dz_min,H_total,power,precision + ! HYBRID:string - read from a file. The string specifies + ! the filename and two variable names, separated + ! by a comma or space, for sigma-2 and dz. e.g. + ! HYBRID:vgrid.nc,sigma2,dz ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 065d47f77a..e3418c2ab9 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -639,13 +639,13 @@ SPONGE = False ! [Boolean] default = False ! specified via SPONGE_CONFIG. ! === module MOM_diag_mediator === -NUM_DIAG_COORDS = 1 ! default = 1 +NUM_DIAG_COORDS = 2 ! default = 1 ! The number of diagnostic vertical coordinates to use. ! For each coordinate, an entry in DIAG_COORDS must be provided. -DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" +DIAG_COORDS = "z Z ZSTAR", "rho2 RHO2 RHO" ! ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string - ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". + ! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME". DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 ! Set the default missing value to use for diagnostics. AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" @@ -666,6 +666,21 @@ DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09" ! the filename and two variable names, separated ! by a comma or space, for sigma-2 and dz. e.g. ! HYBRID:vgrid.nc,sigma2,dz +DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09" + ! Determines how to specify the coordinate + ! resolution. Valid options are: + ! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2 + ! UNIFORM[:N] - uniformly distributed + ! FILE:string - read from a file. The string specifies + ! the filename and variable name, separated + ! by a comma or space, e.g. FILE:lev.nc,dz + ! or FILE:lev.nc,interfaces=zw + ! WOA09[:N] - the WOA09 vertical grid (approximately) + ! FNC1:string - FNC1:dz_min,H_total,power,precision + ! HYBRID:string - read from a file. The string specifies + ! the filename and two variable names, separated + ! by a comma or space, for sigma-2 and dz. e.g. + ! HYBRID:vgrid.nc,sigma2,dz ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index 7906bb52d3..83b7e6e00f 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -303,6 +303,28 @@ Z_INIT_REMAP_GENERAL = True ! [Boolean] default = False ! If true, allows initialization directly to general coordinates. ! === module MOM_diag_mediator === +NUM_DIAG_COORDS = 2 ! default = 1 + ! The number of diagnostic vertical coordinates to use. + ! For each coordinate, an entry in DIAG_COORDS must be provided. +DIAG_COORDS = "z Z ZSTAR", "rho2 RHO2 RHO" ! + ! A list of string tuples associating diag_table modules to + ! a coordinate definition used for diagnostics. Each string + ! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME". +DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09" + ! Determines how to specify the coordinate + ! resolution. Valid options are: + ! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2 + ! UNIFORM[:N] - uniformly distributed + ! FILE:string - read from a file. The string specifies + ! the filename and variable name, separated + ! by a comma or space, e.g. FILE:lev.nc,dz + ! or FILE:lev.nc,interfaces=zw + ! WOA09[:N] - the WOA09 vertical grid (approximately) + ! FNC1:string - FNC1:dz_min,H_total,power,precision + ! HYBRID:string - read from a file. The string specifies + ! the filename and two variable names, separated + ! by a comma or space, for sigma-2 and dz. e.g. + ! HYBRID:vgrid.nc,sigma2,dz ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False From 7b98a79c0891edba5cca44379228bd227a07c1ab Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 25 Sep 2017 09:11:16 -0400 Subject: [PATCH 34/89] MOM6: Merge pull request #610 from adcroft/cmip-compatible-diagnostic-units - Commit NOAA-GFDL/MOM6@f715a24 updates MOM_parameter_doc.all with option to revert answers for OM4/CM4 (not actually answer changes yet). - Commit NOAA-GFDL/MOM6@56f2100 changes available_diags with adoption of CMIP6 units. - Also updated MOM_parameter_docs where units got changed for some inputs. - NOAA-GFDL/MOM6@56f2100 Merge pull request #610 from adcroft/cmip-compatible-diagnostic-units - NOAA-GFDL/MOM6@18a978d Merge pull request #611 from adcroft/document-diag-artifact - NOAA-GFDL/MOM6@158bde3 Added documentation about "posting frequency" issue - NOAA-GFDL/MOM6@1b57c08 Change all diagnostics units to CMIP style - NOAA-GFDL/MOM6@f715a24 Merge pull request #609 from adcroft/revert-OM4-to-pre-bracket-fix - NOAA-GFDL/MOM6@970af50 Option to recover answer pre-symmetry fix --- .../CM2G63L/MOM_parameter_doc.all | 4 + .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 4 + .../Concurrent_ice_1deg/MOM_parameter_doc.all | 4 + ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 4 + .../MOM_parameter_doc.all | 6 +- .../MOM_parameter_doc.short | 2 +- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 6 +- .../OM4_025/MOM_parameter_doc.short | 2 +- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 6 +- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 2 +- ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 4 + .../SIS2_bergs_cgrid/MOM_parameter_doc.all | 4 + .../SIS2_cgrid/MOM_parameter_doc.all | 4 + .../OM_360x320_C180/MOM_parameter_doc.all | 6 +- .../OM_360x320_C180/MOM_parameter_doc.short | 2 +- .../cooling_only/EPBL/MOM_parameter_doc.all | 2 +- .../cooling_only/EPBL/MOM_parameter_doc.short | 2 +- .../mech_only/EPBL/MOM_parameter_doc.all | 2 +- .../mech_only/EPBL/MOM_parameter_doc.short | 2 +- .../EPBL/MOM_parameter_doc.all | 2 +- .../EPBL/MOM_parameter_doc.short | 2 +- .../wind_only/EPBL/MOM_parameter_doc.all | 2 +- .../wind_only/EPBL/MOM_parameter_doc.short | 2 +- ocean_only/DOME/MOM_parameter_doc.all | 4 + .../Phillips_2layer/MOM_parameter_doc.all | 4 + .../adjustment2d/layer/MOM_parameter_doc.all | 4 + .../adjustment2d/rho/MOM_parameter_doc.all | 4 + .../adjustment2d/z/MOM_parameter_doc.all | 4 + ocean_only/benchmark/MOM_parameter_doc.all | 4 + ocean_only/circle_obcs/MOM_parameter_doc.all | 4 + ocean_only/double_gyre/MOM_parameter_doc.all | 4 + .../external_gwave/MOM_parameter_doc.all | 4 + .../layer/MOM_parameter_doc.all | 4 + .../flow_downslope/rho/MOM_parameter_doc.all | 4 + .../sigma/MOM_parameter_doc.all | 4 + .../flow_downslope/z/MOM_parameter_doc.all | 4 + .../global_ALE/hycom/MOM_parameter_doc.all | 6 +- .../global_ALE/hycom/MOM_parameter_doc.short | 2 +- .../global_ALE/layer/MOM_parameter_doc.all | 4 + .../global_ALE/layer/available_diags.000000 | 1616 +++++++-------- ocean_only/global_ALE/z/MOM_parameter_doc.all | 6 +- .../global_ALE/z/MOM_parameter_doc.short | 2 +- .../global_ALE/z/available_diags.000000 | 1834 ++++++++--------- .../lock_exchange/MOM_parameter_doc.all | 4 + .../MOM_parameter_doc.all | 4 + .../nonBous_global/MOM_parameter_doc.all | 4 + .../resting/layer/MOM_parameter_doc.all | 4 + ocean_only/resting/z/MOM_parameter_doc.all | 4 + .../seamount/layer/MOM_parameter_doc.all | 4 + ocean_only/seamount/rho/MOM_parameter_doc.all | 4 + .../seamount/sigma/MOM_parameter_doc.all | 4 + ocean_only/seamount/z/MOM_parameter_doc.all | 4 + .../single_column/EPBL/MOM_parameter_doc.all | 2 +- .../EPBL/MOM_parameter_doc.short | 2 +- .../sloshing/layer/MOM_parameter_doc.all | 4 + ocean_only/sloshing/rho/MOM_parameter_doc.all | 4 + ocean_only/sloshing/z/MOM_parameter_doc.all | 4 + .../MOM_parameter_doc.all | 4 + .../tracer_mixing/rho/MOM_parameter_doc.all | 4 + .../tracer_mixing/z/MOM_parameter_doc.all | 4 + src/MOM6 | 2 +- 61 files changed, 1916 insertions(+), 1748 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index 3cd8a7588a..8571d0574a 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -1097,6 +1097,10 @@ DTBT = 60.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 10.0 ! [m2 s-1] default = 0.0 diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index b782ff5be1..282f9a1faf 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -1093,6 +1093,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 10.0 ! [m2 s-1] default = 0.0 diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index b782ff5be1..282f9a1faf 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -1093,6 +1093,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 10.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index e1a6370b62..07ff48eb0e 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1093,6 +1093,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 10.0 ! [m2 s-1] default = 0.0 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 579100a0e4..24d6eb3d12 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 @@ -1305,6 +1305,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 600.0 ! [m2 s-1] default = 0.0 @@ -1881,7 +1885,7 @@ LT_MOD_LAC4 = 0.95 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.95 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. 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 a78f410b52..45feadae1b 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 @@ -571,7 +571,7 @@ MAX_RINO_IT = 25 ! [nondim] default = 50 ! The following parameters are used for auxiliary diabatic processes. ! === module MOM_energetic_PBL === -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index d6d7e5c6a6..ac1c216a26 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1320,6 +1320,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 0.0 ! [m2 s-1] default = 0.0 @@ -1896,7 +1900,7 @@ LT_MOD_LAC4 = 0.0 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.22 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index 8ba31cc043..a0ad58a602 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -735,7 +735,7 @@ LT_MOD_LAC4 = 0.0 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.22 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index e3418c2ab9..2dcedde5e4 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1323,6 +1323,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 0.0 ! [m2 s-1] default = 0.0 @@ -1909,7 +1913,7 @@ LT_MOD_LAC4 = 0.0 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.22 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index 83b7e6e00f..c74f841a89 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -764,7 +764,7 @@ LT_MOD_LAC4 = 0.0 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.22 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 4a0b851316..b8a879c9f1 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1107,6 +1107,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 10.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 08ced6647a..a1afafc86d 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1107,6 +1107,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 10.0 ! [m2 s-1] default = 0.0 diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 08ced6647a..a1afafc86d 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1107,6 +1107,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 10.0 ! [m2 s-1] default = 0.0 diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index bc91ac8332..f3f3067d84 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -1234,6 +1234,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 0.0 ! [m2 s-1] default = 0.0 @@ -1814,7 +1818,7 @@ LT_MOD_LAC4 = 0.95 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.95 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short index 41421ccd7f..215ad85fda 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.short @@ -596,7 +596,7 @@ ML_OMEGA_FRAC = 1.0 ! [nondim] default = 0.0 ! When setting the decay scale for turbulence, use this ! fraction of the absolute rotation rate blended with the ! local value of f, as sqrt((1-of)*f^2 + of*4*omega^2). -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. 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 df45f4ff89..9be778515c 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 @@ -1355,7 +1355,7 @@ LT_MOD_LAC4 = 0.95 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.95 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short index c49608af9a..e16db304eb 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short @@ -379,7 +379,7 @@ RECLAIM_FRAZIL = False ! [Boolean] default = True ! the freezing point. ! === module MOM_energetic_PBL === -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. 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 52ae36737d..223ecb9ba5 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 @@ -1355,7 +1355,7 @@ LT_MOD_LAC4 = 0.95 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.95 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short index 1efa91f798..30d0978109 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short @@ -379,7 +379,7 @@ RECLAIM_FRAZIL = False ! [Boolean] default = True ! the freezing point. ! === module MOM_energetic_PBL === -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. 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 5c58091a72..f16383aaf5 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 @@ -1355,7 +1355,7 @@ LT_MOD_LAC4 = 0.95 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.95 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. 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 e72d74c8a3..7a1d3e76f0 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 @@ -379,7 +379,7 @@ RECLAIM_FRAZIL = False ! [Boolean] default = True ! the freezing point. ! === module MOM_energetic_PBL === -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. 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 d4db824e87..2133c73d42 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 @@ -1355,7 +1355,7 @@ LT_MOD_LAC4 = 0.95 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.95 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. 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 ac24bfd510..4f7538465c 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 @@ -379,7 +379,7 @@ RECLAIM_FRAZIL = False ! [Boolean] default = True ! the freezing point. ! === module MOM_energetic_PBL === -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 9dc85c7556..3edaca45ec 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -932,6 +932,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index c9b111bc62..3f44436283 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -933,6 +933,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 8000.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 412fe2f9c8..0238f28cf9 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -980,6 +980,10 @@ DTBT = 5.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 420cd085a6..ce2f2e5615 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -1123,6 +1123,10 @@ DTBT = 5.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 383d518008..c8db147dee 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -1077,6 +1077,10 @@ DTBT = 5.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 40ddb07ce6..7177409c44 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -1052,6 +1052,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 1.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 2d623d8a66..8483f68fda 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -982,6 +982,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 3b62c46579..9df25723f1 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -858,6 +858,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 60a3f844f8..3000f93c9d 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -961,6 +961,10 @@ DTBT = 20.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 173219244c..3f4bd69f45 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -972,6 +972,10 @@ DTBT = 20.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index fa9ef0ec24..e4a2a1a7ba 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -1117,6 +1117,10 @@ DTBT = 20.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 19b9cb23af..88f8d6109a 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -1071,6 +1071,10 @@ DTBT = 20.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index fb2629dfaa..da74605592 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -1071,6 +1071,10 @@ DTBT = 20.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index fd95a6d4f6..22f33a9f3a 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1337,6 +1337,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 600.0 ! [m2 s-1] default = 0.0 @@ -1923,7 +1927,7 @@ LT_MOD_LAC4 = 0.95 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.95 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short index 2de3ef2e04..b3ab7acb19 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.short @@ -597,7 +597,7 @@ MAX_RINO_IT = 25 ! [nondim] default = 50 ! The following parameters are used for auxiliary diabatic processes. ! === module MOM_energetic_PBL === -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 54c65bafa3..a763006173 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1186,6 +1186,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 600.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 7e6e8cdaa8..d7af4645a7 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -1,27 +1,27 @@ "ocean_model", "geolat" [Used] ! long_name: Latitude of tracer (T) points - ! units: degrees_N + ! units: degrees_north "ocean_model", "geolon" [Used] ! long_name: Longitude of tracer (T) points - ! units: degrees_E + ! units: degrees_east "ocean_model", "geolat_c" [Used] ! long_name: Latitude of corner (Bu) points - ! units: degrees_N + ! units: degrees_north "ocean_model", "geolon_c" [Used] ! long_name: Longitude of corner (Bu) points - ! units: degrees_E + ! units: degrees_east "ocean_model", "geolat_v" [Used] ! long_name: Latitude of meridional velocity (Cv) points - ! units: degrees_N + ! units: degrees_north "ocean_model", "geolon_v" [Used] ! long_name: Longitude of meridional velocity (Cv) points - ! units: degrees_E + ! units: degrees_east "ocean_model", "geolat_u" [Used] ! long_name: Latitude of zonal velocity (Cu) points - ! units: degrees_N + ! units: degrees_north "ocean_model", "geolon_u" [Used] ! long_name: Longitude of zonal velocity (Cu) points - ! units: degrees_E + ! units: degrees_east "ocean_model", "area_t" [Used] ! long_name: Surface area of tracer (T) cells ! units: m2 @@ -100,63 +100,63 @@ ! standard_name: SeaAreaFraction "ocean_model", "MEKE" [Used] ! long_name: Mesoscale Eddy Kinetic Energy - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_KH" [Used] ! long_name: MEKE derived diffusivity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_KU" [Unused] ! long_name: MEKE derived lateral viscosity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Ue" [Unused] ! long_name: MEKE derived eddy-velocity scale - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Ub" [Unused] ! long_name: MEKE derived bottom eddy-velocity scale - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Ut" [Unused] ! long_name: MEKE derived barotropic eddy-velocity scale - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_src" [Unused] ! long_name: MEKE energy source - ! units: meter2 second-3 + ! units: m2 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_decay" [Unused] ! long_name: MEKE decay rate - ! units: second-1 + ! units: s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "KHMEKE_u" [Unused] ! long_name: Zonal diffusivity of MEKE - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "KHMEKE_v" [Unused] ! long_name: Meridional diffusivity of MEKE - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "MEKE_GM_src" [Unused] ! long_name: MEKE energy available from thickness mixing - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_mom_src" [Unused] ! long_name: MEKE energy available from momentum - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Le" [Unused] ! long_name: Eddy mixing length used in the MEKE derived eddy diffusivity - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Lrhines" [Unused] ! long_name: Rhines length scale used in the MEKE derived eddy diffusivity - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Leady" [Unused] ! long_name: Eady length scale used in the MEKE derived eddy diffusivity - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_gamma_b" [Unused] ! long_name: Ratio of bottom-projected eddy velocity to column-mean eddy velocity @@ -168,139 +168,139 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "SN_u" [Used] ! long_name: Inverse eddy time-scale, S*N, at u-points - ! units: s^-1 + ! units: s-1 ! cell_methods: xq:point yh:mean "ocean_model", "SN_v" [Unused] ! long_name: Inverse eddy time-scale, S*N, at v-points - ! units: s^-1 + ! units: s-1 ! cell_methods: xh:mean yq:point "ocean_model", "Res_fn" [Unused] ! long_name: Resolution function for scaling diffusivities - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yh:mean "ocean_model", "Rd_dx" [Unused] ! long_name: Ratio between deformation radius and grid spacing - ! units: Nondim + ! units: m m-1 ! cell_methods: xh:mean yh:mean "ocean_model", "bbl_thick_u" [Unused] ! long_name: BBL thickness at u points - ! units: meter + ! units: m ! cell_methods: xq:point yh:mean "ocean_model", "kv_bbl_u" [Unused] ! long_name: BBL viscosity at u points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "bbl_thick_v" [Unused] ! long_name: BBL thickness at v points - ! units: meter + ! units: m ! cell_methods: xh:mean yq:point "ocean_model", "kv_bbl_v" [Unused] ! long_name: BBL viscosity at v points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "Rayleigh_u" [Unused] ! long_name: Rayleigh drag velocity at u points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "Rayleigh_u_xyave" [Unused] ! long_name: Rayleigh drag velocity at u points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "Rayleigh_u" [Unused] ! long_name: Rayleigh drag velocity at u points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "Rayleigh_u_xyave" [Unused] ! long_name: Rayleigh drag velocity at u points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "Rayleigh_v" [Unused] ! long_name: Rayleigh drag velocity at v points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "Rayleigh_v_xyave" [Unused] ! long_name: Rayleigh drag velocity at v points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "Rayleigh_v" [Unused] ! long_name: Rayleigh drag velocity at v points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "Rayleigh_v_xyave" [Unused] ! long_name: Rayleigh drag velocity at v points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "RV" [Unused] ! long_name: Relative Vorticity - ! units: second-1 + ! units: s-1 ! cell_methods: xq:point yq:point zl:mean "ocean_model", "PV" [Unused] ! long_name: Potential Vorticity - ! units: meter-1 second-1 + ! units: m-1 s-1 ! cell_methods: xq:point yq:point zl:mean "ocean_model", "gKEu" [Unused] ! long_name: Zonal Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "gKEu_xyave" [Unused] ! long_name: Zonal Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: zl:mean "ocean_model_z", "gKEu" [Unused] ! long_name: Zonal Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "gKEu_xyave" [Unused] ! long_name: Zonal Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: z_l:mean "ocean_model", "gKEv" [Unused] ! long_name: Meridional Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "gKEv_xyave" [Unused] ! long_name: Meridional Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: zl:mean "ocean_model_z", "gKEv" [Unused] ! long_name: Meridional Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "gKEv_xyave" [Unused] ! long_name: Meridional Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: z_l:mean "ocean_model", "rvxu" [Unused] ! long_name: Meridional Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "rvxu_xyave" [Unused] ! long_name: Meridional Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: zl:mean "ocean_model_z", "rvxu" [Unused] ! long_name: Meridional Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "rvxu_xyave" [Unused] ! long_name: Meridional Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: z_l:mean "ocean_model", "rvxv" [Unused] ! long_name: Zonal Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "rvxv_xyave" [Unused] ! long_name: Zonal Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: zl:mean "ocean_model_z", "rvxv" [Unused] ! long_name: Zonal Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "rvxv_xyave" [Unused] ! long_name: Zonal Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: z_l:mean "ocean_model", "e_tidal" [Unused] ! long_name: Tidal Forcing Astronomical and SAL Height Anomaly @@ -308,43 +308,43 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "diffu" [Unused] ! long_name: Zonal Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "diffu_xyave" [Unused] ! long_name: Zonal Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "diffu" [Unused] ! long_name: Zonal Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "diffu_xyave" [Unused] ! long_name: Zonal Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "diffv" [Unused] ! long_name: Meridional Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "diffv_xyave" [Unused] ! long_name: Meridional Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "diffv" [Unused] ! long_name: Meridional Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "diffv_xyave" [Unused] ! long_name: Meridional Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "Ahh" [Unused] (CMOR equivalent is "difmxybo") ! long_name: Biharmonic Horizontal Viscosity at h Points - ! units: meter4 second-1 + ! units: m4 s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Ahh_xyave" [Unused] (CMOR equivalent is "difmxybo_xyave") ! long_name: Biharmonic Horizontal Viscosity at h Points - ! units: meter4 second-1 + ! units: m4 s-1 ! cell_methods: zl:mean "ocean_model", "difmxybo" [Used] (native name is "Ahh") ! long_name: Ocean lateral biharmonic viscosity @@ -358,11 +358,11 @@ ! cell_methods: zl:mean "ocean_model_z", "Ahh" [Unused] (CMOR equivalent is "difmxybo") ! long_name: Biharmonic Horizontal Viscosity at h Points - ! units: meter4 second-1 + ! units: m4 s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Ahh_xyave" [Unused] (CMOR equivalent is "difmxybo_xyave") ! long_name: Biharmonic Horizontal Viscosity at h Points - ! units: meter4 second-1 + ! units: m4 s-1 ! cell_methods: z_l:mean "ocean_model_z", "difmxybo" [Unused] (native name is "Ahh") ! long_name: Ocean lateral biharmonic viscosity @@ -376,15 +376,15 @@ ! cell_methods: z_l:mean "ocean_model", "Ahq" [Unused] ! long_name: Biharmonic Horizontal Viscosity at q Points - ! units: meter4 second-1 + ! units: m4 s-1 ! cell_methods: xq:point yq:point zl:mean "ocean_model", "Khh" [Unused] (CMOR equivalent is "difmxylo") ! long_name: Laplacian Horizontal Viscosity at h Points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Khh_xyave" [Unused] (CMOR equivalent is "difmxylo_xyave") ! long_name: Laplacian Horizontal Viscosity at h Points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zl:mean "ocean_model", "difmxylo" [Used] (native name is "Khh") ! long_name: Ocean lateral Laplacian viscosity @@ -398,11 +398,11 @@ ! cell_methods: zl:mean "ocean_model_z", "Khh" [Unused] (CMOR equivalent is "difmxylo") ! long_name: Laplacian Horizontal Viscosity at h Points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Khh_xyave" [Unused] (CMOR equivalent is "difmxylo_xyave") ! long_name: Laplacian Horizontal Viscosity at h Points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_l:mean "ocean_model_z", "difmxylo" [Unused] (native name is "Khh") ! long_name: Ocean lateral Laplacian viscosity @@ -416,27 +416,27 @@ ! cell_methods: z_l:mean "ocean_model", "Khq" [Unused] ! long_name: Laplacian Horizontal Viscosity at q Points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xq:point yq:point zl:mean "ocean_model", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "FrictWork_xyave" [Unused] ! long_name: Integral work done by lateral friction terms - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "FrictWork_xyave" [Unused] ! long_name: Integral work done by lateral friction terms - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "FrictWorkIntz" [Unused] (CMOR equivalent is "dispkexyfo") ! long_name: Depth integrated work done by lateral friction - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "dispkexyfo" [Used] (native name is "FrictWorkIntz") ! long_name: Depth integrated ocean kinetic energy dissipation due to lateral friction @@ -445,107 +445,107 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "au_visc" [Unused] ! long_name: Zonal Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zi:point "ocean_model", "au_visc_xyave" [Unused] ! long_name: Zonal Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zi:point "ocean_model_z", "au_visc" [Unused] ! long_name: Zonal Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_i:point "ocean_model_z", "au_visc_xyave" [Unused] ! long_name: Zonal Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_i:point "ocean_model", "av_visc" [Unused] ! long_name: Meridional Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zi:point "ocean_model", "av_visc_xyave" [Unused] ! long_name: Meridional Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zi:point "ocean_model_z", "av_visc" [Unused] ! long_name: Meridional Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_i:point "ocean_model_z", "av_visc_xyave" [Unused] ! long_name: Meridional Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_i:point "ocean_model", "Hu_visc" [Unused] ! long_name: Thickness at Zonal Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "Hu_visc_xyave" [Unused] ! long_name: Thickness at Zonal Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: zl:mean "ocean_model_z", "Hu_visc" [Unused] ! long_name: Thickness at Zonal Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "Hu_visc_xyave" [Unused] ! long_name: Thickness at Zonal Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: z_l:mean "ocean_model", "Hv_visc" [Unused] ! long_name: Thickness at Meridional Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "Hv_visc_xyave" [Unused] ! long_name: Thickness at Meridional Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: zl:mean "ocean_model_z", "Hv_visc" [Unused] ! long_name: Thickness at Meridional Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "Hv_visc_xyave" [Unused] ! long_name: Thickness at Meridional Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: z_l:mean "ocean_model", "HMLu_visc" [Unused] ! long_name: Mixed Layer Thickness at Zonal Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xq:point yh:mean "ocean_model", "HMLv_visc" [Unused] ! long_name: Mixed Layer Thickness at Meridional Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xh:mean yq:point "ocean_model", "du_dt_visc" [Unused] ! long_name: Zonal Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "du_dt_visc_xyave" [Unused] ! long_name: Zonal Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "du_dt_visc" [Unused] ! long_name: Zonal Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "du_dt_visc_xyave" [Unused] ! long_name: Zonal Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "dv_dt_visc" [Unused] ! long_name: Meridional Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "dv_dt_visc_xyave" [Unused] ! long_name: Meridional Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "dv_dt_visc" [Unused] ! long_name: Meridional Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "dv_dt_visc_xyave" [Unused] ! long_name: Meridional Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "taux_bot" [Unused] ! long_name: Zonal Bottom Stress from Ocean to Earth @@ -557,103 +557,103 @@ ! cell_methods: xh:mean yq:point "ocean_model", "PFuBT" [Unused] ! long_name: Zonal Anomalous Barotropic Pressure Force Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean "ocean_model", "PFvBT" [Unused] ! long_name: Meridional Anomalous Barotropic Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point "ocean_model", "CoruBT" [Unused] ! long_name: Zonal Barotropic Coriolis Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean "ocean_model", "CorvBT" [Unused] ! long_name: Meridional Barotropic Coriolis Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point "ocean_model", "u_accel_bt" [Unused] ! long_name: Barotropic zonal acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean "ocean_model", "v_accel_bt" [Unused] ! long_name: Barotropic meridional acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point "ocean_model", "ubtforce" [Unused] ! long_name: Barotropic zonal acceleration from baroclinic terms - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean "ocean_model", "vbtforce" [Unused] ! long_name: Barotropic meridional acceleration from baroclinic terms - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point "ocean_model", "eta_bt" [Unused] ! long_name: Barotropic end SSH - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ubt" [Unused] ! long_name: Barotropic end zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vbt" [Unused] ! long_name: Barotropic end meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "eta_st" [Unused] ! long_name: Barotropic start SSH - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ubt_st" [Unused] ! long_name: Barotropic start zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vbt_st" [Unused] ! long_name: Barotropic start meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "ubtav" [Unused] ! long_name: Barotropic time-average zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vbtav" [Unused] ! long_name: Barotropic time-average meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "eta_cor" [Unused] ! long_name: Corrective mass flux - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "visc_rem_u" [Unused] ! long_name: Viscous remnant at u - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "visc_rem_u_xyave" [Unused] ! long_name: Viscous remnant at u - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "visc_rem_u" [Unused] ! long_name: Viscous remnant at u - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "visc_rem_u_xyave" [Unused] ! long_name: Viscous remnant at u - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "visc_rem_v" [Unused] ! long_name: Viscous remnant at v - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "visc_rem_v_xyave" [Unused] ! long_name: Viscous remnant at v - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "visc_rem_v" [Unused] ! long_name: Viscous remnant at v - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "visc_rem_v_xyave" [Unused] ! long_name: Viscous remnant at v - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "gtot_n" [Unused] ! long_name: gtot to North @@ -673,315 +673,315 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "eta_hifreq" [Unused] ! long_name: High Frequency Barotropic SSH - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ubt_hifreq" [Unused] ! long_name: High Frequency Barotropic zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vbt_hifreq" [Unused] ! long_name: High Frequency Barotropic meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "eta_pred_hifreq" [Unused] ! long_name: High Frequency Predictor Barotropic SSH - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "uhbt_hifreq" [Unused] ! long_name: High Frequency Barotropic zonal transport - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vhbt_hifreq" [Unused] ! long_name: High Frequency Barotropic meridional transport - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "frhatu" [Unused] ! long_name: Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "frhatu_xyave" [Unused] ! long_name: Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "frhatu" [Unused] ! long_name: Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "frhatu_xyave" [Unused] ! long_name: Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "frhatv" [Unused] ! long_name: Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "frhatv_xyave" [Unused] ! long_name: Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "frhatv" [Unused] ! long_name: Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "frhatv_xyave" [Unused] ! long_name: Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "frhatu1" [Unused] ! long_name: Predictor Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "frhatu1_xyave" [Unused] ! long_name: Predictor Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "frhatu1" [Unused] ! long_name: Predictor Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "frhatu1_xyave" [Unused] ! long_name: Predictor Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "frhatv1" [Unused] ! long_name: Predictor Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "frhatv1_xyave" [Unused] ! long_name: Predictor Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "frhatv1" [Unused] ! long_name: Predictor Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "frhatv1_xyave" [Unused] ! long_name: Predictor Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "uhbt" [Unused] ! long_name: Barotropic zonal transport averaged over a baroclinic step - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vhbt" [Unused] ! long_name: Barotropic meridional transport averaged over a baroclinic step - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_FA_u_EE" [Unused] ! long_name: BTCont type far east face area - ! units: meter2 + ! units: m2 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_FA_u_E0" [Unused] ! long_name: BTCont type near east face area - ! units: meter2 + ! units: m2 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_FA_u_WW" [Unused] ! long_name: BTCont type far west face area - ! units: meter2 + ! units: m2 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_FA_u_W0" [Unused] ! long_name: BTCont type near west face area - ! units: meter2 + ! units: m2 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_ubt_EE" [Unused] ! long_name: BTCont type far east velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_ubt_WW" [Unused] ! long_name: BTCont type far west velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_FA_v_NN" [Unused] ! long_name: BTCont type far north face area - ! units: meter2 + ! units: m2 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_FA_v_N0" [Unused] ! long_name: BTCont type near north face area - ! units: meter2 + ! units: m2 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_FA_v_SS" [Unused] ! long_name: BTCont type far south face area - ! units: meter2 + ! units: m2 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_FA_v_S0" [Unused] ! long_name: BTCont type near south face area - ! units: meter2 + ! units: m2 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_vbt_NN" [Unused] ! long_name: BTCont type far north velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_vbt_SS" [Unused] ! long_name: BTCont type far south velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "uhbt0" [Unused] ! long_name: Barotropic zonal transport difference - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vhbt0" [Unused] ! long_name: Barotropic meridional transport difference - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "uh" [Used] ! long_name: Zonal Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:sum zl:sum "ocean_model", "uh_xyave" [Unused] ! long_name: Zonal Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:sum "ocean_model_z", "uh" [Unused] ! long_name: Zonal Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:sum z_l:sum "ocean_model_z", "uh_xyave" [Unused] ! long_name: Zonal Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:sum "ocean_model", "vh" [Used] ! long_name: Meridional Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:sum yq:point zl:sum "ocean_model", "vh_xyave" [Unused] ! long_name: Meridional Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:sum "ocean_model_z", "vh" [Unused] ! long_name: Meridional Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:sum yq:point z_l:sum "ocean_model_z", "vh_xyave" [Unused] ! long_name: Meridional Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:sum "ocean_model", "CAu" [Unused] ! long_name: Zonal Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "CAu_xyave" [Unused] ! long_name: Zonal Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "CAu" [Unused] ! long_name: Zonal Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "CAu_xyave" [Unused] ! long_name: Zonal Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "CAv" [Unused] ! long_name: Meridional Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "CAv_xyave" [Unused] ! long_name: Meridional Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "CAv" [Unused] ! long_name: Meridional Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "CAv_xyave" [Unused] ! long_name: Meridional Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "PFu" [Unused] ! long_name: Zonal Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "PFu_xyave" [Unused] ! long_name: Zonal Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "PFu" [Unused] ! long_name: Zonal Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "PFu_xyave" [Unused] ! long_name: Zonal Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "PFv" [Unused] ! long_name: Meridional Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "PFv_xyave" [Unused] ! long_name: Meridional Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "PFv" [Unused] ! long_name: Meridional Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "PFv_xyave" [Unused] ! long_name: Meridional Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "uav" [Unused] ! long_name: Barotropic-step Averaged Zonal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "uav_xyave" [Unused] ! long_name: Barotropic-step Averaged Zonal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "uav" [Unused] ! long_name: Barotropic-step Averaged Zonal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "uav_xyave" [Unused] ! long_name: Barotropic-step Averaged Zonal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "vav" [Unused] ! long_name: Barotropic-step Averaged Meridional Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "vav_xyave" [Unused] ! long_name: Barotropic-step Averaged Meridional Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "vav" [Unused] ! long_name: Barotropic-step Averaged Meridional Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "vav_xyave" [Unused] ! long_name: Barotropic-step Averaged Meridional Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "u_BT_accel" [Unused] ! long_name: Barotropic Anomaly Zonal Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "u_BT_accel_xyave" [Unused] ! long_name: Barotropic Anomaly Zonal Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "u_BT_accel" [Unused] ! long_name: Barotropic Anomaly Zonal Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "u_BT_accel_xyave" [Unused] ! long_name: Barotropic Anomaly Zonal Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "v_BT_accel" [Unused] ! long_name: Barotropic Anomaly Meridional Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "v_BT_accel_xyave" [Unused] ! long_name: Barotropic Anomaly Meridional Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "v_BT_accel" [Unused] ! long_name: Barotropic Anomaly Meridional Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "v_BT_accel_xyave" [Unused] ! long_name: Barotropic Anomaly Meridional Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "uhGM" [Unused] ! long_name: Time Mean Diffusive Zonal Thickness Flux @@ -1017,7 +1017,7 @@ ! cell_methods: z_l:sum "ocean_model", "GMwork" [Used] (CMOR equivalent is "tnkebto") ! long_name: Integrated Tendency of Ocean Mesoscale Eddy KE from Parameterized Eddy Advection - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "tnkebto" [Unused] (native name is "GMwork") ! long_name: Integrated Tendency of Ocean Mesoscale Eddy KE from Parameterized Eddy Advection @@ -1026,43 +1026,43 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "KHTH_u" [Used] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zi:point "ocean_model", "KHTH_u_xyave" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zi:point "ocean_model_z", "KHTH_u" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_i:point "ocean_model_z", "KHTH_u_xyave" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_i:point "ocean_model", "KHTH_v" [Used] ! long_name: Parameterized mesoscale eddy advection diffusivity at V-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zi:point "ocean_model", "KHTH_v_xyave" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at V-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zi:point "ocean_model_z", "KHTH_v" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at V-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_i:point "ocean_model_z", "KHTH_v_xyave" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at V-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_i:point "ocean_model", "KHTH_t" [Unused] (CMOR equivalent is "diftrblo") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KHTH_t_xyave" [Unused] (CMOR equivalent is "diftrblo_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model", "diftrblo" [Used] (native name is "KHTH_t") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection @@ -1076,11 +1076,11 @@ ! cell_methods: zl:mean "ocean_model_z", "KHTH_t" [Unused] (CMOR equivalent is "diftrblo") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KHTH_t_xyave" [Unused] (CMOR equivalent is "diftrblo_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model_z", "diftrblo" [Unused] (native name is "KHTH_t") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection @@ -1094,15 +1094,15 @@ ! cell_methods: z_l:mean "ocean_model", "KHTH_u1" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-points (2-D) - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean "ocean_model", "KHTH_v1" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at V-points (2-D) - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point "ocean_model", "KHTH_t1" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at T-points (2-D) - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yh:mean "ocean_model", "neutral_slope_x" [Unused] ! long_name: Zonal slope of neutral surface @@ -1138,67 +1138,67 @@ ! cell_methods: z_i:point "ocean_model", "GM_sfn_x" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean zi:point "ocean_model", "GM_sfn_x_xyave" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zi:point "ocean_model_z", "GM_sfn_x" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean z_i:point "ocean_model_z", "GM_sfn_x_xyave" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_i:point "ocean_model", "GM_sfn_y" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point zi:point "ocean_model", "GM_sfn_y_xyave" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zi:point "ocean_model_z", "GM_sfn_y" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point z_i:point "ocean_model_z", "GM_sfn_y_xyave" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_i:point "ocean_model", "GM_sfn_unlim_x" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean zi:point "ocean_model", "GM_sfn_unlim_x_xyave" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zi:point "ocean_model_z", "GM_sfn_unlim_x" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean z_i:point "ocean_model_z", "GM_sfn_unlim_x_xyave" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_i:point "ocean_model", "GM_sfn_unlim_y" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point zi:point "ocean_model", "GM_sfn_unlim_y_xyave" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zi:point "ocean_model_z", "GM_sfn_unlim_y" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point z_i:point "ocean_model_z", "GM_sfn_unlim_y_xyave" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_i:point "ocean_model", "uhml" [Unused] ! long_name: Zonal Thickness Flux to Restratify Mixed Layer @@ -1234,43 +1234,43 @@ ! cell_methods: z_l:sum "ocean_model", "MLu_restrat_time" [Unused] ! long_name: Mixed Layer Zonal Restratification Timescale - ! units: second + ! units: s ! cell_methods: xq:point yh:mean "ocean_model", "MLv_restrat_time" [Unused] ! long_name: Mixed Layer Meridional Restratification Timescale - ! units: second + ! units: s ! cell_methods: xh:mean yq:point "ocean_model", "MLD_restrat" [Unused] ! long_name: Mixed Layer Depth as used in the mixed-layer restratification parameterization - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ML_buoy_restrat" [Unused] ! long_name: Mixed Layer Buoyancy as used in the mixed-layer restratification parameterization - ! units: m/s^2 + ! units: m s2 ! cell_methods: xh:mean yh:mean "ocean_model", "udml_restrat" [Unused] ! long_name: Transport stream function amplitude for zonal restratification of mixed layer - ! units: m3/s + ! units: m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vdml_restrat" [Unused] ! long_name: Transport stream function amplitude for meridional restratification of mixed layer - ! units: m3/s + ! units: m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "uml_restrat" [Unused] ! long_name: Surface zonal velocity component of mixed layer restratification - ! units: m/s + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vml_restrat" [Unused] ! long_name: Surface meridional velocity component of mixed layer restratification - ! units: m/s + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "temp_layer_ave" [Used] ! long_name: Layer Average Ocean Temperature - ! units: Celsius + ! units: degC ! cell_methods: zl:mean "ocean_model", "salt_layer_ave" [Used] ! long_name: Layer Average Ocean Salinity - ! units: ppt + ! units: psu ! cell_methods: zl:mean "ocean_model", "masscello" [Used] ! long_name: Mass per unit area of liquid ocean grid cell @@ -1318,11 +1318,11 @@ ! cell_methods: z_l:sum "ocean_model", "thetaoga" [Used] ! long_name: Global Mean Ocean Potential Temperature - ! units: Celsius + ! units: degC ! standard_name: sea_water_potential_temperature "ocean_model", "soga" [Used] ! long_name: Global Mean Ocean Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity "ocean_model", "sst_global" [Unused] ! long_name: Global Area Average Sea Surface Temperature @@ -1334,387 +1334,387 @@ ! standard_name: sea_surface_temperature "ocean_model", "sss_global" [Unused] ! long_name: Global Area Average Sea Surface Salinity - ! units: ppt + ! units: psu ! standard_name: sea_surface_salinity "ocean_model", "sosga" [Used] ! long_name: Sea Surface Salinity - ! units: ppt + ! units: psu ! standard_name: sea_surface_salinity "ocean_model", "e" [Used] ! long_name: Interface Height Relative to Mean Sea Level - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "e_xyave" [Unused] ! long_name: Interface Height Relative to Mean Sea Level - ! units: meter + ! units: m ! cell_methods: zi:point "ocean_model_z", "e" [Unused] ! long_name: Interface Height Relative to Mean Sea Level - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "e_xyave" [Unused] ! long_name: Interface Height Relative to Mean Sea Level - ! units: meter + ! units: m ! cell_methods: z_i:point "ocean_model", "e_D" [Unused] ! long_name: Interface Height above the Seafloor - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "e_D_xyave" [Unused] ! long_name: Interface Height above the Seafloor - ! units: meter + ! units: m ! cell_methods: zi:point "ocean_model_z", "e_D" [Unused] ! long_name: Interface Height above the Seafloor - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "e_D_xyave" [Unused] ! long_name: Interface Height above the Seafloor - ! units: meter + ! units: m ! cell_methods: z_i:point "ocean_model", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Rml_xyave" [Unused] ! long_name: Mixed Layer Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: zl:mean "ocean_model_z", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Rml_xyave" [Unused] ! long_name: Mixed Layer Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: z_l:mean "ocean_model", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Rho_cv_xyave" [Unused] ! long_name: Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: zl:mean "ocean_model_z", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Rho_cv_xyave" [Unused] ! long_name: Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: z_l:mean "ocean_model", "rhopot0" [Unused] ! long_name: Potential density referenced to surface - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "rhopot0_xyave" [Unused] ! long_name: Potential density referenced to surface - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: zl:mean "ocean_model_z", "rhopot0" [Unused] ! long_name: Potential density referenced to surface - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "rhopot0_xyave" [Unused] ! long_name: Potential density referenced to surface - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: z_l:mean "ocean_model", "rhopot2" [Unused] ! long_name: Potential density referenced to 2000 dbar - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "rhopot2_xyave" [Unused] ! long_name: Potential density referenced to 2000 dbar - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: zl:mean "ocean_model_z", "rhopot2" [Unused] ! long_name: Potential density referenced to 2000 dbar - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "rhopot2_xyave" [Unused] ! long_name: Potential density referenced to 2000 dbar - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: z_l:mean "ocean_model", "rhoinsitu" [Unused] ! long_name: In situ density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "rhoinsitu_xyave" [Unused] ! long_name: In situ density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: zl:mean "ocean_model_z", "rhoinsitu" [Unused] ! long_name: In situ density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "rhoinsitu_xyave" [Unused] ! long_name: In situ density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: z_l:mean "ocean_model", "dudt" [Unused] ! long_name: Zonal Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "dudt_xyave" [Unused] ! long_name: Zonal Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "dudt" [Unused] ! long_name: Zonal Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "dudt_xyave" [Unused] ! long_name: Zonal Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "dvdt" [Unused] ! long_name: Meridional Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "dvdt_xyave" [Unused] ! long_name: Meridional Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "dvdt" [Unused] ! long_name: Meridional Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "dvdt_xyave" [Unused] ! long_name: Meridional Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "dhdt" [Unused] ! long_name: Thickness tendency - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "dhdt_xyave" [Unused] ! long_name: Thickness tendency - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "dhdt" [Unused] ! long_name: Thickness tendency - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "dhdt_xyave" [Unused] ! long_name: Thickness tendency - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "h_rho" [Used] ! long_name: Layer thicknesses in pure potential density coordinates - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "h_rho_xyave" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates - ! units: meter + ! units: m ! cell_methods: zl:mean "ocean_model_z", "h_rho" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "h_rho_xyave" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates - ! units: meter + ! units: m ! cell_methods: z_l:mean "ocean_model", "uh_rho" [Used] ! long_name: Zonal volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "uh_rho_xyave" [Unused] ! long_name: Zonal volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "uh_rho" [Unused] ! long_name: Zonal volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "uh_rho_xyave" [Unused] ! long_name: Zonal volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:mean "ocean_model", "vh_rho" [Used] ! long_name: Meridional volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "vh_rho_xyave" [Unused] ! long_name: Meridional volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "vh_rho" [Unused] ! long_name: Meridional volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "vh_rho_xyave" [Unused] ! long_name: Meridional volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:mean "ocean_model", "uhGM_rho" [Used] ! long_name: Zonal volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "uhGM_rho_xyave" [Unused] ! long_name: Zonal volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "uhGM_rho" [Unused] ! long_name: Zonal volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "uhGM_rho_xyave" [Unused] ! long_name: Zonal volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:mean "ocean_model", "vhGM_rho" [Used] ! long_name: Meridional volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "vhGM_rho_xyave" [Unused] ! long_name: Meridional volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "vhGM_rho" [Unused] ! long_name: Meridional volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "vhGM_rho_xyave" [Unused] ! long_name: Meridional volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:mean "ocean_model", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_xyave" [Unused] ! long_name: Layer kinetic energy per unit mass - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: zl:mean "ocean_model_z", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_xyave" [Unused] ! long_name: Layer kinetic energy per unit mass - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: z_l:mean "ocean_model", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "dKE_dt_xyave" [Unused] ! long_name: Kinetic Energy Tendency of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "dKE_dt_xyave" [Unused] ! long_name: Kinetic Energy Tendency of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "PE_to_KE_xyave" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "PE_to_KE_xyave" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_Coradv_xyave" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_Coradv_xyave" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_adv_xyave" [Unused] ! long_name: Kinetic Energy Source from Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_adv_xyave" [Unused] ! long_name: Kinetic Energy Source from Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_visc_xyave" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_visc_xyave" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_horvisc_xyave" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_horvisc_xyave" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_dia_xyave" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_dia_xyave" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "cg1" [Unused] ! long_name: First baroclinic gravity wave speed - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "Rd1" [Unused] ! long_name: First baroclinic deformation radius - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "CFL_cg1" [Unused] ! long_name: CFL of first baroclinic gravity wave = dt*cg1*(1/dx+1/dy) @@ -1730,11 +1730,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "cg_ebt" [Unused] ! long_name: Equivalent barotropic gravity wave speed - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "Rd_ebt" [Unused] ! long_name: Equivalent barotropic deformation radius - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "p_ebt" [Unused] ! long_name: Equivalent barotropic modal strcuture @@ -1767,11 +1767,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "salt_int" [Unused] (CMOR equivalent is "somint") ! long_name: Density weighted column integrated salinity - ! units: ppt kg m-2 + ! units: psu kg m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "somint" [Used] (native name is "salt_int") ! long_name: integral_wrt_depth_of_product_of_sea_water_density_and_salinity - ! units: ppt kg m-2 + ! units: psu kg m-2 ! standard_name: Depth integrated density times salinity ! cell_methods: xh:mean yh:mean "ocean_model", "col_mass" [Unused] @@ -1789,171 +1789,171 @@ ! cell_methods: xh:mean yh:mean "ocean_model_zold", "u" [Unused] (CMOR equivalent is "uo") ! long_name: Zonal Velocity in Depth Space - ! units: meter second-1 + ! units: m s-1 "ocean_model_zold", "uo" [Unused] (native name is "u") ! long_name: Sea Water X Velocity ! units: m s-1 ! standard_name: sea_water_x_velocity "ocean_model_zold", "v" [Unused] (CMOR equivalent is "vo") ! long_name: Meridional Velocity in Depth Space - ! units: meter second-1 + ! units: m s-1 "ocean_model_zold", "vo" [Unused] (native name is "v") ! long_name: Sea Water Y Velocity ! units: m s-1 ! standard_name: sea_water_y_velocity "ocean_model_zold", "uh" [Unused] ! long_name: Zonal Mass Transport (including SGS param) in Depth Space - ! units: meter3 second-1 + ! units: m3 s-1 "ocean_model_zold", "vh" [Unused] ! long_name: Meridional Mass Transport (including SGS param) in Depth Space - ! units: meter3 second-1 + ! units: m3 s-1 "ocean_model", "ea" [Unused] ! long_name: Layer entrainment from above per timestep - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "ea_xyave" [Unused] ! long_name: Layer entrainment from above per timestep - ! units: meter + ! units: m ! cell_methods: zl:mean "ocean_model_z", "ea" [Unused] ! long_name: Layer entrainment from above per timestep - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "ea_xyave" [Unused] ! long_name: Layer entrainment from above per timestep - ! units: meter + ! units: m ! cell_methods: z_l:mean "ocean_model", "eb" [Unused] ! long_name: Layer entrainment from below per timestep - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "eb_xyave" [Unused] ! long_name: Layer entrainment from below per timestep - ! units: meter + ! units: m ! cell_methods: zl:mean "ocean_model_z", "eb" [Unused] ! long_name: Layer entrainment from below per timestep - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "eb_xyave" [Unused] ! long_name: Layer entrainment from below per timestep - ! units: meter + ! units: m ! cell_methods: z_l:mean "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "dudt_dia_xyave" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "dudt_dia_xyave" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "dvdt_dia" [Unused] ! long_name: Meridional Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "dvdt_dia_xyave" [Unused] ! long_name: Meridional Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "dvdt_dia" [Unused] ! long_name: Meridional Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "dvdt_dia_xyave" [Unused] ! long_name: Meridional Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "wd" [Used] ! long_name: Diapycnal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "wd_xyave" [Unused] ! long_name: Diapycnal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zi:point "ocean_model_z", "wd" [Unused] ! long_name: Diapycnal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "wd_xyave" [Unused] ! long_name: Diapycnal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_i:point "ocean_model", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Tflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: zi:point "ocean_model_z", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Tflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: z_i:point "ocean_model", "Tflx_dia_adv" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Tflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: zi:point "ocean_model_z", "Tflx_dia_adv" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Tflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: z_i:point "ocean_model", "Sflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Sflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: zi:point "ocean_model_z", "Sflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Sflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: z_i:point "ocean_model", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Sflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: zi:point "ocean_model_z", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Sflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: z_i:point "ocean_model", "MLD_003" [Used] (CMOR equivalent is "mlotst") ! long_name: Mixed layer depth (delta rho = 0.03) - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "mlotst" [Used] (native name is "MLD_003") ! long_name: Ocean Mixed Layer Thickness Defined by Sigma T @@ -1967,7 +1967,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "MLD_0125" [Unused] ! long_name: Mixed layer depth (delta rho = 0.125) - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "subML_N2" [Used] ! long_name: Squared buoyancy frequency below mixed layer @@ -1975,46 +1975,46 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "MLD_user" [Unused] ! long_name: Mixed layer depth (used defined) - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model_zold", "Kd_interface" [Unused] ! long_name: Diapycnal diffusivity at interfaces, interpolated to z - ! units: meter2 second-1 + ! units: m2 s-1 "ocean_model_zold", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces, interpolated to z - ! units: degC meter second-1 + ! units: degC m s-1 "ocean_model_zold", "Tflx_dia_adv" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces, interpolated to z - ! units: degC meter second-1 + ! units: degC m s-1 "ocean_model_zold", "Sflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal salinity flux across interfaces, interpolated to z - ! units: PSU meter second-1 + ! units: psu m s-1 "ocean_model_zold", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salinity flux across interfaces, interpolated to z - ! units: PSU meter second-1 + ! units: psu m s-1 "ocean_model", "Kd_interface" [Used] ! long_name: Total diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_interface_xyave" [Unused] ! long_name: Total diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_interface" [Unused] ! long_name: Total diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_interface_xyave" [Unused] ! long_name: Total diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "Kd_heat" [Unused] (CMOR equivalent is "difvho") ! long_name: Total diapycnal diffusivity for heat at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_heat_xyave" [Unused] (CMOR equivalent is "difvho_xyave") ! long_name: Total diapycnal diffusivity for heat at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model", "difvho" [Used] (native name is "Kd_heat") ! long_name: Ocean vertical heat diffusivity @@ -2028,11 +2028,11 @@ ! cell_methods: zi:point "ocean_model_z", "Kd_heat" [Unused] (CMOR equivalent is "difvho") ! long_name: Total diapycnal diffusivity for heat at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_heat_xyave" [Unused] (CMOR equivalent is "difvho_xyave") ! long_name: Total diapycnal diffusivity for heat at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model_z", "difvho" [Unused] (native name is "Kd_heat") ! long_name: Ocean vertical heat diffusivity @@ -2046,11 +2046,11 @@ ! cell_methods: z_i:point "ocean_model", "Kd_salt" [Unused] (CMOR equivalent is "difvso") ! long_name: Total diapycnal diffusivity for salt at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_salt_xyave" [Unused] (CMOR equivalent is "difvso_xyave") ! long_name: Total diapycnal diffusivity for salt at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model", "difvso" [Used] (native name is "Kd_salt") ! long_name: Ocean vertical salt diffusivity @@ -2064,11 +2064,11 @@ ! cell_methods: zi:point "ocean_model_z", "Kd_salt" [Unused] (CMOR equivalent is "difvso") ! long_name: Total diapycnal diffusivity for salt at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_salt_xyave" [Unused] (CMOR equivalent is "difvso_xyave") ! long_name: Total diapycnal diffusivity for salt at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model_z", "difvso" [Unused] (native name is "Kd_salt") ! long_name: Ocean vertical salt diffusivity @@ -2082,55 +2082,55 @@ ! cell_methods: z_i:point "ocean_model", "frazil_temp_tendency" [Used] ! long_name: Temperature tendency due to frazil formation - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "frazil_temp_tendency_xyave" [Unused] ! long_name: Temperature tendency due to frazil formation - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: zl:mean "ocean_model_z", "frazil_temp_tendency" [Unused] ! long_name: Temperature tendency due to frazil formation - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "frazil_temp_tendency_xyave" [Unused] ! long_name: Temperature tendency due to frazil formation - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: z_l:mean "ocean_model", "frazil_heat_tendency" [Used] ! long_name: Heat tendency due to frazil formation - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "frazil_heat_tendency" [Unused] ! long_name: Heat tendency due to frazil formation - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "frazil_heat_tendency_2d" [Used] ! long_name: Depth integrated heat tendency due to frazil formation - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "Kd_effective" [Used] ! long_name: Diapycnal diffusivity as applied - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_effective_xyave" [Unused] ! long_name: Diapycnal diffusivity as applied - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zl:mean "ocean_model_z", "Kd_effective" [Unused] ! long_name: Diapycnal diffusivity as applied - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_effective_xyave" [Unused] ! long_name: Diapycnal diffusivity as applied - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_l:mean "ocean_model", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface @@ -2157,147 +2157,147 @@ ! standard_name: upward_geothermal_heat_flux_at_sea_floor "ocean_model", "Kd_BBL" [Used] ! long_name: Bottom Boundary Layer Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_BBL_xyave" [Unused] ! long_name: Bottom Boundary Layer Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_BBL" [Unused] ! long_name: Bottom Boundary Layer Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_BBL_xyave" [Unused] ! long_name: Bottom Boundary Layer Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "Kd_layer" [Used] ! long_name: Diapycnal diffusivity of layers (as set) - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_layer_xyave" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zl:mean "ocean_model_z", "Kd_layer" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_layer_xyave" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_l:mean "ocean_model", "TKE_itidal" [Unused] ! long_name: Internal Tide Driven Turbulent Kinetic Energy - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "maxTKE" [Unused] ! long_name: Maximum layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "maxTKE_xyave" [Unused] ! long_name: Maximum layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "maxTKE" [Unused] ! long_name: Maximum layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "maxTKE_xyave" [Unused] ! long_name: Maximum layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd - ! units: second2 meter + ! units: s2 m ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "TKE_to_Kd_xyave" [Unused] ! long_name: Convert TKE to Kd - ! units: second2 meter + ! units: s2 m ! cell_methods: zl:mean "ocean_model_z", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd - ! units: second2 meter + ! units: s2 m ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "TKE_to_Kd_xyave" [Unused] ! long_name: Convert TKE to Kd - ! units: second2 meter + ! units: s2 m ! cell_methods: z_l:mean "ocean_model", "Nb" [Unused] ! long_name: Bottom Buoyancy Frequency - ! units: sec-1 + ! units: s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "Kd_itides" [Used] ! long_name: Internal Tide Driven Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_itides_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_itides" [Unused] ! long_name: Internal Tide Driven Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_itides_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "Kd_lowmode" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_lowmode_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_lowmode" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_lowmode_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "Fl_itides" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Fl_itides_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: zi:point "ocean_model_z", "Fl_itides" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Fl_itides_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: z_i:point "ocean_model", "Fl_lowmode" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Fl_lowmode_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: zi:point "ocean_model_z", "Fl_lowmode" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Fl_lowmode_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: z_i:point "ocean_model", "Polzin_decay_scale" [Unused] ! long_name: Vertical decay scale for the tidal turbulent dissipation with Polzin scheme - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "Polzin_decay_scale_scaled" [Unused] ! long_name: Vertical decay scale for the tidal turbulent dissipation with Polzin scheme, scaled by N2_bot/N2_meanz - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "N2_b" [Unused] ! long_name: Bottom Buoyancy frequency squared @@ -2309,75 +2309,75 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_Work_xyave" [Unused] ! long_name: Work done by Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_Work_xyave" [Unused] ! long_name: Work done by Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_Itidal_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_Itidal_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_Nikurashin_Work_xyave" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_Nikurashin_Work_xyave" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "Kd_Lowmode_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_Lowmode_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "Kd_Lowmode_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_Lowmode_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "N2" [Unused] (CMOR equivalent is "obvfsq") ! long_name: Buoyancy frequency squared - ! units: sec-2 + ! units: s-2 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "N2_xyave" [Unused] (CMOR equivalent is "obvfsq_xyave") ! long_name: Buoyancy frequency squared - ! units: sec-2 + ! units: s-2 ! cell_methods: zi:point "ocean_model", "obvfsq" [Used] (native name is "N2") ! long_name: Square of seawater buoyancy frequency @@ -2391,11 +2391,11 @@ ! cell_methods: zi:point "ocean_model_z", "N2" [Unused] (CMOR equivalent is "obvfsq") ! long_name: Buoyancy frequency squared - ! units: sec-2 + ! units: s-2 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "N2_xyave" [Unused] (CMOR equivalent is "obvfsq_xyave") ! long_name: Buoyancy frequency squared - ! units: sec-2 + ! units: s-2 ! cell_methods: z_i:point "ocean_model_z", "obvfsq" [Unused] (native name is "N2") ! long_name: Square of seawater buoyancy frequency @@ -2409,198 +2409,198 @@ ! cell_methods: z_i:point "ocean_model_zold", "N2" [Unused] ! long_name: Buoyancy frequency, interpolated to z - ! units: second-2 + ! units: s-2 "ocean_model_zold", "Kd_itides" [Unused] ! long_name: Internal Tide Driven Diffusivity, interpolated to z - ! units: meter2 second-1 + ! units: m2 s-1 "ocean_model", "Kd_shear" [Used] ! long_name: Shear-driven Diapycnal Diffusivity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_shear_xyave" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_shear" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_shear_xyave" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "TKE_shear" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "TKE_shear_xyave" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: zi:point "ocean_model_z", "TKE_shear" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "TKE_shear_xyave" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: z_i:point "ocean_model", "h_ML" [Unused] ! long_name: Surface mixed layer depth - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "TKE_wind" [Unused] ! long_name: Wind-stirring source of mixed layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "TKE_RiBulk" [Unused] ! long_name: Mean kinetic energy source of mixed layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "TKE_conv" [Unused] ! long_name: Convective source of mixed layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "TKE_pen_SW" [Unused] ! long_name: TKE consumed by mixing penetrative shortwave radation through the mixed layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "TKE_mixing" [Unused] ! long_name: TKE consumed by mixing that deepens the mixed layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "TKE_mech_decay" [Unused] ! long_name: Mechanical energy decay sink of mixed layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "TKE_conv_decay" [Unused] ! long_name: Convective energy decay sink of mixed layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "TKE_conv_s2" [Unused] ! long_name: Spurious source of mixed layer TKE from sigma2 - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "PE_detrain" [Unused] ! long_name: Spurious source of potential energy from mixed layer detrainment - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "PE_detrain2" [Unused] ! long_name: Spurious source of potential energy from mixed layer only detrainment - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "h_miss_ML" [Unused] ! long_name: Summed absolute mismatch in entrainment terms - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "Hs_used" [Unused] ! long_name: Surface region thickness that is used - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "Hs_max" [Unused] ! long_name: Maximum surface region thickness - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "Hs_min" [Unused] ! long_name: Minimum surface region thickness - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "deficit_ratio" [Unused] ! long_name: Max face thickness deficit ratio - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yh:mean "ocean_model", "SW_pen" [Unused] ! long_name: Penetrating shortwave radiation flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "SW_vis_pen" [Unused] ! long_name: Visible penetrating shortwave radiation flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "opac_1_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 1 - ! units: meter-1 + ! units: m-1 ! cell_methods: zl:mean "ocean_model_z", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "opac_1_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 1 - ! units: meter-1 + ! units: m-1 ! cell_methods: z_l:mean "ocean_model", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "opac_2_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 2 - ! units: meter-1 + ! units: m-1 ! cell_methods: zl:mean "ocean_model_z", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "opac_2_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 2 - ! units: meter-1 + ! units: m-1 ! cell_methods: z_l:mean "ocean_model", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "opac_3_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 3 - ! units: meter-1 + ! units: m-1 ! cell_methods: zl:mean "ocean_model_z", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "opac_3_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 3 - ! units: meter-1 + ! units: m-1 ! cell_methods: z_l:mean "ocean_model", "Chl_opac" [Unused] ! long_name: Surface chlorophyll A concentration used to find opacity - ! units: mg meter-3 + ! units: mg m-3 ! cell_methods: xh:mean yh:mean "ocean_model", "KHTR_u" [Used] ! long_name: Epipycnal tracer diffusivity at zonal faces of tracer cell - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "KHTR_v" [Used] ! long_name: Epipycnal tracer diffusivity at meridional faces of tracer cell - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "KHTR_h" [Unused] (CMOR equivalent is "diftrelo") ! long_name: Epipycnal tracer diffusivity at tracer cell center - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "diftrelo" [Used] (native name is "KHTR_h") ! long_name: Ocean Tracer Epineutral Laplacian Diffusivity - ! units: m2 sec-1 + ! units: m2 s-1 ! standard_name: ocean_tracer_epineutral_laplacian_diffusivity ! cell_methods: xh:mean yh:mean "ocean_model", "KHDT_x" [Unused] ! long_name: Epipycnal tracer diffusivity operator at zonal faces of tracer cell - ! units: meter2 + ! units: m2 ! cell_methods: xq:point yh:mean "ocean_model", "KHDT_y" [Unused] ! long_name: Epipycnal tracer diffusivity operator at meridional faces of tracer cell - ! units: meter2 + ! units: m2 ! cell_methods: xh:mean yq:point "ocean_model", "u" [Used] (CMOR equivalent is "uo") ! long_name: Zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "u_xyave" [Unused] (CMOR equivalent is "uo_xyave") ! long_name: Zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model", "uo" [Used] (native name is "u") ! long_name: Sea Water X Velocity @@ -2614,11 +2614,11 @@ ! cell_methods: zl:mean "ocean_model_z", "u" [Used] (CMOR equivalent is "uo") ! long_name: Zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "u_xyave" [Unused] (CMOR equivalent is "uo_xyave") ! long_name: Zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model_z", "uo" [Used] (native name is "u") ! long_name: Sea Water X Velocity @@ -2632,11 +2632,11 @@ ! cell_methods: z_l:mean "ocean_model", "v" [Used] (CMOR equivalent is "vo") ! long_name: Meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "v_xyave" [Unused] (CMOR equivalent is "vo_xyave") ! long_name: Meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model", "vo" [Used] (native name is "v") ! long_name: Sea Water Y Velocity @@ -2650,11 +2650,11 @@ ! cell_methods: zl:mean "ocean_model_z", "v" [Used] (CMOR equivalent is "vo") ! long_name: Meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "v_xyave" [Unused] (CMOR equivalent is "vo_xyave") ! long_name: Meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model_z", "vo" [Used] (native name is "v") ! long_name: Sea Water Y Velocity @@ -2668,19 +2668,19 @@ ! cell_methods: z_l:mean "ocean_model", "h" [Used] ! long_name: Layer Thickness - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "h_xyave" [Unused] ! long_name: Layer Thickness - ! units: meter + ! units: m ! cell_methods: zl:sum "ocean_model_z", "h" [Unused] ! long_name: Layer Thickness - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "h_xyave" [Unused] ! long_name: Layer Thickness - ! units: meter + ! units: m ! cell_methods: z_l:sum "ocean_model", "volo" [Used] ! long_name: Total volume of liquid ocean @@ -2688,7 +2688,7 @@ ! standard_name: sea_water_volume "ocean_model", "zos" [Used] ! long_name: Sea surface height above geoid - ! units: meter + ! units: m ! standard_name: sea_surface_height_above_geoid ! cell_methods: xh:mean yh:mean "ocean_model", "zossq" [Used] @@ -2698,7 +2698,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "SSH" [Used] ! long_name: Sea Surface Height - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ssh_ga" [Used] ! long_name: Area averaged sea surface height @@ -2706,90 +2706,90 @@ ! standard_name: area_averaged_sea_surface_height "ocean_model", "SSH_inst" [Unused] ! long_name: Instantaneous Sea Surface Height - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "SSU" [Used] ! long_name: Sea Surface Zonal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "SSV" [Used] ! long_name: Sea Surface Meridional Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "speed" [Used] ! long_name: Sea Surface Speed - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "temp" [Used] (CMOR equivalent is "thetao") ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "temp_xyave" [Unused] (CMOR equivalent is "thetao_xyave") ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: zl:mean "ocean_model", "thetao" [Unused] (native name is "temp") ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "thetao_xyave" [Unused] (native name is "temp_xyave") ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature ! cell_methods: zl:mean "ocean_model_z", "temp" [Used] (CMOR equivalent is "thetao") ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "temp_xyave" [Used] (CMOR equivalent is "thetao_xyave") ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: z_l:mean "ocean_model_z", "thetao" [Used] (native name is "temp") ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "thetao_xyave" [Unused] (native name is "temp_xyave") ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature ! cell_methods: z_l:mean "ocean_model", "salt" [Used] (CMOR equivalent is "so") ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "salt_xyave" [Unused] (CMOR equivalent is "so_xyave") ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: zl:mean "ocean_model", "so" [Used] (native name is "salt") ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "so_xyave" [Unused] (native name is "salt_xyave") ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity ! cell_methods: zl:mean "ocean_model_z", "salt" [Used] (CMOR equivalent is "so") ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "salt_xyave" [Unused] (CMOR equivalent is "so_xyave") ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: z_l:mean "ocean_model_z", "so" [Used] (native name is "salt") ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "so_xyave" [Unused] (native name is "salt_xyave") ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity ! cell_methods: z_l:mean "ocean_model", "tob" [Unused] @@ -2799,12 +2799,12 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "sob" [Unused] ! long_name: Sea Water Salinity at Sea Floor - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity_at_sea_floor ! cell_methods: xh:mean yh:mean "ocean_model", "SST" [Used] (CMOR equivalent is "tos") ! long_name: Sea Surface Temperature - ! units: Celsius + ! units: degC ! cell_methods: xh:mean yh:mean "ocean_model", "tos" [Unused] (native name is "SST") ! long_name: Sea Surface Temperature @@ -2813,34 +2813,34 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "SST_sq" [Unused] (CMOR equivalent is "tossq") ! long_name: Sea Surface Temperature Squared - ! units: Celsius**2 + ! units: degC2 ! cell_methods: xh:mean yh:mean "ocean_model", "tossq" [Unused] (native name is "SST_sq") ! long_name: Square of Sea Surface Temperature - ! units: degC^2 + ! units: degC2 ! standard_name: square_of_sea_surface_temperature ! cell_methods: xh:mean yh:mean "ocean_model", "SSS" [Used] (CMOR equivalent is "sos") ! long_name: Sea Surface Salinity - ! units: PPT + ! units: psu ! cell_methods: xh:mean yh:mean "ocean_model", "sos" [Unused] (native name is "SSS") ! long_name: Sea Surface Salinity - ! units: ppt + ! units: psu ! standard_name: sea_surface_salinity ! cell_methods: xh:mean yh:mean "ocean_model", "SSS_sq" [Unused] (CMOR equivalent is "sossq") ! long_name: Sea Surface Salinity Squared - ! units: ppt**2 + ! units: psu ! cell_methods: xh:mean yh:mean "ocean_model", "sossq" [Unused] (native name is "SSS_sq") ! long_name: Square of Sea Surface Salinity - ! units: ppt^2 + ! units: psu ! standard_name: square_of_sea_surface_salinity ! cell_methods: xh:mean yh:mean "ocean_model", "frazil" [Used] (CMOR equivalent is "hfsifrazil") ! long_name: Heat from frazil formation - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hfsifrazil" [Used] (native name is "frazil") ! long_name: Heat Flux into Sea Water due to Frazil Ice Formation @@ -2849,287 +2849,287 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "salt_deficit" [Unused] ! long_name: Salt sink in ocean due to ice flux - ! units: g Salt meter-2 s-1 + ! units: psu m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "Heat_PmE" [Used] ! long_name: Heat flux into ocean from mass flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "internal_heat" [Unused] ! long_name: Heat flux into ocean from geothermal or other internal sources - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "T_adx" [Used] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "T_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "T_adx" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "T_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: z_l:mean "ocean_model", "T_ady" [Used] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "T_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "T_ady" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "T_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: z_l:mean "ocean_model", "T_diffx" [Used] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "T_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "T_diffx" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "T_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: z_l:mean "ocean_model", "T_diffy" [Used] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "T_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "T_diffy" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "T_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: z_l:mean "ocean_model", "S_adx" [Used] ! long_name: Advective (by residual mean) Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "S_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "S_adx" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "S_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: z_l:mean "ocean_model", "S_ady" [Used] ! long_name: Advective (by residual mean) Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "S_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "S_ady" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "S_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: z_l:mean "ocean_model", "S_diffx" [Used] ! long_name: Diffusive Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "S_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "S_diffx" [Unused] ! long_name: Diffusive Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "S_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: z_l:mean "ocean_model", "S_diffy" [Used] ! long_name: Diffusive Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "S_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "S_diffy" [Unused] ! long_name: Diffusive Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "S_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: z_l:mean "ocean_model", "T_adx_2d" [Unused] ! long_name: Vertically Integrated Advective Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "T_ady_2d" [Unused] ! long_name: Vertically Integrated Advective Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "T_diffx_2d" [Unused] ! long_name: Vertically Integrated Diffusive Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "T_diffy_2d" [Unused] ! long_name: Vertically Integrated Diffusive Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "S_adx_2d" [Unused] ! long_name: Vertically Integrated Advective Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "S_ady_2d" [Unused] ! long_name: Vertically Integrated Advective Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "S_diffx_2d" [Unused] ! long_name: Vertically Integrated Diffusive Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "S_diffy_2d" [Unused] ! long_name: Vertically Integrated Diffusive Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "u_predia" [Unused] ! long_name: Zonal velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "u_predia_xyave" [Unused] ! long_name: Zonal velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "u_predia" [Unused] ! long_name: Zonal velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "u_predia_xyave" [Unused] ! long_name: Zonal velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "v_predia" [Unused] ! long_name: Meridional velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "v_predia_xyave" [Unused] ! long_name: Meridional velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "v_predia" [Unused] ! long_name: Meridional velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "v_predia_xyave" [Unused] ! long_name: Meridional velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "h_predia_xyave" [Unused] ! long_name: Layer Thickness before diabatic forcing - ! units: meter + ! units: m ! cell_methods: zl:sum "ocean_model_z", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "h_predia_xyave" [Unused] ! long_name: Layer Thickness before diabatic forcing - ! units: meter + ! units: m ! cell_methods: z_l:sum "ocean_model", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "e_predia_xyave" [Unused] ! long_name: Interface Heights before diabatic forcing - ! units: meter + ! units: m ! cell_methods: zi:point "ocean_model_z", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "e_predia_xyave" [Unused] ! long_name: Interface Heights before diabatic forcing - ! units: meter + ! units: m ! cell_methods: z_i:point "ocean_model", "u_preale" [Unused] ! long_name: Zonal velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "u_preale_xyave" [Unused] ! long_name: Zonal velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "u_preale" [Unused] ! long_name: Zonal velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "u_preale_xyave" [Unused] ! long_name: Zonal velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "v_preale" [Unused] ! long_name: Meridional velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "v_preale_xyave" [Unused] ! long_name: Meridional velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "v_preale" [Unused] ! long_name: Meridional velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "v_preale_xyave" [Unused] ! long_name: Meridional velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "h_preale" [Unused] ! long_name: Layer Thickness before remapping - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "h_preale_xyave" [Unused] ! long_name: Layer Thickness before remapping - ! units: meter + ! units: m ! cell_methods: zl:sum "ocean_model_z", "h_preale" [Unused] ! long_name: Layer Thickness before remapping - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "h_preale_xyave" [Unused] ! long_name: Layer Thickness before remapping - ! units: meter + ! units: m ! cell_methods: z_l:sum "ocean_model", "T_preale" [Unused] ! long_name: Temperature before remapping @@ -3149,67 +3149,67 @@ ! cell_methods: z_l:mean "ocean_model", "S_preale" [Unused] ! long_name: Salinity before remapping - ! units: ppt + ! units: psu ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "S_preale_xyave" [Unused] ! long_name: Salinity before remapping - ! units: ppt + ! units: psu ! cell_methods: zl:mean "ocean_model_z", "S_preale" [Unused] ! long_name: Salinity before remapping - ! units: ppt + ! units: psu ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "S_preale_xyave" [Unused] ! long_name: Salinity before remapping - ! units: ppt + ! units: psu ! cell_methods: z_l:mean "ocean_model", "e_preale" [Unused] ! long_name: Interface Heights before remapping - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "e_preale_xyave" [Unused] ! long_name: Interface Heights before remapping - ! units: meter + ! units: m ! cell_methods: zi:point "ocean_model_z", "e_preale" [Unused] ! long_name: Interface Heights before remapping - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "e_preale_xyave" [Unused] ! long_name: Interface Heights before remapping - ! units: meter + ! units: m ! cell_methods: z_i:point "ocean_model", "temp_predia" [Unused] ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "temp_predia_xyave" [Unused] ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: zl:mean "ocean_model_z", "temp_predia" [Unused] ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "temp_predia_xyave" [Unused] ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: z_l:mean "ocean_model", "salt_predia" [Unused] ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "salt_predia_xyave" [Unused] ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: zl:mean "ocean_model_z", "salt_predia" [Unused] ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "salt_predia_xyave" [Unused] ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: z_l:mean "ocean_model", "uhtr" [Unused] ! long_name: Accumulated zonal thickness fluxes to advect tracers @@ -3245,97 +3245,97 @@ ! cell_methods: z_l:sum "ocean_model", "umo" [Used] ! long_name: Ocean Mass X Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_x_transport ! cell_methods: xq:point yh:sum zl:sum "ocean_model", "umo_xyave" [Unused] ! long_name: Ocean Mass X Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_x_transport ! cell_methods: zl:sum "ocean_model_z", "umo" [Used] ! long_name: Ocean Mass X Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_x_transport ! cell_methods: xq:point yh:sum z_l:sum "ocean_model_z", "umo_xyave" [Unused] ! long_name: Ocean Mass X Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_x_transport ! cell_methods: z_l:sum "ocean_model", "vmo" [Used] ! long_name: Ocean Mass Y Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_y_transport ! cell_methods: xh:sum yq:point zl:sum "ocean_model", "vmo_xyave" [Unused] ! long_name: Ocean Mass Y Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_y_transport ! cell_methods: zl:sum "ocean_model_z", "vmo" [Used] ! long_name: Ocean Mass Y Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_y_transport ! cell_methods: xh:sum yq:point z_l:sum "ocean_model_z", "vmo_xyave" [Unused] ! long_name: Ocean Mass Y Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_y_transport ! cell_methods: z_l:sum "ocean_model", "umo_2d" [Used] ! long_name: Ocean Mass X Transport Vertical Sum - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_x_transport_vertical_sum ! cell_methods: xq:point yh:sum "ocean_model", "vmo_2d" [Used] ! long_name: Ocean Mass Y Transport Vertical Sum - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_y_transport_vertical_sum ! cell_methods: xh:sum yq:point "ocean_model", "T_advection_xy" [Used] ! long_name: Horizontal convergence of residual mean heat advective fluxes - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "T_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes - ! units: W/m2 + ! units: W m-2 ! cell_methods: zl:sum "ocean_model_z", "T_advection_xy" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "T_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes - ! units: W/m2 + ! units: W m-2 ! cell_methods: z_l:sum "ocean_model", "T_advection_xy_2d" [Used] ! long_name: Vertical sum of horizontal convergence of residual mean heat advective fluxes - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "T_tendency" [Used] ! long_name: Net time tendency for temperature - ! units: degC/s + ! units: degC s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "T_tendency_xyave" [Unused] ! long_name: Net time tendency for temperature - ! units: degC/s + ! units: degC s-1 ! cell_methods: zl:mean "ocean_model_z", "T_tendency" [Unused] ! long_name: Net time tendency for temperature - ! units: degC/s + ! units: degC s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "T_tendency_xyave" [Unused] ! long_name: Net time tendency for temperature - ! units: degC/s + ! units: degC s-1 ! cell_methods: z_l:mean "ocean_model", "Th_tendency" [Unused] (CMOR equivalent is "opottemptend") ! long_name: Net time tendency for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "Th_tendency_xyave" [Unused] (CMOR equivalent is "opottemptend_xyave") ! long_name: Net time tendency for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: zl:sum "ocean_model", "opottemptend" [Used] (native name is "Th_tendency") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content @@ -3349,11 +3349,11 @@ ! cell_methods: zl:sum "ocean_model_z", "Th_tendency" [Unused] (CMOR equivalent is "opottemptend") ! long_name: Net time tendency for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "Th_tendency_xyave" [Unused] (CMOR equivalent is "opottemptend_xyave") ! long_name: Net time tendency for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: z_l:sum "ocean_model_z", "opottemptend" [Unused] (native name is "Th_tendency") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content @@ -3367,7 +3367,7 @@ ! cell_methods: z_l:sum "ocean_model", "Th_tendency_2d" [Unused] (CMOR equivalent is "opottemptend_2d") ! long_name: Vertical sum of net time tendency for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "opottemptend_2d" [Used] (native name is "Th_tendency_2d") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content Vertical Sum @@ -3376,47 +3376,47 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "S_advection_xy" [Used] ! long_name: Horizontal convergence of residual mean salt advective fluxes - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "S_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: zl:sum "ocean_model_z", "S_advection_xy" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "S_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: z_l:sum "ocean_model", "S_advection_xy_2d" [Used] ! long_name: Vertical sum of horizontal convergence of residual mean salt advective fluxes - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "S_tendency" [Used] ! long_name: Net time tendency for salinity - ! units: PPT/s + ! units: psu s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "S_tendency_xyave" [Unused] ! long_name: Net time tendency for salinity - ! units: PPT/s + ! units: psu s-1 ! cell_methods: zl:mean "ocean_model_z", "S_tendency" [Unused] ! long_name: Net time tendency for salinity - ! units: PPT/s + ! units: psu s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "S_tendency_xyave" [Unused] ! long_name: Net time tendency for salinity - ! units: PPT/s + ! units: psu s-1 ! cell_methods: z_l:mean "ocean_model", "Sh_tendency" [Unused] (CMOR equivalent is "osalttend") ! long_name: Net time tendency for salt - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "Sh_tendency_xyave" [Unused] (CMOR equivalent is "osalttend_xyave") ! long_name: Net time tendency for salt - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: zl:sum "ocean_model", "osalttend" [Used] (native name is "Sh_tendency") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content @@ -3430,11 +3430,11 @@ ! cell_methods: zl:sum "ocean_model_z", "Sh_tendency" [Unused] (CMOR equivalent is "osalttend") ! long_name: Net time tendency for salt - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "Sh_tendency_xyave" [Unused] (CMOR equivalent is "osalttend_xyave") ! long_name: Net time tendency for salt - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: z_l:sum "ocean_model_z", "osalttend" [Unused] (native name is "Sh_tendency") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content @@ -3448,7 +3448,7 @@ ! cell_methods: z_l:sum "ocean_model", "Sh_tendency_2d" [Unused] (CMOR equivalent is "osalttend_2d") ! long_name: Vertical sum of net time tendency for salt - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "osalttend_2d" [Used] (native name is "Sh_tendency_2d") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content Vertical Sum @@ -3465,139 +3465,139 @@ ! standard_name: not provided "ocean_model_zold", "thetao" [Unused] ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature "ocean_model_zold", "thetao_xyave" [Unused] ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature "ocean_model_zold", "salt" [Used] ! long_name: Salinity - ! units: PPT + ! units: psu ! standard_name: not provided "ocean_model_zold", "salt_xyave" [Unused] ! long_name: Salinity - ! units: PPT + ! units: psu ! standard_name: not provided "ocean_model_zold", "so" [Unused] ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity "ocean_model_zold", "so_xyave" [Unused] ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity "ocean_model", "age" [Unused] (CMOR equivalent is "agessc") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "age_xyave" [Unused] (CMOR equivalent is "agessc_xyave") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! cell_methods: zl:mean "ocean_model", "agessc" [Unused] (native name is "age") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "agessc_xyave" [Unused] (native name is "age_xyave") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided ! cell_methods: zl:mean "ocean_model_z", "age" [Unused] (CMOR equivalent is "agessc") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "age_xyave" [Unused] (CMOR equivalent is "agessc_xyave") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! cell_methods: z_l:mean "ocean_model_z", "agessc" [Unused] (native name is "age") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "agessc_xyave" [Unused] (native name is "age_xyave") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided ! cell_methods: z_l:mean "ocean_model", "age_adx" [Unused] ! long_name: Ideal Age Tracer advective zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "age_adx_xyave" [Unused] ! long_name: Ideal Age Tracer advective zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "age_adx" [Unused] ! long_name: Ideal Age Tracer advective zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "age_adx_xyave" [Unused] ! long_name: Ideal Age Tracer advective zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: z_l:mean "ocean_model", "age_ady" [Unused] ! long_name: Ideal Age Tracer advective meridional flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "age_ady_xyave" [Unused] ! long_name: Ideal Age Tracer advective meridional flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "age_ady" [Unused] ! long_name: Ideal Age Tracer advective meridional flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "age_ady_xyave" [Unused] ! long_name: Ideal Age Tracer advective meridional flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: z_l:mean "ocean_model", "age_dfx" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "age_dfx_xyave" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "age_dfx" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "age_dfx_xyave" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: z_l:mean "ocean_model", "age_dfy" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "age_dfy_xyave" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "age_dfy" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "age_dfy_xyave" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: z_l:mean "ocean_model_zold", "age" [Unused] ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided "ocean_model_zold", "age_xyave" [Unused] ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided "ocean_model", "taux" [Used] (CMOR equivalent is "tauuo") ! long_name: Zonal surface stress from ocean interactions with atmos and ice - ! units: Pascal + ! units: Pa ! standard_name: surface_downward_x_stress ! cell_methods: xq:point yh:mean "ocean_model", "tauuo" [Used] (native name is "taux") @@ -3607,7 +3607,7 @@ ! cell_methods: xq:point yh:mean "ocean_model", "tauy" [Used] (CMOR equivalent is "tauvo") ! long_name: Meridional surface stress ocean interactions with atmos and ice - ! units: Pascal + ! units: Pa ! standard_name: surface_downward_y_stress ! cell_methods: xh:mean yq:point "ocean_model", "tauvo" [Used] (native name is "tauy") @@ -3617,11 +3617,11 @@ ! cell_methods: xh:mean yq:point "ocean_model", "ustar" [Used] ! long_name: Surface friction velocity = [(gustiness + tau_magnitude)/rho0]^(1/2) - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "p_surf" [Used] (CMOR equivalent is "pso") ! long_name: Pressure at ice-ocean or atmosphere-ocean interface - ! units: Pascal + ! units: Pa ! cell_methods: xh:mean yh:mean "ocean_model", "pso" [Used] (native name is "p_surf") ! long_name: Sea Water Pressure at Sea Water Surface @@ -3630,11 +3630,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "TKE_tidal" [Unused] ! long_name: Tidal source of BBL mixing - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "PRCmE" [Used] (CMOR equivalent is "wfo") ! long_name: Net surface water flux (precip+melt+lrunoff+ice calving-evap) - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "wfo" [Used] (native name is "PRCmE") @@ -3644,7 +3644,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "evap" [Used] (CMOR equivalent is "evs") ! long_name: Evaporation/condensation at ocean surface (evaporation is negative) - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! standard_name: water_evaporation_flux ! cell_methods: xh:mean yh:mean "ocean_model", "evs" [Used] (native name is "evap") @@ -3654,11 +3654,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "precip" [Unused] ! long_name: Liquid + frozen precipitation into ocean - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "fprec" [Used] (CMOR equivalent is "prsn") ! long_name: Frozen precipitation into ocean - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! standard_name: snowfall_flux ! cell_methods: xh:mean yh:mean "ocean_model", "prsn" [Used] (native name is "fprec") @@ -3668,7 +3668,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "lprec" [Used] (CMOR equivalent is "prlq") ! long_name: Liquid precipitation into ocean - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 ! standard_name: rainfall_flux ! cell_methods: xh:mean yh:mean "ocean_model", "prlq" [Used] (native name is "lprec") @@ -3678,11 +3678,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "vprec" [Used] ! long_name: Virtual liquid precip into ocean due to SSS restoring - ! units: kilogram/(meter^2 second) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "frunoff" [Used] (CMOR equivalent is "ficeberg") ! long_name: Frozen runoff (calving) and iceberg melt into ocean - ! units: kilogram/(meter^2 second) + ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_icebergs ! cell_methods: xh:mean yh:mean "ocean_model", "ficeberg" [Unused] (native name is "frunoff") @@ -3692,7 +3692,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "lrunoff" [Used] (CMOR equivalent is "friver") ! long_name: Liquid runoff (rivers) into ocean - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_rivers ! cell_methods: xh:mean yh:mean "ocean_model", "friver" [Used] (native name is "lrunoff") @@ -3702,23 +3702,23 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "net_massout" [Used] ! long_name: Net mass leaving the ocean due to evaporation, seaice formation - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "net_massin" [Used] ! long_name: Net mass entering ocean due to precip, runoff, ice melt - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "massout_flux" [Unused] ! long_name: Net mass flux of freshwater out of the ocean (used in the boundary flux calculation) - ! units: kilogram meter-2 + ! units: kg m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "massin_flux" [Unused] ! long_name: Net mass flux of freshwater into the ocean (used in boundary flux calculation) - ! units: kilogram meter-2 + ! units: kg m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "total_PRCmE" [Used] ! long_name: Area integrated net surface water flux (precip+melt+liq runoff+ice calving-evap) - ! units: kg/s + ! units: kg s-1 ! standard_name: water_flux_into_sea_water_area_integrated "ocean_model", "total_wfo" [Unused] ! long_name: Water Transport Into Sea Water Area Integrated @@ -3726,7 +3726,7 @@ ! standard_name: water_flux_into_sea_water_area_integrated "ocean_model", "total_evap" [Used] ! long_name: Area integrated evap/condense at ocean surface - ! units: kg/s + ! units: kg s-1 ! standard_name: water_evaporation_flux_area_integrated "ocean_model", "total_evs" [Unused] ! long_name: Evaporation Where Ice Free Ocean over Sea Area Integrated @@ -3734,10 +3734,10 @@ ! standard_name: water_evaporation_flux_area_integrated "ocean_model", "total_precip" [Used] ! long_name: Area integrated liquid+frozen precip into ocean - ! units: kg/s + ! units: kg s-1 "ocean_model", "total_fprec" [Used] ! long_name: Area integrated frozen precip into ocean - ! units: kg/s + ! units: kg s-1 ! standard_name: snowfall_flux_area_integrated "ocean_model", "total_prsn" [Unused] ! long_name: Snowfall Flux where Ice Free Ocean over Sea Area Integrated @@ -3745,7 +3745,7 @@ ! standard_name: snowfall_flux_area_integrated "ocean_model", "total_lprec" [Used] ! long_name: Area integrated liquid precip into ocean - ! units: kg/s + ! units: kg s-1 ! standard_name: rainfall_flux_area_integrated "ocean_model", "total_pr" [Unused] ! long_name: Rainfall Flux where Ice Free Ocean over Sea Area Integrated @@ -3753,27 +3753,27 @@ ! standard_name: rainfall_flux_area_integrated "ocean_model", "total_vprec" [Used] ! long_name: Area integrated virtual liquid precip due to SSS restoring - ! units: kg/s + ! units: kg s-1 "ocean_model", "total_frunoff" [Used] ! long_name: Area integrated frozen runoff (calving) & iceberg melt into ocean - ! units: kg/s + ! units: kg s-1 "ocean_model", "total_ficeberg" [Unused] ! long_name: Water Flux into Seawater from Icebergs Area Integrated ! units: kg s-1 ! standard_name: water_flux_into_sea_water_from_icebergs_area_integrated "ocean_model", "total_lrunoff" [Used] ! long_name: Area integrated liquid runoff into ocean - ! units: kg/s + ! units: kg s-1 "ocean_model", "total_friver" [Unused] ! long_name: Water Flux into Sea Water From Rivers Area Integrated ! units: kg s-1 ! standard_name: water_flux_into_sea_water_from_rivers_area_integrated "ocean_model", "total_net_massout" [Used] ! long_name: Area integrated mass leaving ocean due to evap and seaice form - ! units: kg/s + ! units: kg s-1 "ocean_model", "total_net_massin" [Used] ! long_name: Area integrated mass entering ocean due to predip, runoff, ice melt - ! units: kg/s + ! units: kg s-1 "ocean_model", "PRCmE_ga" [Used] ! long_name: Area averaged net surface water flux (precip+melt+liq runoff+ice calving-evap) ! units: kg m-2 s-1 @@ -3814,12 +3814,12 @@ ! units: kg m-2 s-1 "ocean_model", "heat_content_frunoff" [Used] ! long_name: Heat content (relative to 0C) of solid runoff into ocean - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: temperature_flux_due_to_solid_runoff_expressed_as_heat_flux_into_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_lrunoff" [Used] ! long_name: Heat content (relative to 0C) of liquid runoff into ocean - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "hfrunoffds" [Used] @@ -3829,32 +3829,32 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_lprec" [Used] ! long_name: Heat content (relative to 0degC) of liquid precip entering ocean - ! units: W/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_fprec" [Used] ! long_name: Heat content (relative to 0degC) of frozen prec entering ocean - ! units: W/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_vprec" [Used] ! long_name: Heat content (relative to 0degC) of virtual precip entering ocean - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_cond" [Used] ! long_name: Heat content (relative to 0degC) of water condensing into ocean - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hfrainds" [Used] ! long_name: Heat content (relative to 0degC) of liquid+frozen precip entering ocean - ! units: W/m^2 + ! units: W m-2 ! standard_name: temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_surfwater" [Used] ! long_name: Heat content (relative to 0degC) of net water crossing ocean surface (frozen+liquid) - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_massout" [Used] (CMOR equivalent is "hfevapds") ! long_name: Heat content (relative to 0degC) of net mass leaving ocean ocean via evap and ice form - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hfevapds" [Used] (native name is "heat_content_massout") ! long_name: Heat Content (relative to 0degC) of Water Leaving Ocean via Evaporation and Ice Formation @@ -3863,15 +3863,15 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_massin" [Unused] ! long_name: Heat content (relative to 0degC) of net mass entering ocean ocean - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "net_heat_coupler" [Used] ! long_name: Surface ocean heat flux from SW+LW+latent+sensible (via the coupler) - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "net_heat_surface" [Used] (CMOR equivalent is "hfds") ! long_name: Surface ocean heat flux from SW+LW+lat+sens+mass transfer+frazil+restore or flux adjustments - ! units: Watt/m^2 + ! units: W m-2 ! standard_name: surface_downward_heat_flux_in_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "hfds" [Used] (native name is "net_heat_surface") @@ -3881,7 +3881,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "SW" [Used] (CMOR equivalent is "rsntds") ! long_name: Shortwave radiation flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: net_downward_shortwave_flux_at_sea_water_surface ! cell_methods: xh:mean yh:mean "ocean_model", "rsntds" [Used] (native name is "SW") @@ -3891,19 +3891,19 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "sw_vis" [Unused] ! long_name: Shortwave radiation direct and diffuse flux into the ocean in the visible band - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "sw_nir" [Unused] ! long_name: Shortwave radiation direct and diffuse flux into the ocean in the near-infrared band - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "LwLatSens" [Used] ! long_name: Combined longwave, latent, and sensible heating at ocean surface - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "LW" [Used] (CMOR equivalent is "rlntds") ! long_name: Longwave radiation flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: surface_net_downward_longwave_flux ! cell_methods: xh:mean yh:mean "ocean_model", "rlntds" [Used] (native name is "LW") @@ -3913,7 +3913,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "latent" [Unused] (CMOR equivalent is "hflso") ! long_name: Latent heat flux into ocean due to fusion and evaporation (negative means ocean heat loss) - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hflso" [Used] (native name is "latent") ! long_name: Surface Downward Latent Heat Flux due to Evap + Melt Snow/Ice @@ -3922,11 +3922,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "latent_evap" [Unused] ! long_name: Latent heat flux into ocean due to evaporation/condensation - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "latent_fprec_diag" [Unused] (CMOR equivalent is "hfsnthermds") ! long_name: Latent heat flux into ocean due to melting of frozen precipitation - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hfsnthermds" [Used] (native name is "latent_fprec_diag") ! long_name: Latent Heat to Melt Frozen Precipitation @@ -3935,7 +3935,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "latent_frunoff" [Unused] (CMOR equivalent is "hfibthermds") ! long_name: Latent heat flux into ocean due to melting of icebergs - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hfibthermds" [Used] (native name is "latent_frunoff") ! long_name: Latent Heat to Melt Frozen Runoff/Iceberg @@ -3944,7 +3944,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "sensible" [Unused] (CMOR equivalent is "hfsso") ! long_name: Sensible heat flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: surface_downward_sensible_heat_flux ! cell_methods: xh:mean yh:mean "ocean_model", "hfsso" [Used] (native name is "sensible") @@ -3954,112 +3954,112 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "heat_added" [Unused] ! long_name: Flux Adjustment or restoring surface heat flux into ocean - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "total_heat_content_frunoff" [Used] ! long_name: Area integrated heat content (relative to 0C) of solid runoff - ! units: Watt + ! units: W "ocean_model", "total_hfsolidrunoffds" [Unused] ! long_name: Temperature Flux due to Solid Runoff Expressed as Heat Flux into Sea Water Area Integrated ! units: W ! standard_name: temperature_flux_due_to_solid_runoff_expressed_as_heat_flux_into_sea_water_area_integrated "ocean_model", "total_heat_content_lrunoff" [Used] ! long_name: Area integrated heat content (relative to 0C) of liquid runoff - ! units: Watt + ! units: W "ocean_model", "total_hfrunoffds" [Unused] ! long_name: Temperature Flux due to Runoff Expressed as Heat Flux into Sea Water Area Integrated ! units: W ! standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water_area_integrated "ocean_model", "total_heat_content_lprec" [Used] ! long_name: Area integrated heat content (relative to 0C) of liquid precip - ! units: Watt + ! units: W "ocean_model", "total_hfrainds" [Unused] ! long_name: Temperature Flux due to Rainfall Expressed as Heat Flux into Sea Water Area Integrated ! units: W ! standard_name: temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water_area_integrated "ocean_model", "total_heat_content_fprec" [Used] ! long_name: Area integrated heat content (relative to 0C) of frozen precip - ! units: Watt + ! units: W "ocean_model", "total_heat_content_vprec" [Used] ! long_name: Area integrated heat content (relative to 0C) of virtual precip - ! units: Watt + ! units: W "ocean_model", "total_heat_content_cond" [Used] ! long_name: Area integrated heat content (relative to 0C) of condensate - ! units: Watt + ! units: W "ocean_model", "total_heat_content_surfwater" [Used] ! long_name: Area integrated heat content (relative to 0C) of water crossing surface - ! units: Watt + ! units: W "ocean_model", "total_heat_content_massout" [Used] ! long_name: Area integrated heat content (relative to 0C) of water leaving ocean - ! units: Watt + ! units: W "ocean_model", "total_hfevapds" [Unused] ! long_name: Heat Flux Out of Sea Water due to Evaporating Water Area Integrated ! units: W ! standard_name: temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water_area_integrated "ocean_model", "total_heat_content_massin" [Used] ! long_name: Area integrated heat content (relative to 0C) of water entering ocean - ! units: Watt + ! units: W "ocean_model", "total_net_heat_coupler" [Used] ! long_name: Area integrated surface heat flux from SW+LW+latent+sensible (via the coupler) - ! units: Watt + ! units: W "ocean_model", "total_net_heat_surface" [Used] ! long_name: Area integrated surface heat flux from SW+LW+lat+sens+mass+frazil+restore or flux adjustments - ! units: Watt + ! units: W "ocean_model", "total_hfds" [Unused] ! long_name: Surface Ocean Heat Flux from SW+LW+latent+sensible+mass transfer+frazil Area Integrated ! units: W ! standard_name: surface_downward_heat_flux_in_sea_water_area_integrated "ocean_model", "total_sw" [Used] ! long_name: Area integrated net downward shortwave at sea water surface - ! units: Watt + ! units: W "ocean_model", "total_rsntds" [Unused] ! long_name: Net Downward Shortwave Radiation at Sea Water Surface Area Integrated ! units: W ! standard_name: net_downward_shortwave_flux_at_sea_water_surface_area_integrated "ocean_model", "total_LwLatSens" [Used] ! long_name: Area integrated longwave+latent+sensible heating - ! units: Watt + ! units: W "ocean_model", "total_lw" [Used] ! long_name: Area integrated net downward longwave at sea water surface - ! units: Watt + ! units: W "ocean_model", "total_rlntds" [Unused] ! long_name: Surface Net Downward Longwave Radiation Area Integrated ! units: W ! standard_name: surface_net_downward_longwave_flux_area_integrated "ocean_model", "total_lat" [Used] ! long_name: Area integrated surface downward latent heat flux - ! units: Watt + ! units: W "ocean_model", "total_hflso" [Unused] ! long_name: Surface Downward Latent Heat Flux Area Integrated ! units: W ! standard_name: surface_downward_latent_heat_flux_area_integrated "ocean_model", "total_lat_evap" [Used] ! long_name: Area integrated latent heat flux due to evap/condense - ! units: Watt + ! units: W "ocean_model", "total_lat_fprec" [Used] ! long_name: Area integrated latent heat flux due to melting frozen precip - ! units: Watt + ! units: W "ocean_model", "total_hfsnthermds" [Unused] ! long_name: Latent Heat to Melt Frozen Precipitation Area Integrated ! units: W ! standard_name: heat_flux_into_sea_water_due_to_snow_thermodynamics_area_integrated "ocean_model", "total_lat_frunoff" [Used] ! long_name: Area integrated latent heat flux due to melting icebergs - ! units: Watt + ! units: W "ocean_model", "total_hfibthermds" [Unused] ! long_name: Heat Flux into Sea Water due to Iceberg Thermodynamics Area Integrated ! units: W ! standard_name: heat_flux_into_sea_water_due_to_iceberg_thermodynamics_area_integrated "ocean_model", "total_sens" [Used] ! long_name: Area integrated downward sensible heat flux - ! units: Watt + ! units: W "ocean_model", "total_hfsso" [Unused] ! long_name: Surface Downward Sensible Heat Flux Area Integrated ! units: W ! standard_name: surface_downward_sensible_heat_flux_area_integrated "ocean_model", "total_heat_adjustment" [Unused] ! long_name: Area integrated surface heat flux from restoring and/or flux adjustment - ! units: Watt + ! units: W "ocean_model", "net_heat_coupler_ga" [Used] ! long_name: Area averaged surface heat flux from SW+LW+latent+sensible (via the coupler) ! units: W m-2 @@ -4103,7 +4103,7 @@ ! standard_name: surface_downward_sensible_heat_flux_area_averaged "ocean_model", "salt_flux" [Used] (CMOR equivalent is "sfdsi") ! long_name: Net salt flux into ocean at surface (restoring + sea-ice) - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "sfdsi" [Used] (native name is "salt_flux") ! long_name: Downward Sea Ice Basal Salt Flux @@ -4112,30 +4112,30 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "salt_flux_in" [Unused] ! long_name: Salt flux into ocean at surface from coupler - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "salt_flux_added" [Unused] ! long_name: Salt flux into ocean at surface due to restoring or flux adjustment - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "salt_flux_global_restoring_adjustment" [Unused] ! long_name: Adjustment needed to balance net global salt flux into ocean at surface - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 "ocean_model", "vprec_global_adjustment" [Unused] ! long_name: Adjustment needed to adjust net vprec into ocean to zero - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 "ocean_model", "net_fresh_water_global_adjustment" [Unused] ! long_name: Adjustment needed to adjust net fresh water into ocean to zero - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 "ocean_model", "salt_flux_global_restoring_scaling" [Unused] ! long_name: Scaling applied to balance net global salt flux into ocean at surface - ! units: (nondim) + ! units: nondim "ocean_model", "vprec_global_scaling" [Unused] ! long_name: Scaling applied to adjust net vprec into ocean to zero - ! units: (nondim) + ! units: nondim "ocean_model", "net_fresh_water_global_scaling" [Unused] ! long_name: Scaling applied to adjust net fresh water into ocean to zero - ! units: (nondim) + ! units: nondim "ocean_model", "total_salt_flux" [Used] ! long_name: Area integrated surface salt flux ! units: kg diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 15460fa730..fa481917d1 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1289,6 +1289,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 600.0 ! [m2 s-1] default = 0.0 @@ -1875,7 +1879,7 @@ LT_MOD_LAC4 = 0.95 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.95 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.short b/ocean_only/global_ALE/z/MOM_parameter_doc.short index 0bf8c9ea54..38d1cea5a2 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.short +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.short @@ -571,7 +571,7 @@ MAX_RINO_IT = 25 ! [nondim] default = 50 ! The following parameters are used for auxiliary diabatic processes. ! === module MOM_energetic_PBL === -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 51a7985728..7598b4d98f 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -1,27 +1,27 @@ "ocean_model", "geolat" [Used] ! long_name: Latitude of tracer (T) points - ! units: degrees_N + ! units: degrees_north "ocean_model", "geolon" [Used] ! long_name: Longitude of tracer (T) points - ! units: degrees_E + ! units: degrees_east "ocean_model", "geolat_c" [Used] ! long_name: Latitude of corner (Bu) points - ! units: degrees_N + ! units: degrees_north "ocean_model", "geolon_c" [Used] ! long_name: Longitude of corner (Bu) points - ! units: degrees_E + ! units: degrees_east "ocean_model", "geolat_v" [Used] ! long_name: Latitude of meridional velocity (Cv) points - ! units: degrees_N + ! units: degrees_north "ocean_model", "geolon_v" [Used] ! long_name: Longitude of meridional velocity (Cv) points - ! units: degrees_E + ! units: degrees_east "ocean_model", "geolat_u" [Used] ! long_name: Latitude of zonal velocity (Cu) points - ! units: degrees_N + ! units: degrees_north "ocean_model", "geolon_u" [Used] ! long_name: Longitude of zonal velocity (Cu) points - ! units: degrees_E + ! units: degrees_east "ocean_model", "area_t" [Used] ! long_name: Surface area of tracer (T) cells ! units: m2 @@ -100,63 +100,63 @@ ! standard_name: SeaAreaFraction "ocean_model", "MEKE" [Used] ! long_name: Mesoscale Eddy Kinetic Energy - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_KH" [Used] ! long_name: MEKE derived diffusivity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_KU" [Unused] ! long_name: MEKE derived lateral viscosity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Ue" [Unused] ! long_name: MEKE derived eddy-velocity scale - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Ub" [Unused] ! long_name: MEKE derived bottom eddy-velocity scale - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Ut" [Unused] ! long_name: MEKE derived barotropic eddy-velocity scale - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_src" [Unused] ! long_name: MEKE energy source - ! units: meter2 second-3 + ! units: m2 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_decay" [Unused] ! long_name: MEKE decay rate - ! units: second-1 + ! units: s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "KHMEKE_u" [Unused] ! long_name: Zonal diffusivity of MEKE - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "KHMEKE_v" [Unused] ! long_name: Meridional diffusivity of MEKE - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "MEKE_GM_src" [Unused] ! long_name: MEKE energy available from thickness mixing - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_mom_src" [Unused] ! long_name: MEKE energy available from momentum - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Le" [Unused] ! long_name: Eddy mixing length used in the MEKE derived eddy diffusivity - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Lrhines" [Unused] ! long_name: Rhines length scale used in the MEKE derived eddy diffusivity - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_Leady" [Unused] ! long_name: Eady length scale used in the MEKE derived eddy diffusivity - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "MEKE_gamma_b" [Unused] ! long_name: Ratio of bottom-projected eddy velocity to column-mean eddy velocity @@ -168,179 +168,179 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "SN_u" [Used] ! long_name: Inverse eddy time-scale, S*N, at u-points - ! units: s^-1 + ! units: s-1 ! cell_methods: xq:point yh:mean "ocean_model", "SN_v" [Unused] ! long_name: Inverse eddy time-scale, S*N, at v-points - ! units: s^-1 + ! units: s-1 ! cell_methods: xh:mean yq:point "ocean_model", "N2_u" [Unused] ! long_name: Square of Brunt-Vaisala frequency, N^2, at u-points, as used in Visbeck et al. - ! units: s^-2 + ! units: s-2 ! cell_methods: xq:point yh:mean zi:point "ocean_model", "N2_u_xyave" [Unused] ! long_name: Square of Brunt-Vaisala frequency, N^2, at u-points, as used in Visbeck et al. - ! units: s^-2 + ! units: s-2 ! cell_methods: zi:point "ocean_model_z", "N2_u" [Unused] ! long_name: Square of Brunt-Vaisala frequency, N^2, at u-points, as used in Visbeck et al. - ! units: s^-2 + ! units: s-2 ! cell_methods: xq:point yh:mean z_i:point "ocean_model_z", "N2_u_xyave" [Unused] ! long_name: Square of Brunt-Vaisala frequency, N^2, at u-points, as used in Visbeck et al. - ! units: s^-2 + ! units: s-2 ! cell_methods: z_i:point "ocean_model", "N2_v" [Unused] ! long_name: Square of Brunt-Vaisala frequency, N^2, at v-points, as used in Visbeck et al. - ! units: s^-2 + ! units: s-2 ! cell_methods: xh:mean yq:point zi:point "ocean_model", "N2_v_xyave" [Unused] ! long_name: Square of Brunt-Vaisala frequency, N^2, at v-points, as used in Visbeck et al. - ! units: s^-2 + ! units: s-2 ! cell_methods: zi:point "ocean_model_z", "N2_v" [Unused] ! long_name: Square of Brunt-Vaisala frequency, N^2, at v-points, as used in Visbeck et al. - ! units: s^-2 + ! units: s-2 ! cell_methods: xh:mean yq:point z_i:point "ocean_model_z", "N2_v_xyave" [Unused] ! long_name: Square of Brunt-Vaisala frequency, N^2, at v-points, as used in Visbeck et al. - ! units: s^-2 + ! units: s-2 ! cell_methods: z_i:point "ocean_model", "S2_u" [Unused] ! long_name: Depth average square of slope magnitude, S^2, at u-points, as used in Visbeck et al. - ! units: s^-2 + ! units: s-2 ! cell_methods: xq:point yh:mean "ocean_model", "S2_v" [Unused] ! long_name: Depth average square of slope magnitude, S^2, at v-points, as used in Visbeck et al. - ! units: s^-2 + ! units: s-2 ! cell_methods: xh:mean yq:point "ocean_model", "Res_fn" [Unused] ! long_name: Resolution function for scaling diffusivities - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yh:mean "ocean_model", "Rd_dx" [Unused] ! long_name: Ratio between deformation radius and grid spacing - ! units: Nondim + ! units: m m-1 ! cell_methods: xh:mean yh:mean "ocean_model", "bbl_thick_u" [Unused] ! long_name: BBL thickness at u points - ! units: meter + ! units: m ! cell_methods: xq:point yh:mean "ocean_model", "kv_bbl_u" [Unused] ! long_name: BBL viscosity at u points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "bbl_thick_v" [Unused] ! long_name: BBL thickness at v points - ! units: meter + ! units: m ! cell_methods: xh:mean yq:point "ocean_model", "kv_bbl_v" [Unused] ! long_name: BBL viscosity at v points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "Rayleigh_u" [Unused] ! long_name: Rayleigh drag velocity at u points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "Rayleigh_u_xyave" [Unused] ! long_name: Rayleigh drag velocity at u points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "Rayleigh_u" [Unused] ! long_name: Rayleigh drag velocity at u points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "Rayleigh_u_xyave" [Unused] ! long_name: Rayleigh drag velocity at u points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "Rayleigh_v" [Unused] ! long_name: Rayleigh drag velocity at v points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "Rayleigh_v_xyave" [Unused] ! long_name: Rayleigh drag velocity at v points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "Rayleigh_v" [Unused] ! long_name: Rayleigh drag velocity at v points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "Rayleigh_v_xyave" [Unused] ! long_name: Rayleigh drag velocity at v points - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "RV" [Unused] ! long_name: Relative Vorticity - ! units: second-1 + ! units: s-1 ! cell_methods: xq:point yq:point zl:mean "ocean_model", "PV" [Unused] ! long_name: Potential Vorticity - ! units: meter-1 second-1 + ! units: m-1 s-1 ! cell_methods: xq:point yq:point zl:mean "ocean_model", "gKEu" [Unused] ! long_name: Zonal Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "gKEu_xyave" [Unused] ! long_name: Zonal Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: zl:mean "ocean_model_z", "gKEu" [Unused] ! long_name: Zonal Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "gKEu_xyave" [Unused] ! long_name: Zonal Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: z_l:mean "ocean_model", "gKEv" [Unused] ! long_name: Meridional Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "gKEv_xyave" [Unused] ! long_name: Meridional Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: zl:mean "ocean_model_z", "gKEv" [Unused] ! long_name: Meridional Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "gKEv_xyave" [Unused] ! long_name: Meridional Acceleration from Grad. Kinetic Energy - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: z_l:mean "ocean_model", "rvxu" [Unused] ! long_name: Meridional Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "rvxu_xyave" [Unused] ! long_name: Meridional Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: zl:mean "ocean_model_z", "rvxu" [Unused] ! long_name: Meridional Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "rvxu_xyave" [Unused] ! long_name: Meridional Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: z_l:mean "ocean_model", "rvxv" [Unused] ! long_name: Zonal Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "rvxv_xyave" [Unused] ! long_name: Zonal Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: zl:mean "ocean_model_z", "rvxv" [Unused] ! long_name: Zonal Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "rvxv_xyave" [Unused] ! long_name: Zonal Acceleration from Relative Vorticity - ! units: meter-1 second-2 + ! units: m-1 s-2 ! cell_methods: z_l:mean "ocean_model", "e_tidal" [Unused] ! long_name: Tidal Forcing Astronomical and SAL Height Anomaly @@ -348,43 +348,43 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "diffu" [Unused] ! long_name: Zonal Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "diffu_xyave" [Unused] ! long_name: Zonal Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "diffu" [Unused] ! long_name: Zonal Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "diffu_xyave" [Unused] ! long_name: Zonal Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "diffv" [Unused] ! long_name: Meridional Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "diffv_xyave" [Unused] ! long_name: Meridional Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "diffv" [Unused] ! long_name: Meridional Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "diffv_xyave" [Unused] ! long_name: Meridional Acceleration from Horizontal Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "Ahh" [Unused] (CMOR equivalent is "difmxybo") ! long_name: Biharmonic Horizontal Viscosity at h Points - ! units: meter4 second-1 + ! units: m4 s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Ahh_xyave" [Unused] (CMOR equivalent is "difmxybo_xyave") ! long_name: Biharmonic Horizontal Viscosity at h Points - ! units: meter4 second-1 + ! units: m4 s-1 ! cell_methods: zl:mean "ocean_model", "difmxybo" [Used] (native name is "Ahh") ! long_name: Ocean lateral biharmonic viscosity @@ -398,11 +398,11 @@ ! cell_methods: zl:mean "ocean_model_z", "Ahh" [Unused] (CMOR equivalent is "difmxybo") ! long_name: Biharmonic Horizontal Viscosity at h Points - ! units: meter4 second-1 + ! units: m4 s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Ahh_xyave" [Unused] (CMOR equivalent is "difmxybo_xyave") ! long_name: Biharmonic Horizontal Viscosity at h Points - ! units: meter4 second-1 + ! units: m4 s-1 ! cell_methods: z_l:mean "ocean_model_z", "difmxybo" [Unused] (native name is "Ahh") ! long_name: Ocean lateral biharmonic viscosity @@ -416,15 +416,15 @@ ! cell_methods: z_l:mean "ocean_model", "Ahq" [Unused] ! long_name: Biharmonic Horizontal Viscosity at q Points - ! units: meter4 second-1 + ! units: m4 s-1 ! cell_methods: xq:point yq:point zl:mean "ocean_model", "Khh" [Unused] (CMOR equivalent is "difmxylo") ! long_name: Laplacian Horizontal Viscosity at h Points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Khh_xyave" [Unused] (CMOR equivalent is "difmxylo_xyave") ! long_name: Laplacian Horizontal Viscosity at h Points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zl:mean "ocean_model", "difmxylo" [Used] (native name is "Khh") ! long_name: Ocean lateral Laplacian viscosity @@ -438,11 +438,11 @@ ! cell_methods: zl:mean "ocean_model_z", "Khh" [Unused] (CMOR equivalent is "difmxylo") ! long_name: Laplacian Horizontal Viscosity at h Points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Khh_xyave" [Unused] (CMOR equivalent is "difmxylo_xyave") ! long_name: Laplacian Horizontal Viscosity at h Points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_l:mean "ocean_model_z", "difmxylo" [Unused] (native name is "Khh") ! long_name: Ocean lateral Laplacian viscosity @@ -456,27 +456,27 @@ ! cell_methods: z_l:mean "ocean_model", "Khq" [Unused] ! long_name: Laplacian Horizontal Viscosity at q Points - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xq:point yq:point zl:mean "ocean_model", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "FrictWork_xyave" [Unused] ! long_name: Integral work done by lateral friction terms - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "FrictWork_xyave" [Unused] ! long_name: Integral work done by lateral friction terms - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "FrictWorkIntz" [Unused] (CMOR equivalent is "dispkexyfo") ! long_name: Depth integrated work done by lateral friction - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "dispkexyfo" [Used] (native name is "FrictWorkIntz") ! long_name: Depth integrated ocean kinetic energy dissipation due to lateral friction @@ -485,107 +485,107 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "au_visc" [Unused] ! long_name: Zonal Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zi:point "ocean_model", "au_visc_xyave" [Unused] ! long_name: Zonal Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zi:point "ocean_model_z", "au_visc" [Unused] ! long_name: Zonal Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_i:point "ocean_model_z", "au_visc_xyave" [Unused] ! long_name: Zonal Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_i:point "ocean_model", "av_visc" [Unused] ! long_name: Meridional Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zi:point "ocean_model", "av_visc_xyave" [Unused] ! long_name: Meridional Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zi:point "ocean_model_z", "av_visc" [Unused] ! long_name: Meridional Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_i:point "ocean_model_z", "av_visc_xyave" [Unused] ! long_name: Meridional Viscous Vertical Coupling Coefficient - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_i:point "ocean_model", "Hu_visc" [Unused] ! long_name: Thickness at Zonal Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "Hu_visc_xyave" [Unused] ! long_name: Thickness at Zonal Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: zl:mean "ocean_model_z", "Hu_visc" [Unused] ! long_name: Thickness at Zonal Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "Hu_visc_xyave" [Unused] ! long_name: Thickness at Zonal Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: z_l:mean "ocean_model", "Hv_visc" [Unused] ! long_name: Thickness at Meridional Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "Hv_visc_xyave" [Unused] ! long_name: Thickness at Meridional Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: zl:mean "ocean_model_z", "Hv_visc" [Unused] ! long_name: Thickness at Meridional Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "Hv_visc_xyave" [Unused] ! long_name: Thickness at Meridional Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: z_l:mean "ocean_model", "HMLu_visc" [Unused] ! long_name: Mixed Layer Thickness at Zonal Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xq:point yh:mean "ocean_model", "HMLv_visc" [Unused] ! long_name: Mixed Layer Thickness at Meridional Velocity Points for Viscosity - ! units: meters or kg m-2 + ! units: m ! cell_methods: xh:mean yq:point "ocean_model", "du_dt_visc" [Unused] ! long_name: Zonal Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "du_dt_visc_xyave" [Unused] ! long_name: Zonal Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "du_dt_visc" [Unused] ! long_name: Zonal Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "du_dt_visc_xyave" [Unused] ! long_name: Zonal Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "dv_dt_visc" [Unused] ! long_name: Meridional Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "dv_dt_visc_xyave" [Unused] ! long_name: Meridional Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "dv_dt_visc" [Unused] ! long_name: Meridional Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "dv_dt_visc_xyave" [Unused] ! long_name: Meridional Acceleration from Vertical Viscosity - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "taux_bot" [Unused] ! long_name: Zonal Bottom Stress from Ocean to Earth @@ -597,103 +597,103 @@ ! cell_methods: xh:mean yq:point "ocean_model", "PFuBT" [Unused] ! long_name: Zonal Anomalous Barotropic Pressure Force Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean "ocean_model", "PFvBT" [Unused] ! long_name: Meridional Anomalous Barotropic Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point "ocean_model", "CoruBT" [Unused] ! long_name: Zonal Barotropic Coriolis Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean "ocean_model", "CorvBT" [Unused] ! long_name: Meridional Barotropic Coriolis Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point "ocean_model", "u_accel_bt" [Unused] ! long_name: Barotropic zonal acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean "ocean_model", "v_accel_bt" [Unused] ! long_name: Barotropic meridional acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point "ocean_model", "ubtforce" [Unused] ! long_name: Barotropic zonal acceleration from baroclinic terms - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean "ocean_model", "vbtforce" [Unused] ! long_name: Barotropic meridional acceleration from baroclinic terms - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point "ocean_model", "eta_bt" [Unused] ! long_name: Barotropic end SSH - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ubt" [Unused] ! long_name: Barotropic end zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vbt" [Unused] ! long_name: Barotropic end meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "eta_st" [Unused] ! long_name: Barotropic start SSH - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ubt_st" [Unused] ! long_name: Barotropic start zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vbt_st" [Unused] ! long_name: Barotropic start meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "ubtav" [Unused] ! long_name: Barotropic time-average zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vbtav" [Unused] ! long_name: Barotropic time-average meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "eta_cor" [Unused] ! long_name: Corrective mass flux - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "visc_rem_u" [Unused] ! long_name: Viscous remnant at u - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "visc_rem_u_xyave" [Unused] ! long_name: Viscous remnant at u - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "visc_rem_u" [Unused] ! long_name: Viscous remnant at u - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "visc_rem_u_xyave" [Unused] ! long_name: Viscous remnant at u - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "visc_rem_v" [Unused] ! long_name: Viscous remnant at v - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "visc_rem_v_xyave" [Unused] ! long_name: Viscous remnant at v - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "visc_rem_v" [Unused] ! long_name: Viscous remnant at v - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "visc_rem_v_xyave" [Unused] ! long_name: Viscous remnant at v - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "gtot_n" [Unused] ! long_name: gtot to North @@ -713,315 +713,315 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "eta_hifreq" [Unused] ! long_name: High Frequency Barotropic SSH - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ubt_hifreq" [Unused] ! long_name: High Frequency Barotropic zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vbt_hifreq" [Unused] ! long_name: High Frequency Barotropic meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "eta_pred_hifreq" [Unused] ! long_name: High Frequency Predictor Barotropic SSH - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "uhbt_hifreq" [Unused] ! long_name: High Frequency Barotropic zonal transport - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vhbt_hifreq" [Unused] ! long_name: High Frequency Barotropic meridional transport - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "frhatu" [Unused] ! long_name: Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "frhatu_xyave" [Unused] ! long_name: Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "frhatu" [Unused] ! long_name: Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "frhatu_xyave" [Unused] ! long_name: Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "frhatv" [Unused] ! long_name: Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "frhatv_xyave" [Unused] ! long_name: Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "frhatv" [Unused] ! long_name: Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "frhatv_xyave" [Unused] ! long_name: Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "frhatu1" [Unused] ! long_name: Predictor Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "frhatu1_xyave" [Unused] ! long_name: Predictor Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "frhatu1" [Unused] ! long_name: Predictor Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "frhatu1_xyave" [Unused] ! long_name: Predictor Fractional thickness of layers in u-columns - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "frhatv1" [Unused] ! long_name: Predictor Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "frhatv1_xyave" [Unused] ! long_name: Predictor Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: zl:mean "ocean_model_z", "frhatv1" [Unused] ! long_name: Predictor Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "frhatv1_xyave" [Unused] ! long_name: Predictor Fractional thickness of layers in v-columns - ! units: Nondim + ! units: nondim ! cell_methods: z_l:mean "ocean_model", "uhbt" [Unused] ! long_name: Barotropic zonal transport averaged over a baroclinic step - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vhbt" [Unused] ! long_name: Barotropic meridional transport averaged over a baroclinic step - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_FA_u_EE" [Unused] ! long_name: BTCont type far east face area - ! units: meter2 + ! units: m2 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_FA_u_E0" [Unused] ! long_name: BTCont type near east face area - ! units: meter2 + ! units: m2 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_FA_u_WW" [Unused] ! long_name: BTCont type far west face area - ! units: meter2 + ! units: m2 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_FA_u_W0" [Unused] ! long_name: BTCont type near west face area - ! units: meter2 + ! units: m2 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_ubt_EE" [Unused] ! long_name: BTCont type far east velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_ubt_WW" [Unused] ! long_name: BTCont type far west velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "BTC_FA_v_NN" [Unused] ! long_name: BTCont type far north face area - ! units: meter2 + ! units: m2 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_FA_v_N0" [Unused] ! long_name: BTCont type near north face area - ! units: meter2 + ! units: m2 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_FA_v_SS" [Unused] ! long_name: BTCont type far south face area - ! units: meter2 + ! units: m2 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_FA_v_S0" [Unused] ! long_name: BTCont type near south face area - ! units: meter2 + ! units: m2 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_vbt_NN" [Unused] ! long_name: BTCont type far north velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "BTC_vbt_SS" [Unused] ! long_name: BTCont type far south velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "uhbt0" [Unused] ! long_name: Barotropic zonal transport difference - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vhbt0" [Unused] ! long_name: Barotropic meridional transport difference - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "uh" [Used] ! long_name: Zonal Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:sum zl:sum "ocean_model", "uh_xyave" [Unused] ! long_name: Zonal Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:sum "ocean_model_z", "uh" [Unused] ! long_name: Zonal Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:sum z_l:sum "ocean_model_z", "uh_xyave" [Unused] ! long_name: Zonal Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:sum "ocean_model", "vh" [Used] ! long_name: Meridional Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:sum yq:point zl:sum "ocean_model", "vh_xyave" [Unused] ! long_name: Meridional Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:sum "ocean_model_z", "vh" [Unused] ! long_name: Meridional Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:sum yq:point z_l:sum "ocean_model_z", "vh_xyave" [Unused] ! long_name: Meridional Thickness Flux - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:sum "ocean_model", "CAu" [Unused] ! long_name: Zonal Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "CAu_xyave" [Unused] ! long_name: Zonal Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "CAu" [Unused] ! long_name: Zonal Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "CAu_xyave" [Unused] ! long_name: Zonal Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "CAv" [Unused] ! long_name: Meridional Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "CAv_xyave" [Unused] ! long_name: Meridional Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "CAv" [Unused] ! long_name: Meridional Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "CAv_xyave" [Unused] ! long_name: Meridional Coriolis and Advective Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "PFu" [Unused] ! long_name: Zonal Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "PFu_xyave" [Unused] ! long_name: Zonal Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "PFu" [Unused] ! long_name: Zonal Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "PFu_xyave" [Unused] ! long_name: Zonal Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "PFv" [Unused] ! long_name: Meridional Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "PFv_xyave" [Unused] ! long_name: Meridional Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "PFv" [Unused] ! long_name: Meridional Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "PFv_xyave" [Unused] ! long_name: Meridional Pressure Force Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "uav" [Unused] ! long_name: Barotropic-step Averaged Zonal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "uav_xyave" [Unused] ! long_name: Barotropic-step Averaged Zonal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "uav" [Unused] ! long_name: Barotropic-step Averaged Zonal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "uav_xyave" [Unused] ! long_name: Barotropic-step Averaged Zonal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "vav" [Unused] ! long_name: Barotropic-step Averaged Meridional Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "vav_xyave" [Unused] ! long_name: Barotropic-step Averaged Meridional Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "vav" [Unused] ! long_name: Barotropic-step Averaged Meridional Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "vav_xyave" [Unused] ! long_name: Barotropic-step Averaged Meridional Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "u_BT_accel" [Unused] ! long_name: Barotropic Anomaly Zonal Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "u_BT_accel_xyave" [Unused] ! long_name: Barotropic Anomaly Zonal Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "u_BT_accel" [Unused] ! long_name: Barotropic Anomaly Zonal Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "u_BT_accel_xyave" [Unused] ! long_name: Barotropic Anomaly Zonal Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "v_BT_accel" [Unused] ! long_name: Barotropic Anomaly Meridional Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "v_BT_accel_xyave" [Unused] ! long_name: Barotropic Anomaly Meridional Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "v_BT_accel" [Unused] ! long_name: Barotropic Anomaly Meridional Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "v_BT_accel_xyave" [Unused] ! long_name: Barotropic Anomaly Meridional Acceleration - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "uhGM" [Unused] ! long_name: Time Mean Diffusive Zonal Thickness Flux @@ -1057,7 +1057,7 @@ ! cell_methods: z_l:sum "ocean_model", "GMwork" [Used] (CMOR equivalent is "tnkebto") ! long_name: Integrated Tendency of Ocean Mesoscale Eddy KE from Parameterized Eddy Advection - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "tnkebto" [Unused] (native name is "GMwork") ! long_name: Integrated Tendency of Ocean Mesoscale Eddy KE from Parameterized Eddy Advection @@ -1066,43 +1066,43 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "KHTH_u" [Used] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zi:point "ocean_model", "KHTH_u_xyave" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zi:point "ocean_model_z", "KHTH_u" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_i:point "ocean_model_z", "KHTH_u_xyave" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_i:point "ocean_model", "KHTH_v" [Used] ! long_name: Parameterized mesoscale eddy advection diffusivity at V-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zi:point "ocean_model", "KHTH_v_xyave" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at V-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zi:point "ocean_model_z", "KHTH_v" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at V-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_i:point "ocean_model_z", "KHTH_v_xyave" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at V-point - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_i:point "ocean_model", "KHTH_t" [Unused] (CMOR equivalent is "diftrblo") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KHTH_t_xyave" [Unused] (CMOR equivalent is "diftrblo_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model", "diftrblo" [Used] (native name is "KHTH_t") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection @@ -1116,11 +1116,11 @@ ! cell_methods: zl:mean "ocean_model_z", "KHTH_t" [Unused] (CMOR equivalent is "diftrblo") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KHTH_t_xyave" [Unused] (CMOR equivalent is "diftrblo_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model_z", "diftrblo" [Unused] (native name is "KHTH_t") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection @@ -1134,15 +1134,15 @@ ! cell_methods: z_l:mean "ocean_model", "KHTH_u1" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-points (2-D) - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean "ocean_model", "KHTH_v1" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at V-points (2-D) - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point "ocean_model", "KHTH_t1" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at T-points (2-D) - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yh:mean "ocean_model", "neutral_slope_x" [Unused] ! long_name: Zonal slope of neutral surface @@ -1178,67 +1178,67 @@ ! cell_methods: z_i:point "ocean_model", "GM_sfn_x" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean zi:point "ocean_model", "GM_sfn_x_xyave" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zi:point "ocean_model_z", "GM_sfn_x" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean z_i:point "ocean_model_z", "GM_sfn_x_xyave" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_i:point "ocean_model", "GM_sfn_y" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point zi:point "ocean_model", "GM_sfn_y_xyave" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zi:point "ocean_model_z", "GM_sfn_y" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point z_i:point "ocean_model_z", "GM_sfn_y_xyave" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_i:point "ocean_model", "GM_sfn_unlim_x" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean zi:point "ocean_model", "GM_sfn_unlim_x_xyave" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zi:point "ocean_model_z", "GM_sfn_unlim_x" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean z_i:point "ocean_model_z", "GM_sfn_unlim_x_xyave" [Unused] ! long_name: Parameterized Zonal Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_i:point "ocean_model", "GM_sfn_unlim_y" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point zi:point "ocean_model", "GM_sfn_unlim_y_xyave" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zi:point "ocean_model_z", "GM_sfn_unlim_y" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point z_i:point "ocean_model_z", "GM_sfn_unlim_y_xyave" [Unused] ! long_name: Parameterized Meridional Overturning Streamfunction before limiting/smoothing - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_i:point "ocean_model", "uhml" [Unused] ! long_name: Zonal Thickness Flux to Restratify Mixed Layer @@ -1274,43 +1274,43 @@ ! cell_methods: z_l:sum "ocean_model", "MLu_restrat_time" [Unused] ! long_name: Mixed Layer Zonal Restratification Timescale - ! units: second + ! units: s ! cell_methods: xq:point yh:mean "ocean_model", "MLv_restrat_time" [Unused] ! long_name: Mixed Layer Meridional Restratification Timescale - ! units: second + ! units: s ! cell_methods: xh:mean yq:point "ocean_model", "MLD_restrat" [Unused] ! long_name: Mixed Layer Depth as used in the mixed-layer restratification parameterization - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ML_buoy_restrat" [Unused] ! long_name: Mixed Layer Buoyancy as used in the mixed-layer restratification parameterization - ! units: m/s^2 + ! units: m s2 ! cell_methods: xh:mean yh:mean "ocean_model", "udml_restrat" [Unused] ! long_name: Transport stream function amplitude for zonal restratification of mixed layer - ! units: m3/s + ! units: m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vdml_restrat" [Unused] ! long_name: Transport stream function amplitude for meridional restratification of mixed layer - ! units: m3/s + ! units: m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "uml_restrat" [Unused] ! long_name: Surface zonal velocity component of mixed layer restratification - ! units: m/s + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "vml_restrat" [Unused] ! long_name: Surface meridional velocity component of mixed layer restratification - ! units: m/s + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "temp_layer_ave" [Used] ! long_name: Layer Average Ocean Temperature - ! units: Celsius + ! units: degC ! cell_methods: zl:mean "ocean_model", "salt_layer_ave" [Used] ! long_name: Layer Average Ocean Salinity - ! units: ppt + ! units: psu ! cell_methods: zl:mean "ocean_model", "masscello" [Used] ! long_name: Mass per unit area of liquid ocean grid cell @@ -1358,11 +1358,11 @@ ! cell_methods: z_l:sum "ocean_model", "thetaoga" [Used] ! long_name: Global Mean Ocean Potential Temperature - ! units: Celsius + ! units: degC ! standard_name: sea_water_potential_temperature "ocean_model", "soga" [Used] ! long_name: Global Mean Ocean Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity "ocean_model", "sst_global" [Unused] ! long_name: Global Area Average Sea Surface Temperature @@ -1374,387 +1374,387 @@ ! standard_name: sea_surface_temperature "ocean_model", "sss_global" [Unused] ! long_name: Global Area Average Sea Surface Salinity - ! units: ppt + ! units: psu ! standard_name: sea_surface_salinity "ocean_model", "sosga" [Used] ! long_name: Sea Surface Salinity - ! units: ppt + ! units: psu ! standard_name: sea_surface_salinity "ocean_model", "e" [Used] ! long_name: Interface Height Relative to Mean Sea Level - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "e_xyave" [Unused] ! long_name: Interface Height Relative to Mean Sea Level - ! units: meter + ! units: m ! cell_methods: zi:point "ocean_model_z", "e" [Unused] ! long_name: Interface Height Relative to Mean Sea Level - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "e_xyave" [Unused] ! long_name: Interface Height Relative to Mean Sea Level - ! units: meter + ! units: m ! cell_methods: z_i:point "ocean_model", "e_D" [Unused] ! long_name: Interface Height above the Seafloor - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "e_D_xyave" [Unused] ! long_name: Interface Height above the Seafloor - ! units: meter + ! units: m ! cell_methods: zi:point "ocean_model_z", "e_D" [Unused] ! long_name: Interface Height above the Seafloor - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "e_D_xyave" [Unused] ! long_name: Interface Height above the Seafloor - ! units: meter + ! units: m ! cell_methods: z_i:point "ocean_model", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Rml_xyave" [Unused] ! long_name: Mixed Layer Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: zl:mean "ocean_model_z", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Rml_xyave" [Unused] ! long_name: Mixed Layer Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: z_l:mean "ocean_model", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Rho_cv_xyave" [Unused] ! long_name: Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: zl:mean "ocean_model_z", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Rho_cv_xyave" [Unused] ! long_name: Coordinate Potential Density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: z_l:mean "ocean_model", "rhopot0" [Unused] ! long_name: Potential density referenced to surface - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "rhopot0_xyave" [Unused] ! long_name: Potential density referenced to surface - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: zl:mean "ocean_model_z", "rhopot0" [Unused] ! long_name: Potential density referenced to surface - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "rhopot0_xyave" [Unused] ! long_name: Potential density referenced to surface - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: z_l:mean "ocean_model", "rhopot2" [Unused] ! long_name: Potential density referenced to 2000 dbar - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "rhopot2_xyave" [Unused] ! long_name: Potential density referenced to 2000 dbar - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: zl:mean "ocean_model_z", "rhopot2" [Unused] ! long_name: Potential density referenced to 2000 dbar - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "rhopot2_xyave" [Unused] ! long_name: Potential density referenced to 2000 dbar - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: z_l:mean "ocean_model", "rhoinsitu" [Unused] ! long_name: In situ density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "rhoinsitu_xyave" [Unused] ! long_name: In situ density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: zl:mean "ocean_model_z", "rhoinsitu" [Unused] ! long_name: In situ density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "rhoinsitu_xyave" [Unused] ! long_name: In situ density - ! units: kg meter-3 + ! units: kg m-3 ! cell_methods: z_l:mean "ocean_model", "dudt" [Unused] ! long_name: Zonal Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "dudt_xyave" [Unused] ! long_name: Zonal Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "dudt" [Unused] ! long_name: Zonal Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "dudt_xyave" [Unused] ! long_name: Zonal Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "dvdt" [Unused] ! long_name: Meridional Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "dvdt_xyave" [Unused] ! long_name: Meridional Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "dvdt" [Unused] ! long_name: Meridional Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "dvdt_xyave" [Unused] ! long_name: Meridional Acceleration - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "dhdt" [Unused] ! long_name: Thickness tendency - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "dhdt_xyave" [Unused] ! long_name: Thickness tendency - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "dhdt" [Unused] ! long_name: Thickness tendency - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "dhdt_xyave" [Unused] ! long_name: Thickness tendency - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "h_rho" [Used] ! long_name: Layer thicknesses in pure potential density coordinates - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "h_rho_xyave" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates - ! units: meter + ! units: m ! cell_methods: zl:mean "ocean_model_z", "h_rho" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "h_rho_xyave" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates - ! units: meter + ! units: m ! cell_methods: z_l:mean "ocean_model", "uh_rho" [Used] ! long_name: Zonal volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "uh_rho_xyave" [Unused] ! long_name: Zonal volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "uh_rho" [Unused] ! long_name: Zonal volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "uh_rho_xyave" [Unused] ! long_name: Zonal volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:mean "ocean_model", "vh_rho" [Used] ! long_name: Meridional volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "vh_rho_xyave" [Unused] ! long_name: Meridional volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "vh_rho" [Unused] ! long_name: Meridional volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "vh_rho_xyave" [Unused] ! long_name: Meridional volume transport in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:mean "ocean_model", "uhGM_rho" [Used] ! long_name: Zonal volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "uhGM_rho_xyave" [Unused] ! long_name: Zonal volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "uhGM_rho" [Unused] ! long_name: Zonal volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "uhGM_rho_xyave" [Unused] ! long_name: Zonal volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:mean "ocean_model", "vhGM_rho" [Used] ! long_name: Meridional volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "vhGM_rho_xyave" [Unused] ! long_name: Meridional volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "vhGM_rho" [Unused] ! long_name: Meridional volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "vhGM_rho_xyave" [Unused] ! long_name: Meridional volume transport due to interface height diffusion in pure potential density coordinates - ! units: meter3 second-1 + ! units: m3 s-1 ! cell_methods: z_l:mean "ocean_model", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_xyave" [Unused] ! long_name: Layer kinetic energy per unit mass - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: zl:mean "ocean_model_z", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_xyave" [Unused] ! long_name: Layer kinetic energy per unit mass - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: z_l:mean "ocean_model", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "dKE_dt_xyave" [Unused] ! long_name: Kinetic Energy Tendency of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "dKE_dt_xyave" [Unused] ! long_name: Kinetic Energy Tendency of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "PE_to_KE_xyave" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "PE_to_KE_xyave" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_Coradv_xyave" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_Coradv_xyave" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_adv_xyave" [Unused] ! long_name: Kinetic Energy Source from Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_adv_xyave" [Unused] ! long_name: Kinetic Energy Source from Advection - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_visc_xyave" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_visc_xyave" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_horvisc_xyave" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_horvisc_xyave" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "KE_dia_xyave" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "KE_dia_xyave" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "cg1" [Unused] ! long_name: First baroclinic gravity wave speed - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "Rd1" [Unused] ! long_name: First baroclinic deformation radius - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "CFL_cg1" [Unused] ! long_name: CFL of first baroclinic gravity wave = dt*cg1*(1/dx+1/dy) @@ -1770,11 +1770,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "cg_ebt" [Unused] ! long_name: Equivalent barotropic gravity wave speed - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "Rd_ebt" [Unused] ! long_name: Equivalent barotropic deformation radius - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "p_ebt" [Unused] ! long_name: Equivalent barotropic modal strcuture @@ -1807,11 +1807,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "salt_int" [Unused] (CMOR equivalent is "somint") ! long_name: Density weighted column integrated salinity - ! units: ppt kg m-2 + ! units: psu kg m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "somint" [Used] (native name is "salt_int") ! long_name: integral_wrt_depth_of_product_of_sea_water_density_and_salinity - ! units: ppt kg m-2 + ! units: psu kg m-2 ! standard_name: Depth integrated density times salinity ! cell_methods: xh:mean yh:mean "ocean_model", "col_mass" [Unused] @@ -1829,171 +1829,171 @@ ! cell_methods: xh:mean yh:mean "ocean_model_zold", "u" [Unused] (CMOR equivalent is "uo") ! long_name: Zonal Velocity in Depth Space - ! units: meter second-1 + ! units: m s-1 "ocean_model_zold", "uo" [Unused] (native name is "u") ! long_name: Sea Water X Velocity ! units: m s-1 ! standard_name: sea_water_x_velocity "ocean_model_zold", "v" [Unused] (CMOR equivalent is "vo") ! long_name: Meridional Velocity in Depth Space - ! units: meter second-1 + ! units: m s-1 "ocean_model_zold", "vo" [Unused] (native name is "v") ! long_name: Sea Water Y Velocity ! units: m s-1 ! standard_name: sea_water_y_velocity "ocean_model_zold", "uh" [Unused] ! long_name: Zonal Mass Transport (including SGS param) in Depth Space - ! units: meter3 second-1 + ! units: m3 s-1 "ocean_model_zold", "vh" [Unused] ! long_name: Meridional Mass Transport (including SGS param) in Depth Space - ! units: meter3 second-1 + ! units: m3 s-1 "ocean_model", "ea" [Unused] ! long_name: Layer entrainment from above per timestep - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "ea_xyave" [Unused] ! long_name: Layer entrainment from above per timestep - ! units: meter + ! units: m ! cell_methods: zl:mean "ocean_model_z", "ea" [Unused] ! long_name: Layer entrainment from above per timestep - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "ea_xyave" [Unused] ! long_name: Layer entrainment from above per timestep - ! units: meter + ! units: m ! cell_methods: z_l:mean "ocean_model", "eb" [Unused] ! long_name: Layer entrainment from below per timestep - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "eb_xyave" [Unused] ! long_name: Layer entrainment from below per timestep - ! units: meter + ! units: m ! cell_methods: zl:mean "ocean_model_z", "eb" [Unused] ! long_name: Layer entrainment from below per timestep - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "eb_xyave" [Unused] ! long_name: Layer entrainment from below per timestep - ! units: meter + ! units: m ! cell_methods: z_l:mean "ocean_model", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "dudt_dia_xyave" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "dudt_dia" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "dudt_dia_xyave" [Unused] ! long_name: Zonal Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "dvdt_dia" [Unused] ! long_name: Meridional Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "dvdt_dia_xyave" [Unused] ! long_name: Meridional Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: zl:mean "ocean_model_z", "dvdt_dia" [Unused] ! long_name: Meridional Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "dvdt_dia_xyave" [Unused] ! long_name: Meridional Acceleration from Diapycnal Mixing - ! units: meter second-2 + ! units: m s-2 ! cell_methods: z_l:mean "ocean_model", "wd" [Used] ! long_name: Diapycnal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "wd_xyave" [Unused] ! long_name: Diapycnal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zi:point "ocean_model_z", "wd" [Unused] ! long_name: Diapycnal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "wd_xyave" [Unused] ! long_name: Diapycnal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_i:point "ocean_model", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Tflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: zi:point "ocean_model_z", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Tflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: z_i:point "ocean_model", "Tflx_dia_adv" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Tflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: zi:point "ocean_model_z", "Tflx_dia_adv" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Tflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces - ! units: degC meter second-1 + ! units: degC m s-1 ! cell_methods: z_i:point "ocean_model", "Sflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Sflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: zi:point "ocean_model_z", "Sflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Sflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: z_i:point "ocean_model", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Sflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: zi:point "ocean_model_z", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Sflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces - ! units: PSU meter second-1 + ! units: psu m s-1 ! cell_methods: z_i:point "ocean_model", "MLD_003" [Used] (CMOR equivalent is "mlotst") ! long_name: Mixed layer depth (delta rho = 0.03) - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "mlotst" [Used] (native name is "MLD_003") ! long_name: Ocean Mixed Layer Thickness Defined by Sigma T @@ -2007,7 +2007,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "MLD_0125" [Unused] ! long_name: Mixed layer depth (delta rho = 0.125) - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "subML_N2" [Used] ! long_name: Squared buoyancy frequency below mixed layer @@ -2015,62 +2015,62 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "MLD_user" [Unused] ! long_name: Mixed layer depth (used defined) - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model_zold", "Kd_interface" [Unused] ! long_name: Diapycnal diffusivity at interfaces, interpolated to z - ! units: meter2 second-1 + ! units: m2 s-1 "ocean_model_zold", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces, interpolated to z - ! units: degC meter second-1 + ! units: degC m s-1 "ocean_model_zold", "Tflx_dia_adv" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces, interpolated to z - ! units: degC meter second-1 + ! units: degC m s-1 "ocean_model_zold", "Sflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal salinity flux across interfaces, interpolated to z - ! units: PSU meter second-1 + ! units: psu m s-1 "ocean_model_zold", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salinity flux across interfaces, interpolated to z - ! units: PSU meter second-1 + ! units: psu m s-1 "ocean_model", "Kd_interface" [Used] ! long_name: Total diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_interface_xyave" [Unused] ! long_name: Total diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_interface" [Unused] ! long_name: Total diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_interface_xyave" [Unused] ! long_name: Total diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "Kd_ePBL" [Unused] ! long_name: ePBL diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_ePBL_xyave" [Unused] ! long_name: ePBL diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_ePBL" [Unused] ! long_name: ePBL diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_ePBL_xyave" [Unused] ! long_name: ePBL diapycnal diffusivity at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "Kd_heat" [Unused] (CMOR equivalent is "difvho") ! long_name: Total diapycnal diffusivity for heat at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_heat_xyave" [Unused] (CMOR equivalent is "difvho_xyave") ! long_name: Total diapycnal diffusivity for heat at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model", "difvho" [Used] (native name is "Kd_heat") ! long_name: Ocean vertical heat diffusivity @@ -2084,11 +2084,11 @@ ! cell_methods: zi:point "ocean_model_z", "Kd_heat" [Unused] (CMOR equivalent is "difvho") ! long_name: Total diapycnal diffusivity for heat at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_heat_xyave" [Unused] (CMOR equivalent is "difvho_xyave") ! long_name: Total diapycnal diffusivity for heat at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model_z", "difvho" [Unused] (native name is "Kd_heat") ! long_name: Ocean vertical heat diffusivity @@ -2102,11 +2102,11 @@ ! cell_methods: z_i:point "ocean_model", "Kd_salt" [Unused] (CMOR equivalent is "difvso") ! long_name: Total diapycnal diffusivity for salt at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_salt_xyave" [Unused] (CMOR equivalent is "difvso_xyave") ! long_name: Total diapycnal diffusivity for salt at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model", "difvso" [Used] (native name is "Kd_salt") ! long_name: Ocean vertical salt diffusivity @@ -2120,11 +2120,11 @@ ! cell_methods: zi:point "ocean_model_z", "Kd_salt" [Unused] (CMOR equivalent is "difvso") ! long_name: Total diapycnal diffusivity for salt at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_salt_xyave" [Unused] (CMOR equivalent is "difvso_xyave") ! long_name: Total diapycnal diffusivity for salt at interfaces - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model_z", "difvso" [Unused] (native name is "Kd_salt") ! long_name: Ocean vertical salt diffusivity @@ -2138,43 +2138,43 @@ ! cell_methods: z_i:point "ocean_model", "diabatic_diff_temp_tendency" [Unused] ! long_name: Diabatic diffusion temperature tendency - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "diabatic_diff_temp_tendency_xyave" [Unused] ! long_name: Diabatic diffusion temperature tendency - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: zl:mean "ocean_model_z", "diabatic_diff_temp_tendency" [Unused] ! long_name: Diabatic diffusion temperature tendency - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "diabatic_diff_temp_tendency_xyave" [Unused] ! long_name: Diabatic diffusion temperature tendency - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: z_l:mean "ocean_model", "diabatic_diff_saln_tendency" [Unused] ! long_name: Diabatic diffusion salinity tendency - ! units: PPT per second + ! units: psu s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "diabatic_diff_saln_tendency_xyave" [Unused] ! long_name: Diabatic diffusion salinity tendency - ! units: PPT per second + ! units: psu s-1 ! cell_methods: zl:mean "ocean_model_z", "diabatic_diff_saln_tendency" [Unused] ! long_name: Diabatic diffusion salinity tendency - ! units: PPT per second + ! units: psu s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "diabatic_diff_saln_tendency_xyave" [Unused] ! long_name: Diabatic diffusion salinity tendency - ! units: PPT per second + ! units: psu s-1 ! cell_methods: z_l:mean "ocean_model", "diabatic_heat_tendency" [Unused] (CMOR equivalent is "opottempdiff") ! long_name: Diabatic diffusion heat tendency - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "diabatic_heat_tendency_xyave" [Unused] (CMOR equivalent is "opottempdiff_xyave") ! long_name: Diabatic diffusion heat tendency - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: zl:sum "ocean_model", "opottempdiff" [Unused] (native name is "diabatic_heat_tendency") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized dianeutral mixing @@ -2188,11 +2188,11 @@ ! cell_methods: zl:sum "ocean_model_z", "diabatic_heat_tendency" [Unused] (CMOR equivalent is "opottempdiff") ! long_name: Diabatic diffusion heat tendency - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "diabatic_heat_tendency_xyave" [Unused] (CMOR equivalent is "opottempdiff_xyave") ! long_name: Diabatic diffusion heat tendency - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: z_l:sum "ocean_model_z", "opottempdiff" [Unused] (native name is "diabatic_heat_tendency") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized dianeutral mixing @@ -2206,11 +2206,11 @@ ! cell_methods: z_l:sum "ocean_model", "diabatic_salt_tendency" [Unused] (CMOR equivalent is "osaltdiff") ! long_name: Diabatic diffusion of salt tendency - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "diabatic_salt_tendency_xyave" [Unused] (CMOR equivalent is "osaltdiff_xyave") ! long_name: Diabatic diffusion of salt tendency - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: zl:sum "ocean_model", "osaltdiff" [Unused] (native name is "diabatic_salt_tendency") ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized dianeutral mixing @@ -2224,11 +2224,11 @@ ! cell_methods: zl:sum "ocean_model_z", "diabatic_salt_tendency" [Unused] (CMOR equivalent is "osaltdiff") ! long_name: Diabatic diffusion of salt tendency - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "diabatic_salt_tendency_xyave" [Unused] (CMOR equivalent is "osaltdiff_xyave") ! long_name: Diabatic diffusion of salt tendency - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: z_l:sum "ocean_model_z", "osaltdiff" [Unused] (native name is "diabatic_salt_tendency") ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized dianeutral mixing @@ -2242,7 +2242,7 @@ ! cell_methods: z_l:sum "ocean_model", "diabatic_heat_tendency_2d" [Unused] (CMOR equivalent is "opottempdiff_2d") ! long_name: Depth integrated diabatic diffusion heat tendency - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "opottempdiff_2d" [Unused] (native name is "diabatic_heat_tendency_2d") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized dianeutral mixing depth integrated @@ -2251,7 +2251,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "diabatic_salt_tendency_2d" [Unused] (CMOR equivalent is "osaltdiff_2d") ! long_name: Depth integrated diabatic diffusion salt tendency - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "osaltdiff_2d" [Unused] (native name is "diabatic_salt_tendency_2d") ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized dianeutral mixing depth integrated @@ -2260,51 +2260,51 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "boundary_forcing_temp_tendency" [Unused] ! long_name: Boundary forcing temperature tendency - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "boundary_forcing_temp_tendency_xyave" [Unused] ! long_name: Boundary forcing temperature tendency - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: zl:mean "ocean_model_z", "boundary_forcing_temp_tendency" [Unused] ! long_name: Boundary forcing temperature tendency - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "boundary_forcing_temp_tendency_xyave" [Unused] ! long_name: Boundary forcing temperature tendency - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: z_l:mean "ocean_model", "boundary_forcing_saln_tendency" [Unused] ! long_name: Boundary forcing saln tendency - ! units: PPT per second + ! units: psu s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "boundary_forcing_saln_tendency_xyave" [Unused] ! long_name: Boundary forcing saln tendency - ! units: PPT per second + ! units: psu s-1 ! cell_methods: zl:mean "ocean_model_z", "boundary_forcing_saln_tendency" [Unused] ! long_name: Boundary forcing saln tendency - ! units: PPT per second + ! units: psu s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "boundary_forcing_saln_tendency_xyave" [Unused] ! long_name: Boundary forcing saln tendency - ! units: PPT per second + ! units: psu s-1 ! cell_methods: z_l:mean "ocean_model", "boundary_forcing_heat_tendency" [Unused] ! long_name: Boundary forcing heat tendency - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "boundary_forcing_heat_tendency_xyave" [Unused] ! long_name: Boundary forcing heat tendency - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: zl:sum "ocean_model_z", "boundary_forcing_heat_tendency" [Unused] ! long_name: Boundary forcing heat tendency - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "boundary_forcing_heat_tendency_xyave" [Unused] ! long_name: Boundary forcing heat tendency - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: z_l:sum "ocean_model", "boundary_forcing_salt_tendency" [Unused] ! long_name: Boundary forcing salt tendency @@ -2324,7 +2324,7 @@ ! cell_methods: z_l:sum "ocean_model", "boundary_forcing_heat_tendency_2d" [Unused] ! long_name: Depth integrated boundary forcing of ocean heat - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "boundary_forcing_salt_tendency_2d" [Unused] ! long_name: Depth integrated boundary forcing of ocean salt @@ -2332,55 +2332,55 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "frazil_temp_tendency" [Used] ! long_name: Temperature tendency due to frazil formation - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "frazil_temp_tendency_xyave" [Unused] ! long_name: Temperature tendency due to frazil formation - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: zl:mean "ocean_model_z", "frazil_temp_tendency" [Unused] ! long_name: Temperature tendency due to frazil formation - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "frazil_temp_tendency_xyave" [Unused] ! long_name: Temperature tendency due to frazil formation - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: z_l:mean "ocean_model", "frazil_heat_tendency" [Used] ! long_name: Heat tendency due to frazil formation - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "frazil_heat_tendency" [Unused] ! long_name: Heat tendency due to frazil formation - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "frazil_heat_tendency_2d" [Used] ! long_name: Depth integrated heat tendency due to frazil formation - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "Kd_effective" [Used] ! long_name: Diapycnal diffusivity as applied - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_effective_xyave" [Unused] ! long_name: Diapycnal diffusivity as applied - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zl:mean "ocean_model_z", "Kd_effective" [Unused] ! long_name: Diapycnal diffusivity as applied - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_effective_xyave" [Unused] ! long_name: Diapycnal diffusivity as applied - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_l:mean "ocean_model", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface @@ -2407,147 +2407,147 @@ ! standard_name: upward_geothermal_heat_flux_at_sea_floor "ocean_model", "Kd_BBL" [Used] ! long_name: Bottom Boundary Layer Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_BBL_xyave" [Unused] ! long_name: Bottom Boundary Layer Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_BBL" [Unused] ! long_name: Bottom Boundary Layer Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_BBL_xyave" [Unused] ! long_name: Bottom Boundary Layer Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "Kd_layer" [Used] ! long_name: Diapycnal diffusivity of layers (as set) - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_layer_xyave" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zl:mean "ocean_model_z", "Kd_layer" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_layer_xyave" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_l:mean "ocean_model", "TKE_itidal" [Unused] ! long_name: Internal Tide Driven Turbulent Kinetic Energy - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "maxTKE" [Unused] ! long_name: Maximum layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "maxTKE_xyave" [Unused] ! long_name: Maximum layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: zl:mean "ocean_model_z", "maxTKE" [Unused] ! long_name: Maximum layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "maxTKE_xyave" [Unused] ! long_name: Maximum layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: z_l:mean "ocean_model", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd - ! units: second2 meter + ! units: s2 m ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "TKE_to_Kd_xyave" [Unused] ! long_name: Convert TKE to Kd - ! units: second2 meter + ! units: s2 m ! cell_methods: zl:mean "ocean_model_z", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd - ! units: second2 meter + ! units: s2 m ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "TKE_to_Kd_xyave" [Unused] ! long_name: Convert TKE to Kd - ! units: second2 meter + ! units: s2 m ! cell_methods: z_l:mean "ocean_model", "Nb" [Unused] ! long_name: Bottom Buoyancy Frequency - ! units: sec-1 + ! units: s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "Kd_itides" [Used] ! long_name: Internal Tide Driven Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_itides_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_itides" [Unused] ! long_name: Internal Tide Driven Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_itides_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "Kd_lowmode" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_lowmode_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_lowmode" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_lowmode_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) - ! units: meter2 sec-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "Fl_itides" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Fl_itides_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: zi:point "ocean_model_z", "Fl_itides" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Fl_itides_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: z_i:point "ocean_model", "Fl_lowmode" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Fl_lowmode_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: zi:point "ocean_model_z", "Fl_lowmode" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Fl_lowmode_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) - ! units: meter3 sec-3 + ! units: m3 s-3 ! cell_methods: z_i:point "ocean_model", "Polzin_decay_scale" [Unused] ! long_name: Vertical decay scale for the tidal turbulent dissipation with Polzin scheme - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "Polzin_decay_scale_scaled" [Unused] ! long_name: Vertical decay scale for the tidal turbulent dissipation with Polzin scheme, scaled by N2_bot/N2_meanz - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "N2_b" [Unused] ! long_name: Bottom Buoyancy frequency squared @@ -2559,75 +2559,75 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_Work_xyave" [Unused] ! long_name: Work done by Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_Work_xyave" [Unused] ! long_name: Work done by Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_Itidal_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_Itidal_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_Nikurashin_Work_xyave" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_Nikurashin_Work_xyave" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "Kd_Lowmode_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "Kd_Lowmode_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: zl:mean "ocean_model_z", "Kd_Lowmode_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "Kd_Lowmode_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) - ! units: Watts m-2 + ! units: W m-2 ! cell_methods: z_l:mean "ocean_model", "N2" [Unused] (CMOR equivalent is "obvfsq") ! long_name: Buoyancy frequency squared - ! units: sec-2 + ! units: s-2 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "N2_xyave" [Unused] (CMOR equivalent is "obvfsq_xyave") ! long_name: Buoyancy frequency squared - ! units: sec-2 + ! units: s-2 ! cell_methods: zi:point "ocean_model", "obvfsq" [Used] (native name is "N2") ! long_name: Square of seawater buoyancy frequency @@ -2641,11 +2641,11 @@ ! cell_methods: zi:point "ocean_model_z", "N2" [Unused] (CMOR equivalent is "obvfsq") ! long_name: Buoyancy frequency squared - ! units: sec-2 + ! units: s-2 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "N2_xyave" [Unused] (CMOR equivalent is "obvfsq_xyave") ! long_name: Buoyancy frequency squared - ! units: sec-2 + ! units: s-2 ! cell_methods: z_i:point "ocean_model_z", "obvfsq" [Unused] (native name is "N2") ! long_name: Square of seawater buoyancy frequency @@ -2659,279 +2659,279 @@ ! cell_methods: z_i:point "ocean_model_zold", "N2" [Unused] ! long_name: Buoyancy frequency, interpolated to z - ! units: second-2 + ! units: s-2 "ocean_model_zold", "Kd_itides" [Unused] ! long_name: Internal Tide Driven Diffusivity, interpolated to z - ! units: meter2 second-1 + ! units: m2 s-1 "ocean_model", "Kd_shear" [Used] ! long_name: Shear-driven Diapycnal Diffusivity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Kd_shear_xyave" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: zi:point "ocean_model_z", "Kd_shear" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Kd_shear_xyave" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: z_i:point "ocean_model", "TKE_shear" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "TKE_shear_xyave" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: zi:point "ocean_model_z", "TKE_shear" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "TKE_shear_xyave" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy - ! units: meter2 second-2 + ! units: m2 s-2 ! cell_methods: z_i:point "ocean_model", "created_H" [Unused] ! long_name: The volume flux added to stop the ocean from drying out and becoming negative in depth - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "rsdoabsorb" [Unused] ! long_name: Convergence of Penetrative Shortwave Flux in Sea Water Layer - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: net_rate_of_absorption_of_shortwave_energy_in_ocean_layer ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "rsdoabsorb_xyave" [Unused] ! long_name: Convergence of Penetrative Shortwave Flux in Sea Water Layer - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: net_rate_of_absorption_of_shortwave_energy_in_ocean_layer ! cell_methods: zl:sum "ocean_model_z", "rsdoabsorb" [Unused] ! long_name: Convergence of Penetrative Shortwave Flux in Sea Water Layer - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: net_rate_of_absorption_of_shortwave_energy_in_ocean_layer ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "rsdoabsorb_xyave" [Unused] ! long_name: Convergence of Penetrative Shortwave Flux in Sea Water Layer - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: net_rate_of_absorption_of_shortwave_energy_in_ocean_layer ! cell_methods: z_l:sum "ocean_model", "rsdo" [Unused] ! long_name: Downwelling Shortwave Flux in Sea Water at Grid Cell Upper Interface - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: downwelling_shortwave_flux_in_sea_water ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "rsdo_xyave" [Unused] ! long_name: Downwelling Shortwave Flux in Sea Water at Grid Cell Upper Interface - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: downwelling_shortwave_flux_in_sea_water ! cell_methods: zi:point "ocean_model_z", "rsdo" [Unused] ! long_name: Downwelling Shortwave Flux in Sea Water at Grid Cell Upper Interface - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: downwelling_shortwave_flux_in_sea_water ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "rsdo_xyave" [Unused] ! long_name: Downwelling Shortwave Flux in Sea Water at Grid Cell Upper Interface - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: downwelling_shortwave_flux_in_sea_water ! cell_methods: z_i:point "ocean_model", "nonpenSW" [Unused] ! long_name: Non-downwelling SW radiation (i.e., SW absorbed in ocean surface with LW,SENS,LAT) - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: nondownwelling_shortwave_flux_in_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_h_ML" [Unused] ! long_name: Surface boundary layer depth - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_TKE_wind" [Unused] ! long_name: Wind-stirring source of mixed layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_TKE_MKE" [Unused] ! long_name: Mean kinetic energy source of mixed layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_TKE_conv" [Unused] ! long_name: Convective source of mixed layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_TKE_forcing" [Unused] ! long_name: TKE consumed by mixing surface forcing or penetrative shortwave radation through model layers - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_TKE_mixing" [Unused] ! long_name: TKE consumed by mixing that deepens the mixed layer - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_TKE_mech_decay" [Unused] ! long_name: Mechanical energy decay sink of mixed layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_TKE_conv_decay" [Unused] ! long_name: Convective energy decay sink of mixed layer TKE - ! units: meter3 second-3 + ! units: m3 s-3 ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_Hs_used" [Unused] ! long_name: Surface region thickness that is used - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "Mixing_Length" [Unused] ! long_name: Mixing Length that is used - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Mixing_Length_xyave" [Unused] ! long_name: Mixing Length that is used - ! units: meter + ! units: m ! cell_methods: zi:point "ocean_model_z", "Mixing_Length" [Unused] ! long_name: Mixing Length that is used - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Mixing_Length_xyave" [Unused] ! long_name: Mixing Length that is used - ! units: meter + ! units: m ! cell_methods: z_i:point "ocean_model", "Velocity_Scale" [Unused] ! long_name: Velocity Scale that is used. - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "Velocity_Scale_xyave" [Unused] ! long_name: Velocity Scale that is used. - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zi:point "ocean_model_z", "Velocity_Scale" [Unused] ! long_name: Velocity Scale that is used. - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "Velocity_Scale_xyave" [Unused] ! long_name: Velocity Scale that is used. - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_i:point "ocean_model", "LT_Enhancement" [Unused] ! long_name: LT enhancement that is used. - ! units: non-dim + ! units: nondim ! cell_methods: xh:mean yh:mean "ocean_model", "MSTAR" [Unused] ! long_name: MSTAR that is used. - ! units: non-dim + ! units: nondim ! cell_methods: xh:mean yh:mean "ocean_model", "ePBL_OSBL" [Unused] ! long_name: ePBL Surface Boundary layer depth. - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "MLD_EKMAN" [Unused] ! long_name: Boundary layer depth over Ekman length. - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "MLD_OBUKHOV" [Unused] ! long_name: Boundary layer depth over Obukhov length. - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "EKMAN_OBUKHOV" [Unused] ! long_name: Ekman length over Obukhov length. - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "LA" [Unused] ! long_name: Langmuir number. - ! units: non-dim + ! units: nondim ! cell_methods: xh:mean yh:mean "ocean_model", "LA_MOD" [Unused] ! long_name: Modified Langmuir number. - ! units: non-dim + ! units: nondim ! cell_methods: xh:mean yh:mean "ocean_model", "deficit_ratio" [Unused] ! long_name: Max face thickness deficit ratio - ! units: Nondim + ! units: nondim ! cell_methods: xh:mean yh:mean "ocean_model", "SW_pen" [Unused] ! long_name: Penetrating shortwave radiation flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "SW_vis_pen" [Unused] ! long_name: Visible penetrating shortwave radiation flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "opac_1_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 1 - ! units: meter-1 + ! units: m-1 ! cell_methods: zl:mean "ocean_model_z", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "opac_1_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 1 - ! units: meter-1 + ! units: m-1 ! cell_methods: z_l:mean "ocean_model", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "opac_2_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 2 - ! units: meter-1 + ! units: m-1 ! cell_methods: zl:mean "ocean_model_z", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "opac_2_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 2 - ! units: meter-1 + ! units: m-1 ! cell_methods: z_l:mean "ocean_model", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "opac_3_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 3 - ! units: meter-1 + ! units: m-1 ! cell_methods: zl:mean "ocean_model_z", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 - ! units: meter-1 + ! units: m-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "opac_3_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 3 - ! units: meter-1 + ! units: m-1 ! cell_methods: z_l:mean "ocean_model", "Chl_opac" [Unused] ! long_name: Surface chlorophyll A concentration used to find opacity - ! units: mg meter-3 + ! units: mg m-3 ! cell_methods: xh:mean yh:mean "ocean_model", "KHTR_u" [Used] ! long_name: Epipycnal tracer diffusivity at zonal faces of tracer cell - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "KHTR_v" [Used] ! long_name: Epipycnal tracer diffusivity at meridional faces of tracer cell - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "KHTR_h" [Unused] (CMOR equivalent is "diftrelo") ! long_name: Epipycnal tracer diffusivity at tracer cell center - ! units: meter2 second-1 + ! units: m2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "diftrelo" [Used] (native name is "KHTR_h") ! long_name: Ocean Tracer Epineutral Laplacian Diffusivity - ! units: m2 sec-1 + ! units: m2 s-1 ! standard_name: ocean_tracer_epineutral_laplacian_diffusivity ! cell_methods: xh:mean yh:mean "ocean_model", "KHDT_x" [Unused] ! long_name: Epipycnal tracer diffusivity operator at zonal faces of tracer cell - ! units: meter2 + ! units: m2 ! cell_methods: xq:point yh:mean "ocean_model", "KHDT_y" [Unused] ! long_name: Epipycnal tracer diffusivity operator at meridional faces of tracer cell - ! units: meter2 + ! units: m2 ! cell_methods: xh:mean yq:point "ocean_model", "T_vardec" [Unused] ! long_name: ALE variance decay for temperature @@ -2951,27 +2951,27 @@ ! cell_methods: z_l:mean "ocean_model", "S_vardec" [Unused] ! long_name: ALE variance decay for salinity - ! units: PPT2 s-1 + ! units: psu2 s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "S_vardec_xyave" [Unused] ! long_name: ALE variance decay for salinity - ! units: PPT2 s-1 + ! units: psu2 s-1 ! cell_methods: zl:mean "ocean_model_z", "S_vardec" [Unused] ! long_name: ALE variance decay for salinity - ! units: PPT2 s-1 + ! units: psu2 s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "S_vardec_xyave" [Unused] ! long_name: ALE variance decay for salinity - ! units: PPT2 s-1 + ! units: psu2 s-1 ! cell_methods: z_l:mean "ocean_model", "u" [Used] (CMOR equivalent is "uo") ! long_name: Zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "u_xyave" [Unused] (CMOR equivalent is "uo_xyave") ! long_name: Zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model", "uo" [Used] (native name is "u") ! long_name: Sea Water X Velocity @@ -2985,11 +2985,11 @@ ! cell_methods: zl:mean "ocean_model_z", "u" [Used] (CMOR equivalent is "uo") ! long_name: Zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "u_xyave" [Unused] (CMOR equivalent is "uo_xyave") ! long_name: Zonal velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model_z", "uo" [Used] (native name is "u") ! long_name: Sea Water X Velocity @@ -3003,11 +3003,11 @@ ! cell_methods: z_l:mean "ocean_model", "v" [Used] (CMOR equivalent is "vo") ! long_name: Meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "v_xyave" [Unused] (CMOR equivalent is "vo_xyave") ! long_name: Meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model", "vo" [Used] (native name is "v") ! long_name: Sea Water Y Velocity @@ -3021,11 +3021,11 @@ ! cell_methods: zl:mean "ocean_model_z", "v" [Used] (CMOR equivalent is "vo") ! long_name: Meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "v_xyave" [Unused] (CMOR equivalent is "vo_xyave") ! long_name: Meridional velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model_z", "vo" [Used] (native name is "v") ! long_name: Sea Water Y Velocity @@ -3039,19 +3039,19 @@ ! cell_methods: z_l:mean "ocean_model", "h" [Used] ! long_name: Layer Thickness - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "h_xyave" [Unused] ! long_name: Layer Thickness - ! units: meter + ! units: m ! cell_methods: zl:sum "ocean_model_z", "h" [Unused] ! long_name: Layer Thickness - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "h_xyave" [Unused] ! long_name: Layer Thickness - ! units: meter + ! units: m ! cell_methods: z_l:sum "ocean_model", "volo" [Used] ! long_name: Total volume of liquid ocean @@ -3059,7 +3059,7 @@ ! standard_name: sea_water_volume "ocean_model", "zos" [Used] ! long_name: Sea surface height above geoid - ! units: meter + ! units: m ! standard_name: sea_surface_height_above_geoid ! cell_methods: xh:mean yh:mean "ocean_model", "zossq" [Used] @@ -3069,7 +3069,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "SSH" [Used] ! long_name: Sea Surface Height - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "ssh_ga" [Used] ! long_name: Area averaged sea surface height @@ -3077,90 +3077,90 @@ ! standard_name: area_averaged_sea_surface_height "ocean_model", "SSH_inst" [Unused] ! long_name: Instantaneous Sea Surface Height - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean "ocean_model", "SSU" [Used] ! long_name: Sea Surface Zonal Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean "ocean_model", "SSV" [Used] ! long_name: Sea Surface Meridional Velocity - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point "ocean_model", "speed" [Used] ! long_name: Sea Surface Speed - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "temp" [Used] (CMOR equivalent is "thetao") ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "temp_xyave" [Unused] (CMOR equivalent is "thetao_xyave") ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: zl:mean "ocean_model", "thetao" [Unused] (native name is "temp") ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "thetao_xyave" [Unused] (native name is "temp_xyave") ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature ! cell_methods: zl:mean "ocean_model_z", "temp" [Used] (CMOR equivalent is "thetao") ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "temp_xyave" [Used] (CMOR equivalent is "thetao_xyave") ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: z_l:mean "ocean_model_z", "thetao" [Used] (native name is "temp") ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "thetao_xyave" [Unused] (native name is "temp_xyave") ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature ! cell_methods: z_l:mean "ocean_model", "salt" [Used] (CMOR equivalent is "so") ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "salt_xyave" [Unused] (CMOR equivalent is "so_xyave") ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: zl:mean "ocean_model", "so" [Used] (native name is "salt") ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "so_xyave" [Unused] (native name is "salt_xyave") ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity ! cell_methods: zl:mean "ocean_model_z", "salt" [Used] (CMOR equivalent is "so") ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "salt_xyave" [Unused] (CMOR equivalent is "so_xyave") ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: z_l:mean "ocean_model_z", "so" [Used] (native name is "salt") ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "so_xyave" [Unused] (native name is "salt_xyave") ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity ! cell_methods: z_l:mean "ocean_model", "tob" [Unused] @@ -3170,12 +3170,12 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "sob" [Unused] ! long_name: Sea Water Salinity at Sea Floor - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity_at_sea_floor ! cell_methods: xh:mean yh:mean "ocean_model", "SST" [Used] (CMOR equivalent is "tos") ! long_name: Sea Surface Temperature - ! units: Celsius + ! units: degC ! cell_methods: xh:mean yh:mean "ocean_model", "tos" [Unused] (native name is "SST") ! long_name: Sea Surface Temperature @@ -3184,34 +3184,34 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "SST_sq" [Unused] (CMOR equivalent is "tossq") ! long_name: Sea Surface Temperature Squared - ! units: Celsius**2 + ! units: degC2 ! cell_methods: xh:mean yh:mean "ocean_model", "tossq" [Unused] (native name is "SST_sq") ! long_name: Square of Sea Surface Temperature - ! units: degC^2 + ! units: degC2 ! standard_name: square_of_sea_surface_temperature ! cell_methods: xh:mean yh:mean "ocean_model", "SSS" [Used] (CMOR equivalent is "sos") ! long_name: Sea Surface Salinity - ! units: PPT + ! units: psu ! cell_methods: xh:mean yh:mean "ocean_model", "sos" [Unused] (native name is "SSS") ! long_name: Sea Surface Salinity - ! units: ppt + ! units: psu ! standard_name: sea_surface_salinity ! cell_methods: xh:mean yh:mean "ocean_model", "SSS_sq" [Unused] (CMOR equivalent is "sossq") ! long_name: Sea Surface Salinity Squared - ! units: ppt**2 + ! units: psu ! cell_methods: xh:mean yh:mean "ocean_model", "sossq" [Unused] (native name is "SSS_sq") ! long_name: Square of Sea Surface Salinity - ! units: ppt^2 + ! units: psu ! standard_name: square_of_sea_surface_salinity ! cell_methods: xh:mean yh:mean "ocean_model", "frazil" [Used] (CMOR equivalent is "hfsifrazil") ! long_name: Heat from frazil formation - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hfsifrazil" [Used] (native name is "frazil") ! long_name: Heat Flux into Sea Water due to Frazil Ice Formation @@ -3220,287 +3220,287 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "salt_deficit" [Unused] ! long_name: Salt sink in ocean due to ice flux - ! units: g Salt meter-2 s-1 + ! units: psu m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "Heat_PmE" [Used] ! long_name: Heat flux into ocean from mass flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "internal_heat" [Unused] ! long_name: Heat flux into ocean from geothermal or other internal sources - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "T_adx" [Used] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "T_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "T_adx" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "T_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: z_l:mean "ocean_model", "T_ady" [Used] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "T_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "T_ady" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "T_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: z_l:mean "ocean_model", "T_diffx" [Used] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "T_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "T_diffx" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "T_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: z_l:mean "ocean_model", "T_diffy" [Used] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "T_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "T_diffy" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "T_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: z_l:mean "ocean_model", "S_adx" [Used] ! long_name: Advective (by residual mean) Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "S_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "S_adx" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "S_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: z_l:mean "ocean_model", "S_ady" [Used] ! long_name: Advective (by residual mean) Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "S_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "S_ady" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "S_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: z_l:mean "ocean_model", "S_diffx" [Used] ! long_name: Diffusive Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "S_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "S_diffx" [Unused] ! long_name: Diffusive Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "S_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: z_l:mean "ocean_model", "S_diffy" [Used] ! long_name: Diffusive Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "S_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "S_diffy" [Unused] ! long_name: Diffusive Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "S_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: z_l:mean "ocean_model", "T_adx_2d" [Unused] ! long_name: Vertically Integrated Advective Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "T_ady_2d" [Unused] ! long_name: Vertically Integrated Advective Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "T_diffx_2d" [Unused] ! long_name: Vertically Integrated Diffusive Zonal Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "T_diffy_2d" [Unused] ! long_name: Vertically Integrated Diffusive Meridional Flux of Potential Temperature - ! units: Celsius meter3 second-1 + ! units: degC m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "S_adx_2d" [Unused] ! long_name: Vertically Integrated Advective Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "S_ady_2d" [Unused] ! long_name: Vertically Integrated Advective Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "S_diffx_2d" [Unused] ! long_name: Vertically Integrated Diffusive Zonal Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xq:point yh:mean "ocean_model", "S_diffy_2d" [Unused] ! long_name: Vertically Integrated Diffusive Meridional Flux of Salinity - ! units: PPT meter3 second-1 + ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point "ocean_model", "u_predia" [Unused] ! long_name: Zonal velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "u_predia_xyave" [Unused] ! long_name: Zonal velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "u_predia" [Unused] ! long_name: Zonal velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "u_predia_xyave" [Unused] ! long_name: Zonal velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "v_predia" [Unused] ! long_name: Meridional velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "v_predia_xyave" [Unused] ! long_name: Meridional velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "v_predia" [Unused] ! long_name: Meridional velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "v_predia_xyave" [Unused] ! long_name: Meridional velocity before diabatic forcing - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "h_predia_xyave" [Unused] ! long_name: Layer Thickness before diabatic forcing - ! units: meter + ! units: m ! cell_methods: zl:sum "ocean_model_z", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "h_predia_xyave" [Unused] ! long_name: Layer Thickness before diabatic forcing - ! units: meter + ! units: m ! cell_methods: z_l:sum "ocean_model", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "e_predia_xyave" [Unused] ! long_name: Interface Heights before diabatic forcing - ! units: meter + ! units: m ! cell_methods: zi:point "ocean_model_z", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "e_predia_xyave" [Unused] ! long_name: Interface Heights before diabatic forcing - ! units: meter + ! units: m ! cell_methods: z_i:point "ocean_model", "u_preale" [Unused] ! long_name: Zonal velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "u_preale_xyave" [Unused] ! long_name: Zonal velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "u_preale" [Unused] ! long_name: Zonal velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "u_preale_xyave" [Unused] ! long_name: Zonal velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "v_preale" [Unused] ! long_name: Meridional velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "v_preale_xyave" [Unused] ! long_name: Meridional velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: zl:mean "ocean_model_z", "v_preale" [Unused] ! long_name: Meridional velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "v_preale_xyave" [Unused] ! long_name: Meridional velocity before remapping - ! units: meter second-1 + ! units: m s-1 ! cell_methods: z_l:mean "ocean_model", "h_preale" [Unused] ! long_name: Layer Thickness before remapping - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "h_preale_xyave" [Unused] ! long_name: Layer Thickness before remapping - ! units: meter + ! units: m ! cell_methods: zl:sum "ocean_model_z", "h_preale" [Unused] ! long_name: Layer Thickness before remapping - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "h_preale_xyave" [Unused] ! long_name: Layer Thickness before remapping - ! units: meter + ! units: m ! cell_methods: z_l:sum "ocean_model", "T_preale" [Unused] ! long_name: Temperature before remapping @@ -3520,67 +3520,67 @@ ! cell_methods: z_l:mean "ocean_model", "S_preale" [Unused] ! long_name: Salinity before remapping - ! units: ppt + ! units: psu ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "S_preale_xyave" [Unused] ! long_name: Salinity before remapping - ! units: ppt + ! units: psu ! cell_methods: zl:mean "ocean_model_z", "S_preale" [Unused] ! long_name: Salinity before remapping - ! units: ppt + ! units: psu ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "S_preale_xyave" [Unused] ! long_name: Salinity before remapping - ! units: ppt + ! units: psu ! cell_methods: z_l:mean "ocean_model", "e_preale" [Unused] ! long_name: Interface Heights before remapping - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "e_preale_xyave" [Unused] ! long_name: Interface Heights before remapping - ! units: meter + ! units: m ! cell_methods: zi:point "ocean_model_z", "e_preale" [Unused] ! long_name: Interface Heights before remapping - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "e_preale_xyave" [Unused] ! long_name: Interface Heights before remapping - ! units: meter + ! units: m ! cell_methods: z_i:point "ocean_model", "temp_predia" [Unused] ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "temp_predia_xyave" [Unused] ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: zl:mean "ocean_model_z", "temp_predia" [Unused] ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "temp_predia_xyave" [Unused] ! long_name: Potential Temperature - ! units: Celsius + ! units: degC ! cell_methods: z_l:mean "ocean_model", "salt_predia" [Unused] ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "salt_predia_xyave" [Unused] ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: zl:mean "ocean_model_z", "salt_predia" [Unused] ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "salt_predia_xyave" [Unused] ! long_name: Salinity - ! units: PPT + ! units: psu ! cell_methods: z_l:mean "ocean_model", "uhtr" [Unused] ! long_name: Accumulated zonal thickness fluxes to advect tracers @@ -3616,97 +3616,97 @@ ! cell_methods: z_l:sum "ocean_model", "umo" [Used] ! long_name: Ocean Mass X Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_x_transport ! cell_methods: xq:point yh:sum zl:sum "ocean_model", "umo_xyave" [Unused] ! long_name: Ocean Mass X Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_x_transport ! cell_methods: zl:sum "ocean_model_z", "umo" [Used] ! long_name: Ocean Mass X Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_x_transport ! cell_methods: xq:point yh:sum z_l:sum "ocean_model_z", "umo_xyave" [Unused] ! long_name: Ocean Mass X Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_x_transport ! cell_methods: z_l:sum "ocean_model", "vmo" [Used] ! long_name: Ocean Mass Y Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_y_transport ! cell_methods: xh:sum yq:point zl:sum "ocean_model", "vmo_xyave" [Unused] ! long_name: Ocean Mass Y Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_y_transport ! cell_methods: zl:sum "ocean_model_z", "vmo" [Used] ! long_name: Ocean Mass Y Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_y_transport ! cell_methods: xh:sum yq:point z_l:sum "ocean_model_z", "vmo_xyave" [Unused] ! long_name: Ocean Mass Y Transport - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_y_transport ! cell_methods: z_l:sum "ocean_model", "umo_2d" [Used] ! long_name: Ocean Mass X Transport Vertical Sum - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_x_transport_vertical_sum ! cell_methods: xq:point yh:sum "ocean_model", "vmo_2d" [Used] ! long_name: Ocean Mass Y Transport Vertical Sum - ! units: kg/s + ! units: kg s-1 ! standard_name: ocean_mass_y_transport_vertical_sum ! cell_methods: xh:sum yq:point "ocean_model", "T_advection_xy" [Used] ! long_name: Horizontal convergence of residual mean heat advective fluxes - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "T_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes - ! units: W/m2 + ! units: W m-2 ! cell_methods: zl:sum "ocean_model_z", "T_advection_xy" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "T_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes - ! units: W/m2 + ! units: W m-2 ! cell_methods: z_l:sum "ocean_model", "T_advection_xy_2d" [Used] ! long_name: Vertical sum of horizontal convergence of residual mean heat advective fluxes - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "T_tendency" [Used] ! long_name: Net time tendency for temperature - ! units: degC/s + ! units: degC s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "T_tendency_xyave" [Unused] ! long_name: Net time tendency for temperature - ! units: degC/s + ! units: degC s-1 ! cell_methods: zl:mean "ocean_model_z", "T_tendency" [Unused] ! long_name: Net time tendency for temperature - ! units: degC/s + ! units: degC s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "T_tendency_xyave" [Unused] ! long_name: Net time tendency for temperature - ! units: degC/s + ! units: degC s-1 ! cell_methods: z_l:mean "ocean_model", "Th_tendency" [Unused] (CMOR equivalent is "opottemptend") ! long_name: Net time tendency for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "Th_tendency_xyave" [Unused] (CMOR equivalent is "opottemptend_xyave") ! long_name: Net time tendency for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: zl:sum "ocean_model", "opottemptend" [Used] (native name is "Th_tendency") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content @@ -3720,11 +3720,11 @@ ! cell_methods: zl:sum "ocean_model_z", "Th_tendency" [Unused] (CMOR equivalent is "opottemptend") ! long_name: Net time tendency for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "Th_tendency_xyave" [Unused] (CMOR equivalent is "opottemptend_xyave") ! long_name: Net time tendency for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: z_l:sum "ocean_model_z", "opottemptend" [Unused] (native name is "Th_tendency") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content @@ -3738,7 +3738,7 @@ ! cell_methods: z_l:sum "ocean_model", "Th_tendency_2d" [Unused] (CMOR equivalent is "opottemptend_2d") ! long_name: Vertical sum of net time tendency for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "opottemptend_2d" [Used] (native name is "Th_tendency_2d") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content Vertical Sum @@ -3747,47 +3747,47 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "S_advection_xy" [Used] ! long_name: Horizontal convergence of residual mean salt advective fluxes - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "S_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: zl:sum "ocean_model_z", "S_advection_xy" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "S_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: z_l:sum "ocean_model", "S_advection_xy_2d" [Used] ! long_name: Vertical sum of horizontal convergence of residual mean salt advective fluxes - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "S_tendency" [Used] ! long_name: Net time tendency for salinity - ! units: PPT/s + ! units: psu s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "S_tendency_xyave" [Unused] ! long_name: Net time tendency for salinity - ! units: PPT/s + ! units: psu s-1 ! cell_methods: zl:mean "ocean_model_z", "S_tendency" [Unused] ! long_name: Net time tendency for salinity - ! units: PPT/s + ! units: psu s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "S_tendency_xyave" [Unused] ! long_name: Net time tendency for salinity - ! units: PPT/s + ! units: psu s-1 ! cell_methods: z_l:mean "ocean_model", "Sh_tendency" [Unused] (CMOR equivalent is "osalttend") ! long_name: Net time tendency for salt - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "Sh_tendency_xyave" [Unused] (CMOR equivalent is "osalttend_xyave") ! long_name: Net time tendency for salt - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: zl:sum "ocean_model", "osalttend" [Used] (native name is "Sh_tendency") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content @@ -3801,11 +3801,11 @@ ! cell_methods: zl:sum "ocean_model_z", "Sh_tendency" [Unused] (CMOR equivalent is "osalttend") ! long_name: Net time tendency for salt - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "Sh_tendency_xyave" [Unused] (CMOR equivalent is "osalttend_xyave") ! long_name: Net time tendency for salt - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: z_l:sum "ocean_model_z", "osalttend" [Unused] (native name is "Sh_tendency") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content @@ -3819,7 +3819,7 @@ ! cell_methods: z_l:sum "ocean_model", "Sh_tendency_2d" [Unused] (CMOR equivalent is "osalttend_2d") ! long_name: Vertical sum of net time tendency for salt - ! units: kg/(m2 * s) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "osalttend_2d" [Used] (native name is "Sh_tendency_2d") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content Vertical Sum @@ -3828,71 +3828,71 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "dzRegrid" [Unused] ! long_name: Change in interface height due to ALE regridding - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean zi:point "ocean_model", "dzRegrid_xyave" [Unused] ! long_name: Change in interface height due to ALE regridding - ! units: meter + ! units: m ! cell_methods: zi:point "ocean_model_z", "dzRegrid" [Unused] ! long_name: Change in interface height due to ALE regridding - ! units: meter + ! units: m ! cell_methods: xh:mean yh:mean z_i:point "ocean_model_z", "dzRegrid_xyave" [Unused] ! long_name: Change in interface height due to ALE regridding - ! units: meter + ! units: m ! cell_methods: z_i:point "ocean_model", "T_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration T - ! units: degC/s + ! units: degC s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "T_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration T - ! units: degC/s + ! units: degC s-1 ! cell_methods: zl:mean "ocean_model_z", "T_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration T - ! units: degC/s + ! units: degC s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "T_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration T - ! units: degC/s + ! units: degC s-1 ! cell_methods: z_l:mean "ocean_model", "Th_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "Th_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: zl:sum "ocean_model_z", "Th_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "Th_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: z_l:sum "ocean_model", "Th_tendency_vert_remap_2d" [Unused] ! long_name: Vertical sum of tendency from vertical remapping for heat - ! units: W/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "S_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration S - ! units: tracer conc / sec + ! units: tracer concentration * s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "S_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration S - ! units: tracer conc / sec + ! units: tracer concentration * s-1 ! cell_methods: zl:mean "ocean_model_z", "S_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration S - ! units: tracer conc / sec + ! units: tracer concentration * s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "S_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration S - ! units: tracer conc / sec + ! units: tracer concentration * s-1 ! cell_methods: z_l:mean "ocean_model", "Sh_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer content S @@ -3916,19 +3916,19 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "age_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration age - ! units: tracer conc / sec + ! units: tracer concentration * s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "age_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration age - ! units: tracer conc / sec + ! units: tracer concentration * s-1 ! cell_methods: zl:mean "ocean_model_z", "age_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration age - ! units: tracer conc / sec + ! units: tracer concentration * s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "age_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration age - ! units: tracer conc / sec + ! units: tracer concentration * s-1 ! cell_methods: z_l:mean "ocean_model", "ageh_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer content age @@ -3960,159 +3960,159 @@ ! standard_name: not provided "ocean_model_zold", "thetao" [Unused] ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature "ocean_model_zold", "thetao_xyave" [Unused] ! long_name: Sea Water Potential Temperature - ! units: C + ! units: degC ! standard_name: sea_water_potential_temperature "ocean_model_zold", "salt" [Used] ! long_name: Salinity - ! units: PPT + ! units: psu ! standard_name: not provided "ocean_model_zold", "salt_xyave" [Unused] ! long_name: Salinity - ! units: PPT + ! units: psu ! standard_name: not provided "ocean_model_zold", "so" [Unused] ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity "ocean_model_zold", "so_xyave" [Unused] ! long_name: Sea Water Salinity - ! units: ppt + ! units: psu ! standard_name: sea_water_salinity "ocean_model", "age" [Unused] (CMOR equivalent is "agessc") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "age_xyave" [Unused] (CMOR equivalent is "agessc_xyave") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! cell_methods: zl:mean "ocean_model", "agessc" [Unused] (native name is "age") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "agessc_xyave" [Unused] (native name is "age_xyave") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided ! cell_methods: zl:mean "ocean_model_z", "age" [Unused] (CMOR equivalent is "agessc") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "age_xyave" [Unused] (CMOR equivalent is "agessc_xyave") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! cell_methods: z_l:mean "ocean_model_z", "agessc" [Unused] (native name is "age") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "agessc_xyave" [Unused] (native name is "age_xyave") ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided ! cell_methods: z_l:mean "ocean_model", "age_adx" [Unused] ! long_name: Ideal Age Tracer advective zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "age_adx_xyave" [Unused] ! long_name: Ideal Age Tracer advective zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "age_adx" [Unused] ! long_name: Ideal Age Tracer advective zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "age_adx_xyave" [Unused] ! long_name: Ideal Age Tracer advective zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: z_l:mean "ocean_model", "age_ady" [Unused] ! long_name: Ideal Age Tracer advective meridional flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "age_ady_xyave" [Unused] ! long_name: Ideal Age Tracer advective meridional flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "age_ady" [Unused] ! long_name: Ideal Age Tracer advective meridional flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "age_ady_xyave" [Unused] ! long_name: Ideal Age Tracer advective meridional flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: z_l:mean "ocean_model", "age_dfx" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xq:point yh:mean zl:mean "ocean_model", "age_dfx_xyave" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "age_dfx" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xq:point yh:mean z_l:mean "ocean_model_z", "age_dfx_xyave" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: z_l:mean "ocean_model", "age_dfy" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xh:mean yq:point zl:mean "ocean_model", "age_dfy_xyave" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: zl:mean "ocean_model_z", "age_dfy" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: xh:mean yq:point z_l:mean "ocean_model_z", "age_dfy_xyave" [Unused] ! long_name: Ideal Age Tracer diffusive zonal flux - ! units: years m3 s-1 + ! units: yr m3 s-1 ! cell_methods: z_l:mean "ocean_model_zold", "age" [Unused] ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided "ocean_model_zold", "age_xyave" [Unused] ! long_name: Ideal Age Tracer - ! units: years + ! units: yr ! standard_name: not provided "ocean_model", "ndiff_tracer_conc_tendency_T" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for T - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "ndiff_tracer_conc_tendency_T_xyave" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for T - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: zl:mean "ocean_model_z", "ndiff_tracer_conc_tendency_T" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for T - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "ndiff_tracer_conc_tendency_T_xyave" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for T - ! units: Degree C per second + ! units: degC s-1 ! cell_methods: z_l:mean "ocean_model", "ndiff_tracer_cont_tendency_T" [Unused] (CMOR equivalent is "opottemppmdiff") ! long_name: Neutral diffusion tracer content tendency for T - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean zl:sum "ocean_model", "ndiff_tracer_cont_tendency_T_xyave" [Unused] (CMOR equivalent is "opottemppmdiff_xyave") ! long_name: Neutral diffusion tracer content tendency for T - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: zl:sum "ocean_model", "opottemppmdiff" [Unused] (native name is "ndiff_tracer_cont_tendency_T") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized mesocale diffusion @@ -4126,11 +4126,11 @@ ! cell_methods: zl:sum "ocean_model_z", "ndiff_tracer_cont_tendency_T" [Unused] (CMOR equivalent is "opottemppmdiff") ! long_name: Neutral diffusion tracer content tendency for T - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean z_l:sum "ocean_model_z", "ndiff_tracer_cont_tendency_T_xyave" [Unused] (CMOR equivalent is "opottemppmdiff_xyave") ! long_name: Neutral diffusion tracer content tendency for T - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: z_l:sum "ocean_model_z", "opottemppmdiff" [Unused] (native name is "ndiff_tracer_cont_tendency_T") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized mesocale diffusion @@ -4144,7 +4144,7 @@ ! cell_methods: z_l:sum "ocean_model", "ndiff_tracer_cont_tendency_2d_T" [Unused] (CMOR equivalent is "opottemppmdiff_2d") ! long_name: Depth integrated neutral diffusion tracer content tendency for T - ! units: Watts/m2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "opottemppmdiff_2d" [Unused] (native name is "ndiff_tracer_cont_tendency_2d_T") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized mesocale diffusion depth integrated @@ -4153,27 +4153,27 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "ndiff_tracer_trans_x_2d_T" [Unused] ! long_name: Depth integrated neutral diffusion zonal tracer transport for T - ! units: Watts + ! units: W ! cell_methods: xq:point yh:mean "ocean_model", "ndiff_tracer_trans_y_2d_T" [Unused] ! long_name: Depth integrated neutral diffusion merid tracer transport for T - ! units: Watts + ! units: W ! cell_methods: xh:mean yq:point "ocean_model", "ndiff_tracer_conc_tendency_S" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for S - ! units: tracer concentration units per second + ! units: tracer concentration * s-1 ! cell_methods: xh:mean yh:mean zl:mean "ocean_model", "ndiff_tracer_conc_tendency_S_xyave" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for S - ! units: tracer concentration units per second + ! units: tracer concentration * s-1 ! cell_methods: zl:mean "ocean_model_z", "ndiff_tracer_conc_tendency_S" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for S - ! units: tracer concentration units per second + ! units: tracer concentration * s-1 ! cell_methods: xh:mean yh:mean z_l:mean "ocean_model_z", "ndiff_tracer_conc_tendency_S_xyave" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for S - ! units: tracer concentration units per second + ! units: tracer concentration * s-1 ! cell_methods: z_l:mean "ocean_model", "ndiff_tracer_cont_tendency_S" [Unused] (CMOR equivalent is "osaltpmdiff") ! long_name: Neutral diffusion tracer content tendency for S @@ -4222,11 +4222,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "ndiff_tracer_trans_x_2d_S" [Unused] ! long_name: Depth integrated neutral diffusion zonal tracer transport for S - ! units: kg/s + ! units: kg s-1 ! cell_methods: xq:point yh:mean "ocean_model", "ndiff_tracer_trans_y_2d_S" [Unused] ! long_name: Depth integrated neutral diffusion merid tracer transport for S - ! units: kg/s + ! units: kg s-1 ! cell_methods: xh:mean yq:point "ocean_model", "ndiff_tracer_conc_tendency_age" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for age @@ -4278,15 +4278,15 @@ ! cell_methods: z_l:mean "ocean_model", "ndiff_tracer_trans_x_2d_age" [Unused] ! long_name: Depth integrated neutral diffusion zonal tracer transport for age - ! units: kg/s + ! units: kg s-1 ! cell_methods: xq:point yh:mean "ocean_model", "ndiff_tracer_trans_y_2d_age" [Unused] ! long_name: Depth integrated neutral diffusion merid tracer transport for age - ! units: kg/s + ! units: kg s-1 ! cell_methods: xh:mean yq:point "ocean_model", "taux" [Used] (CMOR equivalent is "tauuo") ! long_name: Zonal surface stress from ocean interactions with atmos and ice - ! units: Pascal + ! units: Pa ! standard_name: surface_downward_x_stress ! cell_methods: xq:point yh:mean "ocean_model", "tauuo" [Used] (native name is "taux") @@ -4296,7 +4296,7 @@ ! cell_methods: xq:point yh:mean "ocean_model", "tauy" [Used] (CMOR equivalent is "tauvo") ! long_name: Meridional surface stress ocean interactions with atmos and ice - ! units: Pascal + ! units: Pa ! standard_name: surface_downward_y_stress ! cell_methods: xh:mean yq:point "ocean_model", "tauvo" [Used] (native name is "tauy") @@ -4306,11 +4306,11 @@ ! cell_methods: xh:mean yq:point "ocean_model", "ustar" [Used] ! long_name: Surface friction velocity = [(gustiness + tau_magnitude)/rho0]^(1/2) - ! units: meter second-1 + ! units: m s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "p_surf" [Used] (CMOR equivalent is "pso") ! long_name: Pressure at ice-ocean or atmosphere-ocean interface - ! units: Pascal + ! units: Pa ! cell_methods: xh:mean yh:mean "ocean_model", "pso" [Used] (native name is "p_surf") ! long_name: Sea Water Pressure at Sea Water Surface @@ -4319,11 +4319,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "TKE_tidal" [Unused] ! long_name: Tidal source of BBL mixing - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "PRCmE" [Used] (CMOR equivalent is "wfo") ! long_name: Net surface water flux (precip+melt+lrunoff+ice calving-evap) - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "wfo" [Used] (native name is "PRCmE") @@ -4333,7 +4333,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "evap" [Used] (CMOR equivalent is "evs") ! long_name: Evaporation/condensation at ocean surface (evaporation is negative) - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! standard_name: water_evaporation_flux ! cell_methods: xh:mean yh:mean "ocean_model", "evs" [Used] (native name is "evap") @@ -4343,11 +4343,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "precip" [Unused] ! long_name: Liquid + frozen precipitation into ocean - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "fprec" [Used] (CMOR equivalent is "prsn") ! long_name: Frozen precipitation into ocean - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! standard_name: snowfall_flux ! cell_methods: xh:mean yh:mean "ocean_model", "prsn" [Used] (native name is "fprec") @@ -4357,7 +4357,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "lprec" [Used] (CMOR equivalent is "prlq") ! long_name: Liquid precipitation into ocean - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 ! standard_name: rainfall_flux ! cell_methods: xh:mean yh:mean "ocean_model", "prlq" [Used] (native name is "lprec") @@ -4367,11 +4367,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "vprec" [Used] ! long_name: Virtual liquid precip into ocean due to SSS restoring - ! units: kilogram/(meter^2 second) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "frunoff" [Used] (CMOR equivalent is "ficeberg") ! long_name: Frozen runoff (calving) and iceberg melt into ocean - ! units: kilogram/(meter^2 second) + ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_icebergs ! cell_methods: xh:mean yh:mean "ocean_model", "ficeberg" [Unused] (native name is "frunoff") @@ -4381,7 +4381,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "lrunoff" [Used] (CMOR equivalent is "friver") ! long_name: Liquid runoff (rivers) into ocean - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_rivers ! cell_methods: xh:mean yh:mean "ocean_model", "friver" [Used] (native name is "lrunoff") @@ -4391,23 +4391,23 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "net_massout" [Used] ! long_name: Net mass leaving the ocean due to evaporation, seaice formation - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "net_massin" [Used] ! long_name: Net mass entering ocean due to precip, runoff, ice melt - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "massout_flux" [Unused] ! long_name: Net mass flux of freshwater out of the ocean (used in the boundary flux calculation) - ! units: kilogram meter-2 + ! units: kg m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "massin_flux" [Unused] ! long_name: Net mass flux of freshwater into the ocean (used in boundary flux calculation) - ! units: kilogram meter-2 + ! units: kg m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "total_PRCmE" [Used] ! long_name: Area integrated net surface water flux (precip+melt+liq runoff+ice calving-evap) - ! units: kg/s + ! units: kg s-1 ! standard_name: water_flux_into_sea_water_area_integrated "ocean_model", "total_wfo" [Unused] ! long_name: Water Transport Into Sea Water Area Integrated @@ -4415,7 +4415,7 @@ ! standard_name: water_flux_into_sea_water_area_integrated "ocean_model", "total_evap" [Used] ! long_name: Area integrated evap/condense at ocean surface - ! units: kg/s + ! units: kg s-1 ! standard_name: water_evaporation_flux_area_integrated "ocean_model", "total_evs" [Unused] ! long_name: Evaporation Where Ice Free Ocean over Sea Area Integrated @@ -4423,10 +4423,10 @@ ! standard_name: water_evaporation_flux_area_integrated "ocean_model", "total_precip" [Used] ! long_name: Area integrated liquid+frozen precip into ocean - ! units: kg/s + ! units: kg s-1 "ocean_model", "total_fprec" [Used] ! long_name: Area integrated frozen precip into ocean - ! units: kg/s + ! units: kg s-1 ! standard_name: snowfall_flux_area_integrated "ocean_model", "total_prsn" [Unused] ! long_name: Snowfall Flux where Ice Free Ocean over Sea Area Integrated @@ -4434,7 +4434,7 @@ ! standard_name: snowfall_flux_area_integrated "ocean_model", "total_lprec" [Used] ! long_name: Area integrated liquid precip into ocean - ! units: kg/s + ! units: kg s-1 ! standard_name: rainfall_flux_area_integrated "ocean_model", "total_pr" [Unused] ! long_name: Rainfall Flux where Ice Free Ocean over Sea Area Integrated @@ -4442,27 +4442,27 @@ ! standard_name: rainfall_flux_area_integrated "ocean_model", "total_vprec" [Used] ! long_name: Area integrated virtual liquid precip due to SSS restoring - ! units: kg/s + ! units: kg s-1 "ocean_model", "total_frunoff" [Used] ! long_name: Area integrated frozen runoff (calving) & iceberg melt into ocean - ! units: kg/s + ! units: kg s-1 "ocean_model", "total_ficeberg" [Unused] ! long_name: Water Flux into Seawater from Icebergs Area Integrated ! units: kg s-1 ! standard_name: water_flux_into_sea_water_from_icebergs_area_integrated "ocean_model", "total_lrunoff" [Used] ! long_name: Area integrated liquid runoff into ocean - ! units: kg/s + ! units: kg s-1 "ocean_model", "total_friver" [Unused] ! long_name: Water Flux into Sea Water From Rivers Area Integrated ! units: kg s-1 ! standard_name: water_flux_into_sea_water_from_rivers_area_integrated "ocean_model", "total_net_massout" [Used] ! long_name: Area integrated mass leaving ocean due to evap and seaice form - ! units: kg/s + ! units: kg s-1 "ocean_model", "total_net_massin" [Used] ! long_name: Area integrated mass entering ocean due to predip, runoff, ice melt - ! units: kg/s + ! units: kg s-1 "ocean_model", "PRCmE_ga" [Used] ! long_name: Area averaged net surface water flux (precip+melt+liq runoff+ice calving-evap) ! units: kg m-2 s-1 @@ -4503,12 +4503,12 @@ ! units: kg m-2 s-1 "ocean_model", "heat_content_frunoff" [Used] ! long_name: Heat content (relative to 0C) of solid runoff into ocean - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: temperature_flux_due_to_solid_runoff_expressed_as_heat_flux_into_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_lrunoff" [Used] ! long_name: Heat content (relative to 0C) of liquid runoff into ocean - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "hfrunoffds" [Used] @@ -4518,32 +4518,32 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_lprec" [Used] ! long_name: Heat content (relative to 0degC) of liquid precip entering ocean - ! units: W/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_fprec" [Used] ! long_name: Heat content (relative to 0degC) of frozen prec entering ocean - ! units: W/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_vprec" [Used] ! long_name: Heat content (relative to 0degC) of virtual precip entering ocean - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_cond" [Used] ! long_name: Heat content (relative to 0degC) of water condensing into ocean - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hfrainds" [Used] ! long_name: Heat content (relative to 0degC) of liquid+frozen precip entering ocean - ! units: W/m^2 + ! units: W m-2 ! standard_name: temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_surfwater" [Used] ! long_name: Heat content (relative to 0degC) of net water crossing ocean surface (frozen+liquid) - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_massout" [Used] (CMOR equivalent is "hfevapds") ! long_name: Heat content (relative to 0degC) of net mass leaving ocean ocean via evap and ice form - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hfevapds" [Used] (native name is "heat_content_massout") ! long_name: Heat Content (relative to 0degC) of Water Leaving Ocean via Evaporation and Ice Formation @@ -4552,15 +4552,15 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "heat_content_massin" [Unused] ! long_name: Heat content (relative to 0degC) of net mass entering ocean ocean - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "net_heat_coupler" [Used] ! long_name: Surface ocean heat flux from SW+LW+latent+sensible (via the coupler) - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "net_heat_surface" [Used] (CMOR equivalent is "hfds") ! long_name: Surface ocean heat flux from SW+LW+lat+sens+mass transfer+frazil+restore or flux adjustments - ! units: Watt/m^2 + ! units: W m-2 ! standard_name: surface_downward_heat_flux_in_sea_water ! cell_methods: xh:mean yh:mean "ocean_model", "hfds" [Used] (native name is "net_heat_surface") @@ -4570,7 +4570,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "SW" [Used] (CMOR equivalent is "rsntds") ! long_name: Shortwave radiation flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: net_downward_shortwave_flux_at_sea_water_surface ! cell_methods: xh:mean yh:mean "ocean_model", "rsntds" [Used] (native name is "SW") @@ -4580,19 +4580,19 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "sw_vis" [Unused] ! long_name: Shortwave radiation direct and diffuse flux into the ocean in the visible band - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "sw_nir" [Unused] ! long_name: Shortwave radiation direct and diffuse flux into the ocean in the near-infrared band - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "LwLatSens" [Used] ! long_name: Combined longwave, latent, and sensible heating at ocean surface - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "LW" [Used] (CMOR equivalent is "rlntds") ! long_name: Longwave radiation flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: surface_net_downward_longwave_flux ! cell_methods: xh:mean yh:mean "ocean_model", "rlntds" [Used] (native name is "LW") @@ -4602,7 +4602,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "latent" [Unused] (CMOR equivalent is "hflso") ! long_name: Latent heat flux into ocean due to fusion and evaporation (negative means ocean heat loss) - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hflso" [Used] (native name is "latent") ! long_name: Surface Downward Latent Heat Flux due to Evap + Melt Snow/Ice @@ -4611,11 +4611,11 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "latent_evap" [Unused] ! long_name: Latent heat flux into ocean due to evaporation/condensation - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "latent_fprec_diag" [Unused] (CMOR equivalent is "hfsnthermds") ! long_name: Latent heat flux into ocean due to melting of frozen precipitation - ! units: Watt meter-2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hfsnthermds" [Used] (native name is "latent_fprec_diag") ! long_name: Latent Heat to Melt Frozen Precipitation @@ -4624,7 +4624,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "latent_frunoff" [Unused] (CMOR equivalent is "hfibthermds") ! long_name: Latent heat flux into ocean due to melting of icebergs - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "hfibthermds" [Used] (native name is "latent_frunoff") ! long_name: Latent Heat to Melt Frozen Runoff/Iceberg @@ -4633,7 +4633,7 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "sensible" [Unused] (CMOR equivalent is "hfsso") ! long_name: Sensible heat flux into ocean - ! units: Watt meter-2 + ! units: W m-2 ! standard_name: surface_downward_sensible_heat_flux ! cell_methods: xh:mean yh:mean "ocean_model", "hfsso" [Used] (native name is "sensible") @@ -4643,112 +4643,112 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "heat_added" [Unused] ! long_name: Flux Adjustment or restoring surface heat flux into ocean - ! units: Watt/m^2 + ! units: W m-2 ! cell_methods: xh:mean yh:mean "ocean_model", "total_heat_content_frunoff" [Used] ! long_name: Area integrated heat content (relative to 0C) of solid runoff - ! units: Watt + ! units: W "ocean_model", "total_hfsolidrunoffds" [Unused] ! long_name: Temperature Flux due to Solid Runoff Expressed as Heat Flux into Sea Water Area Integrated ! units: W ! standard_name: temperature_flux_due_to_solid_runoff_expressed_as_heat_flux_into_sea_water_area_integrated "ocean_model", "total_heat_content_lrunoff" [Used] ! long_name: Area integrated heat content (relative to 0C) of liquid runoff - ! units: Watt + ! units: W "ocean_model", "total_hfrunoffds" [Unused] ! long_name: Temperature Flux due to Runoff Expressed as Heat Flux into Sea Water Area Integrated ! units: W ! standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water_area_integrated "ocean_model", "total_heat_content_lprec" [Used] ! long_name: Area integrated heat content (relative to 0C) of liquid precip - ! units: Watt + ! units: W "ocean_model", "total_hfrainds" [Unused] ! long_name: Temperature Flux due to Rainfall Expressed as Heat Flux into Sea Water Area Integrated ! units: W ! standard_name: temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water_area_integrated "ocean_model", "total_heat_content_fprec" [Used] ! long_name: Area integrated heat content (relative to 0C) of frozen precip - ! units: Watt + ! units: W "ocean_model", "total_heat_content_vprec" [Used] ! long_name: Area integrated heat content (relative to 0C) of virtual precip - ! units: Watt + ! units: W "ocean_model", "total_heat_content_cond" [Used] ! long_name: Area integrated heat content (relative to 0C) of condensate - ! units: Watt + ! units: W "ocean_model", "total_heat_content_surfwater" [Used] ! long_name: Area integrated heat content (relative to 0C) of water crossing surface - ! units: Watt + ! units: W "ocean_model", "total_heat_content_massout" [Used] ! long_name: Area integrated heat content (relative to 0C) of water leaving ocean - ! units: Watt + ! units: W "ocean_model", "total_hfevapds" [Unused] ! long_name: Heat Flux Out of Sea Water due to Evaporating Water Area Integrated ! units: W ! standard_name: temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water_area_integrated "ocean_model", "total_heat_content_massin" [Used] ! long_name: Area integrated heat content (relative to 0C) of water entering ocean - ! units: Watt + ! units: W "ocean_model", "total_net_heat_coupler" [Used] ! long_name: Area integrated surface heat flux from SW+LW+latent+sensible (via the coupler) - ! units: Watt + ! units: W "ocean_model", "total_net_heat_surface" [Used] ! long_name: Area integrated surface heat flux from SW+LW+lat+sens+mass+frazil+restore or flux adjustments - ! units: Watt + ! units: W "ocean_model", "total_hfds" [Unused] ! long_name: Surface Ocean Heat Flux from SW+LW+latent+sensible+mass transfer+frazil Area Integrated ! units: W ! standard_name: surface_downward_heat_flux_in_sea_water_area_integrated "ocean_model", "total_sw" [Used] ! long_name: Area integrated net downward shortwave at sea water surface - ! units: Watt + ! units: W "ocean_model", "total_rsntds" [Unused] ! long_name: Net Downward Shortwave Radiation at Sea Water Surface Area Integrated ! units: W ! standard_name: net_downward_shortwave_flux_at_sea_water_surface_area_integrated "ocean_model", "total_LwLatSens" [Used] ! long_name: Area integrated longwave+latent+sensible heating - ! units: Watt + ! units: W "ocean_model", "total_lw" [Used] ! long_name: Area integrated net downward longwave at sea water surface - ! units: Watt + ! units: W "ocean_model", "total_rlntds" [Unused] ! long_name: Surface Net Downward Longwave Radiation Area Integrated ! units: W ! standard_name: surface_net_downward_longwave_flux_area_integrated "ocean_model", "total_lat" [Used] ! long_name: Area integrated surface downward latent heat flux - ! units: Watt + ! units: W "ocean_model", "total_hflso" [Unused] ! long_name: Surface Downward Latent Heat Flux Area Integrated ! units: W ! standard_name: surface_downward_latent_heat_flux_area_integrated "ocean_model", "total_lat_evap" [Used] ! long_name: Area integrated latent heat flux due to evap/condense - ! units: Watt + ! units: W "ocean_model", "total_lat_fprec" [Used] ! long_name: Area integrated latent heat flux due to melting frozen precip - ! units: Watt + ! units: W "ocean_model", "total_hfsnthermds" [Unused] ! long_name: Latent Heat to Melt Frozen Precipitation Area Integrated ! units: W ! standard_name: heat_flux_into_sea_water_due_to_snow_thermodynamics_area_integrated "ocean_model", "total_lat_frunoff" [Used] ! long_name: Area integrated latent heat flux due to melting icebergs - ! units: Watt + ! units: W "ocean_model", "total_hfibthermds" [Unused] ! long_name: Heat Flux into Sea Water due to Iceberg Thermodynamics Area Integrated ! units: W ! standard_name: heat_flux_into_sea_water_due_to_iceberg_thermodynamics_area_integrated "ocean_model", "total_sens" [Used] ! long_name: Area integrated downward sensible heat flux - ! units: Watt + ! units: W "ocean_model", "total_hfsso" [Unused] ! long_name: Surface Downward Sensible Heat Flux Area Integrated ! units: W ! standard_name: surface_downward_sensible_heat_flux_area_integrated "ocean_model", "total_heat_adjustment" [Unused] ! long_name: Area integrated surface heat flux from restoring and/or flux adjustment - ! units: Watt + ! units: W "ocean_model", "net_heat_coupler_ga" [Used] ! long_name: Area averaged surface heat flux from SW+LW+latent+sensible (via the coupler) ! units: W m-2 @@ -4792,7 +4792,7 @@ ! standard_name: surface_downward_sensible_heat_flux_area_averaged "ocean_model", "salt_flux" [Used] (CMOR equivalent is "sfdsi") ! long_name: Net salt flux into ocean at surface (restoring + sea-ice) - ! units: kilogram meter-2 second-1 + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "sfdsi" [Used] (native name is "salt_flux") ! long_name: Downward Sea Ice Basal Salt Flux @@ -4801,30 +4801,30 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "salt_flux_in" [Unused] ! long_name: Salt flux into ocean at surface from coupler - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "salt_flux_added" [Unused] ! long_name: Salt flux into ocean at surface due to restoring or flux adjustment - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 ! cell_methods: xh:mean yh:mean "ocean_model", "salt_flux_global_restoring_adjustment" [Unused] ! long_name: Adjustment needed to balance net global salt flux into ocean at surface - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 "ocean_model", "vprec_global_adjustment" [Unused] ! long_name: Adjustment needed to adjust net vprec into ocean to zero - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 "ocean_model", "net_fresh_water_global_adjustment" [Unused] ! long_name: Adjustment needed to adjust net fresh water into ocean to zero - ! units: kilogram/(meter^2 * second) + ! units: kg m-2 s-1 "ocean_model", "salt_flux_global_restoring_scaling" [Unused] ! long_name: Scaling applied to balance net global salt flux into ocean at surface - ! units: (nondim) + ! units: nondim "ocean_model", "vprec_global_scaling" [Unused] ! long_name: Scaling applied to adjust net vprec into ocean to zero - ! units: (nondim) + ! units: nondim "ocean_model", "net_fresh_water_global_scaling" [Unused] ! long_name: Scaling applied to adjust net fresh water into ocean to zero - ! units: (nondim) + ! units: nondim "ocean_model", "total_salt_flux" [Used] ! long_name: Area integrated surface salt flux ! units: kg diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index b838db3c28..d8be1f3d9f 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -964,6 +964,10 @@ DTBT = 25.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 0.0 ! [m2 s-1] default = 0.0 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 978374a023..72af51c255 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -1060,6 +1060,10 @@ DTBT = -0.98 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 2948b8e05e..cacd4b09bc 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -1113,6 +1113,10 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 10.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 0c9f3b0b71..be78f5b72a 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -961,6 +961,10 @@ DTBT = 60.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 500.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 1f637e16c7..c5f5148cc4 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -1060,6 +1060,10 @@ DTBT = 60.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 500.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 7a783aa022..8ccf630622 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -992,6 +992,10 @@ DTBT = 10.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 500.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index b055f38435..ca86c068a2 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -1135,6 +1135,10 @@ DTBT = 10.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 500.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 8bcbf3b4bc..cbfeae3ba8 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -1089,6 +1089,10 @@ DTBT = 10.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 500.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 70796aaf7f..f36bc65e4d 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -1089,6 +1089,10 @@ DTBT = 10.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 500.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 1f07052b3d..b97f4b79d9 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -1422,7 +1422,7 @@ LT_MOD_LAC4 = 0.95 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.95 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.short b/ocean_only/single_column/EPBL/MOM_parameter_doc.short index d303bf9ec0..ab32e7a178 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.short +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.short @@ -384,7 +384,7 @@ RECLAIM_FRAZIL = False ! [Boolean] default = True ! the freezing point. ! === module MOM_energetic_PBL === -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 09e69ddc25..7e21897a9e 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -967,6 +967,10 @@ DTBT = 10.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 500.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 394e975264..bab55fd9f1 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -1112,6 +1112,10 @@ DTBT = 10.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 500.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 609e767955..0de1b8b662 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -1066,6 +1066,10 @@ DTBT = 10.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 500.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index fcf0996248..a8c4f81612 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -968,6 +968,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 034505bdcf..6689da7829 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -1124,6 +1124,10 @@ DTBT = 5.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index a4b467d910..de6f84c49e 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -1078,6 +1078,10 @@ DTBT = 5.0 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH = 0.0 ! [m2 s-1] default = 0.0 diff --git a/src/MOM6 b/src/MOM6 index 776212307a..56f2100714 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 776212307ae15b17fb48ead11c89fdffd5b9830d +Subproject commit 56f2100714597a769e56bd2f8dd821264c7fe912 From 0ad7ba97c55f53eb94afecbccf5cc60a003065f0 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 25 Sep 2017 09:26:34 -0400 Subject: [PATCH 35/89] *OM4: Recover CM4 2017.07.05 answers - Changed OM4 configs to use BT_USE_OLD_CORIOLIS_BRACKET_BUG = True which recovers the answers prior to a fix for asymmetry in parenthesis between the u and v Coriolis terms. - Previous answers were tagged dev/master/2017.07.05 but these are only recoverable for Intel which retained answers when we changed platform from c3 to c4 (Aug 25, 2017). - Allows CM4/OM4 to use latest on dev/gfdl which includes a lot of fixes for requested diagnostics. --- ice_ocean_SIS2/OM4_025/MOM_input | 4 ++++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short | 4 ++++ ice_ocean_SIS2/OM4_05/MOM_input | 4 ++++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 2 +- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 4 ++++ 6 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/MOM_input b/ice_ocean_SIS2/OM4_025/MOM_input index 63f2891f4f..85f236b4a3 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_input +++ b/ice_ocean_SIS2/OM4_025/MOM_input @@ -524,6 +524,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = True ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH_MAX_CFL = 0.1 ! [nondimensional] default = 0.8 diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index ac1c216a26..777ad79b10 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1320,7 +1320,7 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. -BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False +BT_USE_OLD_CORIOLIS_BRACKET_BUG = True ! [Boolean] default = False ! If True, use an order of operations that is not bitwise ! rotationally symmetric in the meridional Coriolis term of ! the barotropic solver. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index a0ad58a602..4112d64e9a 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -515,6 +515,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = True ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH_MAX_CFL = 0.1 ! [nondimensional] default = 0.8 diff --git a/ice_ocean_SIS2/OM4_05/MOM_input b/ice_ocean_SIS2/OM4_05/MOM_input index 7bc9083d05..1eb98c147c 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_input +++ b/ice_ocean_SIS2/OM4_05/MOM_input @@ -534,6 +534,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = True ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH_MAX_CFL = 0.1 ! [nondimensional] default = 0.8 diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 2dcedde5e4..65411c0396 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1323,7 +1323,7 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. -BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False +BT_USE_OLD_CORIOLIS_BRACKET_BUG = True ! [Boolean] default = False ! If True, use an order of operations that is not bitwise ! rotationally symmetric in the meridional Coriolis term of ! the barotropic solver. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index c74f841a89..c405657f15 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -534,6 +534,10 @@ DTBT = -0.9 ! [s or nondim] default = -0.98 ! Setting DTBT to 0 is the same as setting it to -0.98. ! The value of DTBT that will actually be used is an ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = True ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. ! === module MOM_thickness_diffuse === KHTH_MAX_CFL = 0.1 ! [nondimensional] default = 0.8 From e7028e0339722cc6e4742a742de1e8fc4a94333a Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 25 Sep 2017 10:37:36 -0400 Subject: [PATCH 36/89] OM4: (*)Cleanup MOM_input - Synced formatting of MOM_input to minimize differences with MOM_parameter_doc.short - OM4_025 now has the same MEKE settings as OM4_05 even though MEKE is not active in OM4_025. This helps minimize the differences between OM4_05 and OM4_025 parameter files. --- ice_ocean_SIS2/OM4_025/MOM_input | 16 ++++++++++++---- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 6 +++--- .../OM4_025/MOM_parameter_doc.short | 8 ++++++++ ice_ocean_SIS2/OM4_05/MOM_input | 19 ++++++++++++++----- 4 files changed, 37 insertions(+), 12 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/MOM_input b/ice_ocean_SIS2/OM4_025/MOM_input index 85f236b4a3..2eb4b1aecb 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_input +++ b/ice_ocean_SIS2/OM4_025/MOM_input @@ -314,14 +314,14 @@ Z_INIT_ALE_REMAPPING = True ! [Boolean] default = False NUM_DIAG_COORDS = 2 ! default = 1 ! The number of diagnostic vertical coordinates to use. ! For each coordinate, an entry in DIAG_COORDS must be provided. -DIAG_COORDS = "z Z ZSTAR,rho2 RHO2 RHO" ! default = "z Z ZSTAR" +DIAG_COORDS = "z Z ZSTAR", "rho2 RHO2 RHO" ! ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string - ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". + ! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME". DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09" ! Determines how to specify the coordinate ! resolution. Valid options are: - ! PARAM - use the vector-parameter DIAG_COORD_RES_Z + ! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2 ! UNIFORM[:N] - uniformly distributed ! FILE:string - read from a file. The string specifies ! the filename and variable name, separated @@ -345,6 +345,14 @@ MEKE_GMCOEFF = 1.0 ! [nondim] default = -1.0 ! used or calculated. MEKE_BGSRC = 1.0E-13 ! [W kg-1] default = 0.0 ! A background energy source for MEKE. +MEKE_KHMEKE_FAC = 1.0 ! [nondim] default = 0.0 + ! A factor that maps MEKE%Kh to Kh for MEKE itself. +MEKE_ALPHA_RHINES = 0.15 ! [nondim] default = 0.05 + ! If positive, is a coefficient weighting the Rhines scale + ! in the expression for mixing length used in MEKE-derived diffusiviity. +MEKE_ALPHA_EADY = 0.15 ! [nondim] default = 0.05 + ! If positive, is a coefficient weighting the Eady length scale + ! in the expression for mixing length used in MEKE-derived diffusiviity. ! === module MOM_lateral_mixing_coeffs === USE_VARIABLE_MIXING = True ! [Boolean] default = False @@ -748,7 +756,7 @@ LT_MOD_LAC4 = 0.0 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.22 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 777ad79b10..d532512d27 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -735,7 +735,7 @@ MEKE_KHTH_FAC = 0.0 ! [nondim] default = 0.0 ! A factor that maps MEKE%Kh to KhTh. MEKE_KHTR_FAC = 0.0 ! [nondim] default = 0.0 ! A factor that maps MEKE%Kh to KhTr. -MEKE_KHMEKE_FAC = 0.0 ! [nondim] default = 0.0 +MEKE_KHMEKE_FAC = 1.0 ! [nondim] default = 0.0 ! A factor that maps MEKE%Kh to Kh for MEKE itself. MEKE_OLD_LSCALE = False ! [Boolean] default = False ! If true, use the old formula for length scale which is @@ -755,10 +755,10 @@ MEKE_FIXED_MIXING_LENGTH = 0.0 ! [m] default = 0.0 MEKE_ALPHA_DEFORM = 0.0 ! [nondim] default = 0.0 ! If positive, is a coefficient weighting the deformation scale ! in the expression for mixing length used in MEKE-derived diffusiviity. -MEKE_ALPHA_RHINES = 0.05 ! [nondim] default = 0.05 +MEKE_ALPHA_RHINES = 0.15 ! [nondim] default = 0.05 ! If positive, is a coefficient weighting the Rhines scale ! in the expression for mixing length used in MEKE-derived diffusiviity. -MEKE_ALPHA_EADY = 0.05 ! [nondim] default = 0.05 +MEKE_ALPHA_EADY = 0.15 ! [nondim] default = 0.05 ! If positive, is a coefficient weighting the Eady length scale ! in the expression for mixing length used in MEKE-derived diffusiviity. MEKE_ALPHA_FRICT = 0.0 ! [nondim] default = 0.0 diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index 4112d64e9a..184d96d568 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -336,6 +336,14 @@ MEKE_GMCOEFF = 1.0 ! [nondim] default = -1.0 ! used or calculated. MEKE_BGSRC = 1.0E-13 ! [W kg-1] default = 0.0 ! A background energy source for MEKE. +MEKE_KHMEKE_FAC = 1.0 ! [nondim] default = 0.0 + ! A factor that maps MEKE%Kh to Kh for MEKE itself. +MEKE_ALPHA_RHINES = 0.15 ! [nondim] default = 0.05 + ! If positive, is a coefficient weighting the Rhines scale + ! in the expression for mixing length used in MEKE-derived diffusiviity. +MEKE_ALPHA_EADY = 0.15 ! [nondim] default = 0.05 + ! If positive, is a coefficient weighting the Eady length scale + ! in the expression for mixing length used in MEKE-derived diffusiviity. ! === module MOM_lateral_mixing_coeffs === USE_VARIABLE_MIXING = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_05/MOM_input b/ice_ocean_SIS2/OM4_05/MOM_input index 1eb98c147c..f6a4784d2b 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_input +++ b/ice_ocean_SIS2/OM4_05/MOM_input @@ -1,4 +1,13 @@ -! This file was written by the model and records the non-default parameters used at run-time. +/* This input file provides the adjustable run-time parameters for version 6 of + the Modular Ocean Model (MOM6), a numerical ocean model developed at NOAA-GFDL. + Where appropriate, parameters use usually given in MKS units. + + This particular file is for the example in OM4_05. + + This MOM_input file typically contains only the non-default values that are + needed to reproduce this example. A full list of parameters for this example + can be found in the corresponding MOM_parameter_doc.all file which is + generated by the model at run-time. */ ! === module MOM === USE_REGRIDDING = True ! [Boolean] default = False @@ -306,14 +315,14 @@ Z_INIT_REMAP_GENERAL = True ! [Boolean] default = False NUM_DIAG_COORDS = 2 ! default = 1 ! The number of diagnostic vertical coordinates to use. ! For each coordinate, an entry in DIAG_COORDS must be provided. -DIAG_COORDS = "z Z ZSTAR,rho2 RHO2 RHO" ! default = "z Z ZSTAR" +DIAG_COORDS = "z Z ZSTAR", "rho2 RHO2 RHO" ! ! A list of string tuples associating diag_table modules to ! a coordinate definition used for diagnostics. Each string - ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". + ! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME". DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default = "WOA09" ! Determines how to specify the coordinate ! resolution. Valid options are: - ! PARAM - use the vector-parameter DIAG_COORD_RES_Z + ! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2 ! UNIFORM[:N] - uniformly distributed ! FILE:string - read from a file. The string specifies ! the filename and variable name, separated @@ -768,7 +777,7 @@ LT_MOD_LAC4 = 0.0 ! [nondim] default = 0.95 LT_MOD_LAC5 = 0.22 ! [nondim] default = 0.95 ! Coefficient for modification of Langmuir number due to ! ratio of Ekman to unstable Obukhov depth if LT_ENHANCE=2. -EPBL_USTAR_MIN = 1.45842E-18 ! [meter second-1] +EPBL_USTAR_MIN = 1.45842E-18 ! [m s-1] ! The (tiny) minimum friction velocity used within the ! ePBL code, derived from OMEGA and ANGSTROM. From 1673fc7e971e23c4b195c2b25a0175fb0bb11fff Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 25 Sep 2017 11:51:50 -0400 Subject: [PATCH 37/89] *OM4_025: Updates baseline to final OM4.0 configuration - Turns on geothermal heating - Switch MLE to 500m frontal length scale - Background Kd = 1.5e-5 m2 s-1 --- ice_ocean_SIS2/OM4_025/MOM_input | 25 +++++++++++-- ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 36 ++++++++++++++----- .../OM4_025/MOM_parameter_doc.short | 25 +++++++++++-- 3 files changed, 71 insertions(+), 15 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/MOM_input b/ice_ocean_SIS2/OM4_025/MOM_input index 2eb4b1aecb..91afb2071f 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_input +++ b/ice_ocean_SIS2/OM4_025/MOM_input @@ -47,6 +47,8 @@ FRAZIL = True ! [Boolean] default = False ! the accumulated heat deficit is returned in the ! surface state. FRAZIL is only used if ! ENABLE_THERMODYNAMICS is true. +DO_GEOTHERMAL = True ! [Boolean] default = False + ! If true, apply geothermal heating. BOUND_SALINITY = True ! [Boolean] default = False ! If true, limit salinity to being positive. (The sea-ice ! model may ask for more salt than is available and @@ -551,7 +553,7 @@ MIXEDLAYER_RESTRAT = True ! [Boolean] default = False ! flow is imposed in the mixed layer. Can be used in ALE mode ! without restriction but in layer mode can only be used if ! BULKMIXEDLAYER is true. -FOX_KEMPER_ML_RESTRAT_COEF = 15.0 ! [nondim] default = 0.0 +FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! A nondimensional coefficient that is proportional to ! the ratio of the deformation radius to the dominant ! lengthscale of the submesoscale mixed layer @@ -560,6 +562,11 @@ FOX_KEMPER_ML_RESTRAT_COEF = 15.0 ! [nondim] default = 0.0 ! geostrophic kinetic energy or 1 plus the square of the ! grid spacing over the deformation radius, as detailed ! by Fox-Kemper et al. (2010) +MLE_FRONT_LENGTH = 500.0 ! [m] default = 0.0 + ! If non-zero, is the frontal-length scale used to calculate the + ! upscaling of buoyancy gradients that is otherwise represented + ! by the parameter FOX_KEMPER_ML_RESTRAT_COEF. If MLE_FRONT_LENGTH is + ! non-zero, it is recommended to set FOX_KEMPER_ML_RESTRAT_COEF=1.0. MLE_USE_PBL_MLD = True ! [Boolean] default = False ! If true, the MLE parameterization will use the mixed-layer ! depth provided by the active PBL parameterization. If false, @@ -603,6 +610,18 @@ CONVECTION% ! === module MOM_entrain_diffusive === +! === module MOM_geothermal === +GEOTHERMAL_SCALE = 1.0 ! [W m-2 or various] default = 0.0 + ! The constant geothermal heat flux, a rescaling + ! factor for the heat flux read from GEOTHERMAL_FILE, or + ! 0 to disable the geothermal heating. +GEOTHERMAL_FILE = "geothermal_davies2013_v1.nc" ! default = "" + ! The file from which the geothermal heating is to be + ! read, or blank to use a constant heating rate. +GEOTHERMAL_VARNAME = "geothermal_hf" ! default = "geo_heat" + ! The name of the geothermal heating variable in + ! GEOTHERMAL_FILE. + ! === module MOM_set_diffusivity === BBL_MIXING_AS_MAX = False ! [Boolean] default = True ! If true, take the maximum of the diffusivity from the @@ -624,11 +643,11 @@ N2_FLOOR_IOMEGA2 = 0.0 ! [nondim] default = 1.0 ! The floor applied to N2(k) scaled by Omega^2: ! If =0., N2(k) is simply positive definite. ! If =1., N2(k) > Omega^2 everywhere. -KD = 2.0E-05 ! [m2 s-1] +KD = 1.5E-05 ! [m2 s-1] ! The background diapycnal diffusivity of density in the ! interior. Zero or the molecular value, ~1e-7 m2 s-1, ! may be used. -KD_MIN = 2.0E-06 ! [m2 s-1] default = 2.0E-07 +KD_MIN = 2.0E-06 ! [m2 s-1] default = 1.5E-07 ! The minimum diapycnal diffusivity. KD_MAX = 0.1 ! [m2 s-1] default = -1.0 ! The maximum permitted increment for the diapycnal diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index d532512d27..fe693164ba 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -113,7 +113,7 @@ FRAZIL = True ! [Boolean] default = False ! the accumulated heat deficit is returned in the ! surface state. FRAZIL is only used if ! ENABLE_THERMODYNAMICS is true. -DO_GEOTHERMAL = False ! [Boolean] default = False +DO_GEOTHERMAL = True ! [Boolean] default = False ! If true, apply geothermal heating. BOUND_SALINITY = True ! [Boolean] default = False ! If true, limit salinity to being positive. (The sea-ice @@ -1355,7 +1355,7 @@ MIXEDLAYER_RESTRAT = True ! [Boolean] default = False ! flow is imposed in the mixed layer. Can be used in ALE mode ! without restriction but in layer mode can only be used if ! BULKMIXEDLAYER is true. -FOX_KEMPER_ML_RESTRAT_COEF = 15.0 ! [nondim] default = 0.0 +FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! A nondimensional coefficient that is proportional to ! the ratio of the deformation radius to the dominant ! lengthscale of the submesoscale mixed layer @@ -1367,7 +1367,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 15.0 ! [nondim] default = 0.0 FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 ! As for FOX_KEMPER_ML_RESTRAT_COEF but used in a second application ! of the MLE restratification parameterization. -MLE_FRONT_LENGTH = 0.0 ! [m] default = 0.0 +MLE_FRONT_LENGTH = 500.0 ! [m] default = 0.0 ! If non-zero, is the frontal-length scale used to calculate the ! upscaling of buoyancy gradients that is otherwise represented ! by the parameter FOX_KEMPER_ML_RESTRAT_COEF. If MLE_FRONT_LENGTH is @@ -1441,7 +1441,7 @@ MIX_BOUNDARY_TRACERS = True ! [Boolean] default = True ! If true, mix the passive tracers in massless layers at ! the bottom into the interior as though a diffusivity of ! KD_MIN_TR were operating. -KD_MIN_TR = 2.0E-06 ! [m2 s-1] default = 2.0E-06 +KD_MIN_TR = 1.5E-06 ! [m2 s-1] default = 1.5E-06 ! A minimal diffusivity that should always be applied to ! tracers, especially in massless layers near the bottom. ! The default is 0.1*KD. @@ -1500,9 +1500,27 @@ CORRECT_DENSITY = True ! [Boolean] default = True MAX_ENT_IT = 5 ! default = 5 ! The maximum number of iterations that may be used to ! calculate the interior diapycnal entrainment. -TOLERANCE_ENT = 1.341640786499874E-05 ! [m] default = 1.341640786499874E-05 +TOLERANCE_ENT = 1.161895003862225E-05 ! [m] default = 1.161895003862225E-05 ! The tolerance with which to solve for entrainment values. +! === module MOM_geothermal === +GEOTHERMAL_SCALE = 1.0 ! [W m-2 or various] default = 0.0 + ! The constant geothermal heat flux, a rescaling + ! factor for the heat flux read from GEOTHERMAL_FILE, or + ! 0 to disable the geothermal heating. +GEOTHERMAL_FILE = "geothermal_davies2013_v1.nc" ! default = "" + ! The file from which the geothermal heating is to be + ! read, or blank to use a constant heating rate. +GEOTHERMAL_THICKNESS = 0.1 ! [m] default = 0.1 + ! The thickness over which to apply geothermal heating. +GEOTHERMAL_DRHO_DT_INPLACE = -0.01 ! [kg m-3 K-1] default = -0.01 + ! The value of drho_dT above which geothermal heating + ! simply heats water in place instead of moving it between + ! isopycnal layers. This must be negative. +GEOTHERMAL_VARNAME = "geothermal_hf" ! default = "geo_heat" + ! The name of the geothermal heating variable in + ! GEOTHERMAL_FILE. + ! === module MOM_set_diffusivity === FLUX_RI_MAX = 0.2 ! [not defined] default = 0.2 ! The flux Richardson number where the stratification is @@ -1563,11 +1581,11 @@ KD_TANH_LAT_FN = False ! [Boolean] default = False ! like CM2.1/CM2M. There is no physical justification ! for this form, and it can not be used with ! HENYEY_IGW_BACKGROUND. -KD = 2.0E-05 ! [m2 s-1] +KD = 1.5E-05 ! [m2 s-1] ! The background diapycnal diffusivity of density in the ! interior. Zero or the molecular value, ~1e-7 m2 s-1, ! may be used. -KD_MIN = 2.0E-06 ! [m2 s-1] default = 2.0E-07 +KD_MIN = 2.0E-06 ! [m2 s-1] default = 1.5E-07 ! The minimum diapycnal diffusivity. KD_MAX = 0.1 ! [m2 s-1] default = -1.0 ! The maximum permitted increment for the diapycnal @@ -1576,7 +1594,7 @@ KD_MAX = 0.1 ! [m2 s-1] default = -1.0 KD_ADD = 0.0 ! [m2 s-1] default = 0.0 ! A uniform diapycnal diffusivity that is added ! everywhere without any filtering or scaling. -KDML = 2.0E-05 ! [m2 s-1] default = 2.0E-05 +KDML = 1.5E-05 ! [m2 s-1] default = 1.5E-05 ! If BULKMIXEDLAYER is false, KDML is the elevated ! diapycnal diffusivity in the topmost HMIX of fluid. ! KDML is only used if BULKMIXEDLAYER is false. @@ -1685,7 +1703,7 @@ SHEARMIX_RATE = 0.089 ! [nondim] default = 0.089 MAX_RINO_IT = 25 ! [nondim] default = 50 ! The maximum number of iterations that may be used to ! estimate the Richardson number driven mixing. -KD_KAPPA_SHEAR_0 = 2.0E-05 ! [m2 s-1] default = 2.0E-05 +KD_KAPPA_SHEAR_0 = 1.5E-05 ! [m2 s-1] default = 1.5E-05 ! The background diffusivity that is used to smooth the ! density and shear profiles before solving for the ! diffusivities. Defaults to value of KD. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short index 184d96d568..92726f1577 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short @@ -38,6 +38,8 @@ FRAZIL = True ! [Boolean] default = False ! the accumulated heat deficit is returned in the ! surface state. FRAZIL is only used if ! ENABLE_THERMODYNAMICS is true. +DO_GEOTHERMAL = True ! [Boolean] default = False + ! If true, apply geothermal heating. BOUND_SALINITY = True ! [Boolean] default = False ! If true, limit salinity to being positive. (The sea-ice ! model may ask for more salt than is available and @@ -542,7 +544,7 @@ MIXEDLAYER_RESTRAT = True ! [Boolean] default = False ! flow is imposed in the mixed layer. Can be used in ALE mode ! without restriction but in layer mode can only be used if ! BULKMIXEDLAYER is true. -FOX_KEMPER_ML_RESTRAT_COEF = 15.0 ! [nondim] default = 0.0 +FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! A nondimensional coefficient that is proportional to ! the ratio of the deformation radius to the dominant ! lengthscale of the submesoscale mixed layer @@ -551,6 +553,11 @@ FOX_KEMPER_ML_RESTRAT_COEF = 15.0 ! [nondim] default = 0.0 ! geostrophic kinetic energy or 1 plus the square of the ! grid spacing over the deformation radius, as detailed ! by Fox-Kemper et al. (2010) +MLE_FRONT_LENGTH = 500.0 ! [m] default = 0.0 + ! If non-zero, is the frontal-length scale used to calculate the + ! upscaling of buoyancy gradients that is otherwise represented + ! by the parameter FOX_KEMPER_ML_RESTRAT_COEF. If MLE_FRONT_LENGTH is + ! non-zero, it is recommended to set FOX_KEMPER_ML_RESTRAT_COEF=1.0. MLE_USE_PBL_MLD = True ! [Boolean] default = False ! If true, the MLE parameterization will use the mixed-layer ! depth provided by the active PBL parameterization. If false, @@ -594,6 +601,18 @@ CONVECTION% ! === module MOM_entrain_diffusive === +! === module MOM_geothermal === +GEOTHERMAL_SCALE = 1.0 ! [W m-2 or various] default = 0.0 + ! The constant geothermal heat flux, a rescaling + ! factor for the heat flux read from GEOTHERMAL_FILE, or + ! 0 to disable the geothermal heating. +GEOTHERMAL_FILE = "geothermal_davies2013_v1.nc" ! default = "" + ! The file from which the geothermal heating is to be + ! read, or blank to use a constant heating rate. +GEOTHERMAL_VARNAME = "geothermal_hf" ! default = "geo_heat" + ! The name of the geothermal heating variable in + ! GEOTHERMAL_FILE. + ! === module MOM_set_diffusivity === BBL_MIXING_AS_MAX = False ! [Boolean] default = True ! If true, take the maximum of the diffusivity from the @@ -615,11 +634,11 @@ N2_FLOOR_IOMEGA2 = 0.0 ! [nondim] default = 1.0 ! The floor applied to N2(k) scaled by Omega^2: ! If =0., N2(k) is simply positive definite. ! If =1., N2(k) > Omega^2 everywhere. -KD = 2.0E-05 ! [m2 s-1] +KD = 1.5E-05 ! [m2 s-1] ! The background diapycnal diffusivity of density in the ! interior. Zero or the molecular value, ~1e-7 m2 s-1, ! may be used. -KD_MIN = 2.0E-06 ! [m2 s-1] default = 2.0E-07 +KD_MIN = 2.0E-06 ! [m2 s-1] default = 1.5E-07 ! The minimum diapycnal diffusivity. KD_MAX = 0.1 ! [m2 s-1] default = -1.0 ! The maximum permitted increment for the diapycnal From 853bcbb0ef35789ee70139717e70614e335dec61 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 25 Sep 2017 13:01:48 -0400 Subject: [PATCH 38/89] *OM4_05: Update baseline to candidate OM4.configuration - Turns on geothermal heating - Switch MLE to 200m frontal length scale - Note this is 500m in OM4_025 - Background Kd = 1.5e-5 m2 s-1 - Lateral viscosity KH_VEL_SCALE - FGNV filter set to 0.1 - Closes NOAA-GFDL/MOM6-examples#172 --- ice_ocean_SIS2/OM4_05/MOM_input | 33 +++++++++++++-- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 40 ++++++++++++++----- ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short | 33 +++++++++++++-- ice_ocean_SIS2/OM4_05/SIS_input | 3 ++ ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all | 2 +- ice_ocean_SIS2/OM4_05/SIS_parameter_doc.short | 3 ++ 6 files changed, 96 insertions(+), 18 deletions(-) diff --git a/ice_ocean_SIS2/OM4_05/MOM_input b/ice_ocean_SIS2/OM4_05/MOM_input index f6a4784d2b..5a6399fc96 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_input +++ b/ice_ocean_SIS2/OM4_05/MOM_input @@ -47,6 +47,8 @@ FRAZIL = True ! [Boolean] default = False ! the accumulated heat deficit is returned in the ! surface state. FRAZIL is only used if ! ENABLE_THERMODYNAMICS is true. +DO_GEOTHERMAL = True ! [Boolean] default = False + ! If true, apply geothermal heating. BOUND_SALINITY = True ! [Boolean] default = False ! If true, limit salinity to being positive. (The sea-ice ! model may ask for more salt than is available and @@ -479,6 +481,11 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. +KH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 + ! The velocity scale which is multiplied by the grid + ! spacing to calculate the Laplacian viscosity. + ! The final viscosity is the largest of this scaled + ! viscosity, the Smagorinsky and Leith viscosities, and KH. AH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the cube of ! the grid spacing to calculate the biharmonic viscosity. @@ -559,6 +566,9 @@ KHTH_USE_FGNV_STREAMFUNCTION = True ! [Boolean] default = False ! If true, use the streamfunction formulation of ! Ferrari et al., 2010, which effectively emphasizes ! graver vertical modes by smoothing in the vertical. +FGNV_FILTER_SCALE = 0.1 ! [not defined] default = 1.0 + ! A coefficient scaling the vertical smoothing term in the + ! Ferrari et al., 2010, streamfunction formulation. ! === module MOM_mixed_layer_restrat === MIXEDLAYER_RESTRAT = True ! [Boolean] default = False @@ -566,7 +576,7 @@ MIXEDLAYER_RESTRAT = True ! [Boolean] default = False ! flow is imposed in the mixed layer. Can be used in ALE mode ! without restriction but in layer mode can only be used if ! BULKMIXEDLAYER is true. -FOX_KEMPER_ML_RESTRAT_COEF = 30.0 ! [nondim] default = 0.0 +FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! A nondimensional coefficient that is proportional to ! the ratio of the deformation radius to the dominant ! lengthscale of the submesoscale mixed layer @@ -575,6 +585,11 @@ FOX_KEMPER_ML_RESTRAT_COEF = 30.0 ! [nondim] default = 0.0 ! geostrophic kinetic energy or 1 plus the square of the ! grid spacing over the deformation radius, as detailed ! by Fox-Kemper et al. (2010) +MLE_FRONT_LENGTH = 200.0 ! [m] default = 0.0 + ! If non-zero, is the frontal-length scale used to calculate the + ! upscaling of buoyancy gradients that is otherwise represented + ! by the parameter FOX_KEMPER_ML_RESTRAT_COEF. If MLE_FRONT_LENGTH is + ! non-zero, it is recommended to set FOX_KEMPER_ML_RESTRAT_COEF=1.0. MLE_USE_PBL_MLD = True ! [Boolean] default = False ! If true, the MLE parameterization will use the mixed-layer ! depth provided by the active PBL parameterization. If false, @@ -618,6 +633,18 @@ CONVECTION% ! === module MOM_entrain_diffusive === +! === module MOM_geothermal === +GEOTHERMAL_SCALE = 1.0 ! [W m-2 or various] default = 0.0 + ! The constant geothermal heat flux, a rescaling + ! factor for the heat flux read from GEOTHERMAL_FILE, or + ! 0 to disable the geothermal heating. +GEOTHERMAL_FILE = "geothermal_davies2013_v1.nc" ! default = "" + ! The file from which the geothermal heating is to be + ! read, or blank to use a constant heating rate. +GEOTHERMAL_VARNAME = "geothermal_hf" ! default = "geo_heat" + ! The name of the geothermal heating variable in + ! GEOTHERMAL_FILE. + ! === module MOM_set_diffusivity === BBL_MIXING_AS_MAX = False ! [Boolean] default = True ! If true, take the maximum of the diffusivity from the @@ -639,11 +666,11 @@ N2_FLOOR_IOMEGA2 = 0.0 ! [nondim] default = 1.0 ! The floor applied to N2(k) scaled by Omega^2: ! If =0., N2(k) is simply positive definite. ! If =1., N2(k) > Omega^2 everywhere. -KD = 2.0E-05 ! [m2 s-1] +KD = 1.5E-05 ! [m2 s-1] ! The background diapycnal diffusivity of density in the ! interior. Zero or the molecular value, ~1e-7 m2 s-1, ! may be used. -KD_MIN = 2.0E-06 ! [m2 s-1] default = 2.0E-07 +KD_MIN = 2.0E-06 ! [m2 s-1] default = 1.5E-07 ! The minimum diapycnal diffusivity. KD_MAX = 0.1 ! [m2 s-1] default = -1.0 ! The maximum permitted increment for the diapycnal diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 65411c0396..29313461f5 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -113,7 +113,7 @@ FRAZIL = True ! [Boolean] default = False ! the accumulated heat deficit is returned in the ! surface state. FRAZIL is only used if ! ENABLE_THERMODYNAMICS is true. -DO_GEOTHERMAL = False ! [Boolean] default = False +DO_GEOTHERMAL = True ! [Boolean] default = False ! If true, apply geothermal heating. BOUND_SALINITY = True ! [Boolean] default = False ! If true, limit salinity to being positive. (The sea-ice @@ -1082,7 +1082,7 @@ KH = 0.0 ! [m2 s-1] default = 0.0 ! The background Laplacian horizontal viscosity. KH_BG_MIN = 0.0 ! [m2 s-1] default = 0.0 ! The minimum value allowed for Laplacian horizontal viscosity, KH. -KH_VEL_SCALE = 0.0 ! [m s-1] default = 0.0 +KH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the grid ! spacing to calculate the Laplacian viscosity. ! The final viscosity is the largest of this scaled @@ -1351,7 +1351,7 @@ KHTH_USE_FGNV_STREAMFUNCTION = True ! [Boolean] default = False ! If true, use the streamfunction formulation of ! Ferrari et al., 2010, which effectively emphasizes ! graver vertical modes by smoothing in the vertical. -FGNV_FILTER_SCALE = 1.0 ! [not defined] default = 1.0 +FGNV_FILTER_SCALE = 0.1 ! [not defined] default = 1.0 ! A coefficient scaling the vertical smoothing term in the ! Ferrari et al., 2010, streamfunction formulation. FGNV_C_MIN = 0.0 ! [m s-1] default = 0.0 @@ -1368,7 +1368,7 @@ MIXEDLAYER_RESTRAT = True ! [Boolean] default = False ! flow is imposed in the mixed layer. Can be used in ALE mode ! without restriction but in layer mode can only be used if ! BULKMIXEDLAYER is true. -FOX_KEMPER_ML_RESTRAT_COEF = 30.0 ! [nondim] default = 0.0 +FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! A nondimensional coefficient that is proportional to ! the ratio of the deformation radius to the dominant ! lengthscale of the submesoscale mixed layer @@ -1380,7 +1380,7 @@ FOX_KEMPER_ML_RESTRAT_COEF = 30.0 ! [nondim] default = 0.0 FOX_KEMPER_ML_RESTRAT_COEF2 = 0.0 ! [nondim] default = 0.0 ! As for FOX_KEMPER_ML_RESTRAT_COEF but used in a second application ! of the MLE restratification parameterization. -MLE_FRONT_LENGTH = 0.0 ! [m] default = 0.0 +MLE_FRONT_LENGTH = 200.0 ! [m] default = 0.0 ! If non-zero, is the frontal-length scale used to calculate the ! upscaling of buoyancy gradients that is otherwise represented ! by the parameter FOX_KEMPER_ML_RESTRAT_COEF. If MLE_FRONT_LENGTH is @@ -1454,7 +1454,7 @@ MIX_BOUNDARY_TRACERS = True ! [Boolean] default = True ! If true, mix the passive tracers in massless layers at ! the bottom into the interior as though a diffusivity of ! KD_MIN_TR were operating. -KD_MIN_TR = 2.0E-06 ! [m2 s-1] default = 2.0E-06 +KD_MIN_TR = 1.5E-06 ! [m2 s-1] default = 1.5E-06 ! A minimal diffusivity that should always be applied to ! tracers, especially in massless layers near the bottom. ! The default is 0.1*KD. @@ -1513,9 +1513,27 @@ CORRECT_DENSITY = True ! [Boolean] default = True MAX_ENT_IT = 5 ! default = 5 ! The maximum number of iterations that may be used to ! calculate the interior diapycnal entrainment. -TOLERANCE_ENT = 1.897366596101028E-05 ! [m] default = 1.897366596101028E-05 +TOLERANCE_ENT = 1.643167672515498E-05 ! [m] default = 1.643167672515498E-05 ! The tolerance with which to solve for entrainment values. +! === module MOM_geothermal === +GEOTHERMAL_SCALE = 1.0 ! [W m-2 or various] default = 0.0 + ! The constant geothermal heat flux, a rescaling + ! factor for the heat flux read from GEOTHERMAL_FILE, or + ! 0 to disable the geothermal heating. +GEOTHERMAL_FILE = "geothermal_davies2013_v1.nc" ! default = "" + ! The file from which the geothermal heating is to be + ! read, or blank to use a constant heating rate. +GEOTHERMAL_THICKNESS = 0.1 ! [m] default = 0.1 + ! The thickness over which to apply geothermal heating. +GEOTHERMAL_DRHO_DT_INPLACE = -0.01 ! [kg m-3 K-1] default = -0.01 + ! The value of drho_dT above which geothermal heating + ! simply heats water in place instead of moving it between + ! isopycnal layers. This must be negative. +GEOTHERMAL_VARNAME = "geothermal_hf" ! default = "geo_heat" + ! The name of the geothermal heating variable in + ! GEOTHERMAL_FILE. + ! === module MOM_set_diffusivity === FLUX_RI_MAX = 0.2 ! [not defined] default = 0.2 ! The flux Richardson number where the stratification is @@ -1576,11 +1594,11 @@ KD_TANH_LAT_FN = False ! [Boolean] default = False ! like CM2.1/CM2M. There is no physical justification ! for this form, and it can not be used with ! HENYEY_IGW_BACKGROUND. -KD = 2.0E-05 ! [m2 s-1] +KD = 1.5E-05 ! [m2 s-1] ! The background diapycnal diffusivity of density in the ! interior. Zero or the molecular value, ~1e-7 m2 s-1, ! may be used. -KD_MIN = 2.0E-06 ! [m2 s-1] default = 2.0E-07 +KD_MIN = 2.0E-06 ! [m2 s-1] default = 1.5E-07 ! The minimum diapycnal diffusivity. KD_MAX = 0.1 ! [m2 s-1] default = -1.0 ! The maximum permitted increment for the diapycnal @@ -1589,7 +1607,7 @@ KD_MAX = 0.1 ! [m2 s-1] default = -1.0 KD_ADD = 0.0 ! [m2 s-1] default = 0.0 ! A uniform diapycnal diffusivity that is added ! everywhere without any filtering or scaling. -KDML = 2.0E-05 ! [m2 s-1] default = 2.0E-05 +KDML = 1.5E-05 ! [m2 s-1] default = 1.5E-05 ! If BULKMIXEDLAYER is false, KDML is the elevated ! diapycnal diffusivity in the topmost HMIX of fluid. ! KDML is only used if BULKMIXEDLAYER is false. @@ -1698,7 +1716,7 @@ SHEARMIX_RATE = 0.089 ! [nondim] default = 0.089 MAX_RINO_IT = 25 ! [nondim] default = 50 ! The maximum number of iterations that may be used to ! estimate the Richardson number driven mixing. -KD_KAPPA_SHEAR_0 = 2.0E-05 ! [m2 s-1] default = 2.0E-05 +KD_KAPPA_SHEAR_0 = 1.5E-05 ! [m2 s-1] default = 1.5E-05 ! The background diffusivity that is used to smooth the ! density and shear profiles before solving for the ! diffusivities. Defaults to value of KD. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short index c405657f15..0cc9b06296 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short @@ -38,6 +38,8 @@ FRAZIL = True ! [Boolean] default = False ! the accumulated heat deficit is returned in the ! surface state. FRAZIL is only used if ! ENABLE_THERMODYNAMICS is true. +DO_GEOTHERMAL = True ! [Boolean] default = False + ! If true, apply geothermal heating. BOUND_SALINITY = True ! [Boolean] default = False ! If true, limit salinity to being positive. (The sea-ice ! model may ask for more salt than is available and @@ -470,6 +472,11 @@ MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! === module MOM_hor_visc === LAPLACIAN = True ! [Boolean] default = False ! If true, use a Laplacian horizontal viscosity. +KH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 + ! The velocity scale which is multiplied by the grid + ! spacing to calculate the Laplacian viscosity. + ! The final viscosity is the largest of this scaled + ! viscosity, the Smagorinsky and Leith viscosities, and KH. AH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 ! The velocity scale which is multiplied by the cube of ! the grid spacing to calculate the biharmonic viscosity. @@ -550,6 +557,9 @@ KHTH_USE_FGNV_STREAMFUNCTION = True ! [Boolean] default = False ! If true, use the streamfunction formulation of ! Ferrari et al., 2010, which effectively emphasizes ! graver vertical modes by smoothing in the vertical. +FGNV_FILTER_SCALE = 0.1 ! [not defined] default = 1.0 + ! A coefficient scaling the vertical smoothing term in the + ! Ferrari et al., 2010, streamfunction formulation. ! === module MOM_mixed_layer_restrat === MIXEDLAYER_RESTRAT = True ! [Boolean] default = False @@ -557,7 +567,7 @@ MIXEDLAYER_RESTRAT = True ! [Boolean] default = False ! flow is imposed in the mixed layer. Can be used in ALE mode ! without restriction but in layer mode can only be used if ! BULKMIXEDLAYER is true. -FOX_KEMPER_ML_RESTRAT_COEF = 30.0 ! [nondim] default = 0.0 +FOX_KEMPER_ML_RESTRAT_COEF = 1.0 ! [nondim] default = 0.0 ! A nondimensional coefficient that is proportional to ! the ratio of the deformation radius to the dominant ! lengthscale of the submesoscale mixed layer @@ -566,6 +576,11 @@ FOX_KEMPER_ML_RESTRAT_COEF = 30.0 ! [nondim] default = 0.0 ! geostrophic kinetic energy or 1 plus the square of the ! grid spacing over the deformation radius, as detailed ! by Fox-Kemper et al. (2010) +MLE_FRONT_LENGTH = 200.0 ! [m] default = 0.0 + ! If non-zero, is the frontal-length scale used to calculate the + ! upscaling of buoyancy gradients that is otherwise represented + ! by the parameter FOX_KEMPER_ML_RESTRAT_COEF. If MLE_FRONT_LENGTH is + ! non-zero, it is recommended to set FOX_KEMPER_ML_RESTRAT_COEF=1.0. MLE_USE_PBL_MLD = True ! [Boolean] default = False ! If true, the MLE parameterization will use the mixed-layer ! depth provided by the active PBL parameterization. If false, @@ -609,6 +624,18 @@ CONVECTION% ! === module MOM_entrain_diffusive === +! === module MOM_geothermal === +GEOTHERMAL_SCALE = 1.0 ! [W m-2 or various] default = 0.0 + ! The constant geothermal heat flux, a rescaling + ! factor for the heat flux read from GEOTHERMAL_FILE, or + ! 0 to disable the geothermal heating. +GEOTHERMAL_FILE = "geothermal_davies2013_v1.nc" ! default = "" + ! The file from which the geothermal heating is to be + ! read, or blank to use a constant heating rate. +GEOTHERMAL_VARNAME = "geothermal_hf" ! default = "geo_heat" + ! The name of the geothermal heating variable in + ! GEOTHERMAL_FILE. + ! === module MOM_set_diffusivity === BBL_MIXING_AS_MAX = False ! [Boolean] default = True ! If true, take the maximum of the diffusivity from the @@ -630,11 +657,11 @@ N2_FLOOR_IOMEGA2 = 0.0 ! [nondim] default = 1.0 ! The floor applied to N2(k) scaled by Omega^2: ! If =0., N2(k) is simply positive definite. ! If =1., N2(k) > Omega^2 everywhere. -KD = 2.0E-05 ! [m2 s-1] +KD = 1.5E-05 ! [m2 s-1] ! The background diapycnal diffusivity of density in the ! interior. Zero or the molecular value, ~1e-7 m2 s-1, ! may be used. -KD_MIN = 2.0E-06 ! [m2 s-1] default = 2.0E-07 +KD_MIN = 2.0E-06 ! [m2 s-1] default = 1.5E-07 ! The minimum diapycnal diffusivity. KD_MAX = 0.1 ! [m2 s-1] default = -1.0 ! The maximum permitted increment for the diapycnal diff --git a/ice_ocean_SIS2/OM4_05/SIS_input b/ice_ocean_SIS2/OM4_05/SIS_input index 584b534c50..f462bb47f6 100644 --- a/ice_ocean_SIS2/OM4_05/SIS_input +++ b/ice_ocean_SIS2/OM4_05/SIS_input @@ -82,6 +82,9 @@ DT_RHEOLOGY = 50.0 ! [seconds] default = -1.0 ! The sub-cycling time step for iterating the rheology ! and ice momentum equations. If DT_RHEOLOGY is negative, ! the time step is set via NSTEPS_DYN. +MIN_OCN_INTERTIAL_H = 2.0 ! [m] default = 0.0 + ! A minimum ocean thickness used to limit the viscous coupling rate + ! implied for the ocean by the ice-ocean stress. Only used if positive. SIS_THICKNESS_ADVECTION_SCHEME = "PCM" ! default = "UPWIND_2D" ! The horizontal transport scheme for thickness: ! UPWIND_2D - Non-directionally split upwind diff --git a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all index 0a81ac7d5e..dc44468bc3 100644 --- a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all @@ -371,7 +371,7 @@ ICE_STRENGTH_CSTAR = 20.0 ! [nondim] default = 20.0 ! ice strength, c* in Hunke & Dukowicz 1997. ICE_CDRAG_WATER = 0.00324 ! [nondim] default = 0.00324 ! The drag coefficient between the sea ice and water. -MIN_OCN_INTERTIAL_H = 0.0 ! [m] default = 0.0 +MIN_OCN_INTERTIAL_H = 2.0 ! [m] default = 0.0 ! A minimum ocean thickness used to limit the viscous coupling rate ! implied for the ocean by the ice-ocean stress. Only used if positive. ICE_DEL_SH_MIN_SCALE = 2.0 ! [nondim] default = 2.0 diff --git a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.short b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.short index 7c25629f31..66ea98838d 100644 --- a/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.short +++ b/ice_ocean_SIS2/OM4_05/SIS_parameter_doc.short @@ -103,6 +103,9 @@ DT_RHEOLOGY = 50.0 ! [seconds] default = -1.0 ! The sub-cycling time step for iterating the rheology ! and ice momentum equations. If DT_RHEOLOGY is negative, ! the time step is set via NSTEPS_DYN. +MIN_OCN_INTERTIAL_H = 2.0 ! [m] default = 0.0 + ! A minimum ocean thickness used to limit the viscous coupling rate + ! implied for the ocean by the ice-ocean stress. Only used if positive. SIS_THICKNESS_ADVECTION_SCHEME = "PCM" ! default = "UPWIND_2D" ! The horizontal transport scheme for thickness: ! UPWIND_2D - Non-directionally split upwind From f63875d5a7aec79b41eadd26874f8ac1fb8a56e5 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Tue, 26 Sep 2017 11:54:42 -0400 Subject: [PATCH 39/89] MOM6: Merge branch 'ashao-fix_T_S_flux_diags' into dev/gfdl - Updates available_diags - NOAA-GFDL/MOM6@e1e193a Merge branch 'ashao-fix_T_S_flux_diags' into dev/gfdl - NOAA-GFDL/MOM6@0670427 Corrected heat flux units to CMIP6 compliant - NOAA-GFDL/MOM6@1d5bce7 Merge branch 'fix_T_S_flux_diags' of https://github.com/ashao/MOM6 into ashao-fix_T_S_flux_diags - NOAA-GFDL/MOM6@ab3d98f Merge pull request #613 from ashao/diag_mask_conversion - NOAA-GFDL/MOM6@edfc6d5 Merge conflict with upstream dev/gfdl - NOAA-GFDL/MOM6@1e2894a Apply conversion field for diagnostics only on non-missing values - NOAA-GFDL/MOM6@1e6915f Fix T/S advective and horizontal diffusive fluxes and change T units --- .../global_ALE/layer/available_diags.000000 | 104 +++++++++--------- .../global_ALE/z/available_diags.000000 | 104 +++++++++--------- src/MOM6 | 2 +- 3 files changed, 105 insertions(+), 105 deletions(-) diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index d7af4645a7..ddcdf29027 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -2861,147 +2861,147 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "T_adx" [Used] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xq:point yh:mean zl:mean + ! units: W m-2 + ! cell_methods: xq:point yh:mean zl:sum "ocean_model", "T_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: zl:mean + ! units: W m-2 + ! cell_methods: zl:sum "ocean_model_z", "T_adx" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xq:point yh:mean z_l:mean + ! units: W m-2 + ! cell_methods: xq:point yh:mean z_l:sum "ocean_model_z", "T_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: z_l:mean + ! units: W m-2 + ! cell_methods: z_l:sum "ocean_model", "T_ady" [Used] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xh:mean yq:point zl:mean + ! units: W m-2 + ! cell_methods: xh:mean yq:point zl:sum "ocean_model", "T_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: zl:mean + ! units: W m-2 + ! cell_methods: zl:sum "ocean_model_z", "T_ady" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xh:mean yq:point z_l:mean + ! units: W m-2 + ! cell_methods: xh:mean yq:point z_l:sum "ocean_model_z", "T_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: z_l:mean + ! units: W m-2 + ! cell_methods: z_l:sum "ocean_model", "T_diffx" [Used] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xq:point yh:mean zl:mean + ! units: W m-2 + ! cell_methods: xq:point yh:mean zl:sum "ocean_model", "T_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: zl:mean + ! units: W m-2 + ! cell_methods: zl:sum "ocean_model_z", "T_diffx" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xq:point yh:mean z_l:mean + ! units: W m-2 + ! cell_methods: xq:point yh:mean z_l:sum "ocean_model_z", "T_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: z_l:mean + ! units: W m-2 + ! cell_methods: z_l:sum "ocean_model", "T_diffy" [Used] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xh:mean yq:point zl:mean + ! units: W m-2 + ! cell_methods: xh:mean yq:point zl:sum "ocean_model", "T_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: zl:mean + ! units: W m-2 + ! cell_methods: zl:sum "ocean_model_z", "T_diffy" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xh:mean yq:point z_l:mean + ! units: W m-2 + ! cell_methods: xh:mean yq:point z_l:sum "ocean_model_z", "T_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: z_l:mean + ! units: W m-2 + ! cell_methods: z_l:sum "ocean_model", "S_adx" [Used] ! long_name: Advective (by residual mean) Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xq:point yh:mean zl:mean + ! cell_methods: xq:point yh:mean zl:sum "ocean_model", "S_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "S_adx" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xq:point yh:mean z_l:mean + ! cell_methods: xq:point yh:mean z_l:sum "ocean_model_z", "S_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "S_ady" [Used] ! long_name: Advective (by residual mean) Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xh:mean yq:point zl:mean + ! cell_methods: xh:mean yq:point zl:sum "ocean_model", "S_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "S_ady" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xh:mean yq:point z_l:mean + ! cell_methods: xh:mean yq:point z_l:sum "ocean_model_z", "S_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "S_diffx" [Used] ! long_name: Diffusive Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xq:point yh:mean zl:mean + ! cell_methods: xq:point yh:mean zl:sum "ocean_model", "S_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "S_diffx" [Unused] ! long_name: Diffusive Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xq:point yh:mean z_l:mean + ! cell_methods: xq:point yh:mean z_l:sum "ocean_model_z", "S_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "S_diffy" [Used] ! long_name: Diffusive Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xh:mean yq:point zl:mean + ! cell_methods: xh:mean yq:point zl:sum "ocean_model", "S_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "S_diffy" [Unused] ! long_name: Diffusive Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xh:mean yq:point z_l:mean + ! cell_methods: xh:mean yq:point z_l:sum "ocean_model_z", "S_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "T_adx_2d" [Unused] ! long_name: Vertically Integrated Advective Zonal Flux of Potential Temperature - ! units: degC m3 s-1 + ! units: W m-2 ! cell_methods: xq:point yh:mean "ocean_model", "T_ady_2d" [Unused] ! long_name: Vertically Integrated Advective Meridional Flux of Potential Temperature - ! units: degC m3 s-1 + ! units: W m-2 ! cell_methods: xh:mean yq:point "ocean_model", "T_diffx_2d" [Unused] ! long_name: Vertically Integrated Diffusive Zonal Flux of Potential Temperature - ! units: degC m3 s-1 + ! units: W m-2 ! cell_methods: xq:point yh:mean "ocean_model", "T_diffy_2d" [Unused] ! long_name: Vertically Integrated Diffusive Meridional Flux of Potential Temperature - ! units: degC m3 s-1 + ! units: W m-2 ! cell_methods: xh:mean yq:point "ocean_model", "S_adx_2d" [Unused] ! long_name: Vertically Integrated Advective Zonal Flux of Salinity diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 7598b4d98f..95722f8640 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -3232,147 +3232,147 @@ ! cell_methods: xh:mean yh:mean "ocean_model", "T_adx" [Used] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xq:point yh:mean zl:mean + ! units: W m-2 + ! cell_methods: xq:point yh:mean zl:sum "ocean_model", "T_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: zl:mean + ! units: W m-2 + ! cell_methods: zl:sum "ocean_model_z", "T_adx" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xq:point yh:mean z_l:mean + ! units: W m-2 + ! cell_methods: xq:point yh:mean z_l:sum "ocean_model_z", "T_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: z_l:mean + ! units: W m-2 + ! cell_methods: z_l:sum "ocean_model", "T_ady" [Used] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xh:mean yq:point zl:mean + ! units: W m-2 + ! cell_methods: xh:mean yq:point zl:sum "ocean_model", "T_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: zl:mean + ! units: W m-2 + ! cell_methods: zl:sum "ocean_model_z", "T_ady" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xh:mean yq:point z_l:mean + ! units: W m-2 + ! cell_methods: xh:mean yq:point z_l:sum "ocean_model_z", "T_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: z_l:mean + ! units: W m-2 + ! cell_methods: z_l:sum "ocean_model", "T_diffx" [Used] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xq:point yh:mean zl:mean + ! units: W m-2 + ! cell_methods: xq:point yh:mean zl:sum "ocean_model", "T_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: zl:mean + ! units: W m-2 + ! cell_methods: zl:sum "ocean_model_z", "T_diffx" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xq:point yh:mean z_l:mean + ! units: W m-2 + ! cell_methods: xq:point yh:mean z_l:sum "ocean_model_z", "T_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: z_l:mean + ! units: W m-2 + ! cell_methods: z_l:sum "ocean_model", "T_diffy" [Used] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xh:mean yq:point zl:mean + ! units: W m-2 + ! cell_methods: xh:mean yq:point zl:sum "ocean_model", "T_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: zl:mean + ! units: W m-2 + ! cell_methods: zl:sum "ocean_model_z", "T_diffy" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: xh:mean yq:point z_l:mean + ! units: W m-2 + ! cell_methods: xh:mean yq:point z_l:sum "ocean_model_z", "T_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Potential Temperature - ! units: degC m3 s-1 - ! cell_methods: z_l:mean + ! units: W m-2 + ! cell_methods: z_l:sum "ocean_model", "S_adx" [Used] ! long_name: Advective (by residual mean) Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xq:point yh:mean zl:mean + ! cell_methods: xq:point yh:mean zl:sum "ocean_model", "S_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "S_adx" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xq:point yh:mean z_l:mean + ! cell_methods: xq:point yh:mean z_l:sum "ocean_model_z", "S_adx_xyave" [Unused] ! long_name: Advective (by residual mean) Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "S_ady" [Used] ! long_name: Advective (by residual mean) Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xh:mean yq:point zl:mean + ! cell_methods: xh:mean yq:point zl:sum "ocean_model", "S_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "S_ady" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xh:mean yq:point z_l:mean + ! cell_methods: xh:mean yq:point z_l:sum "ocean_model_z", "S_ady_xyave" [Unused] ! long_name: Advective (by residual mean) Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "S_diffx" [Used] ! long_name: Diffusive Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xq:point yh:mean zl:mean + ! cell_methods: xq:point yh:mean zl:sum "ocean_model", "S_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "S_diffx" [Unused] ! long_name: Diffusive Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xq:point yh:mean z_l:mean + ! cell_methods: xq:point yh:mean z_l:sum "ocean_model_z", "S_diffx_xyave" [Unused] ! long_name: Diffusive Zonal Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "S_diffy" [Used] ! long_name: Diffusive Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xh:mean yq:point zl:mean + ! cell_methods: xh:mean yq:point zl:sum "ocean_model", "S_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "S_diffy" [Unused] ! long_name: Diffusive Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: xh:mean yq:point z_l:mean + ! cell_methods: xh:mean yq:point z_l:sum "ocean_model_z", "S_diffy_xyave" [Unused] ! long_name: Diffusive Meridional Flux of Salinity ! units: psu m3 s-1 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "T_adx_2d" [Unused] ! long_name: Vertically Integrated Advective Zonal Flux of Potential Temperature - ! units: degC m3 s-1 + ! units: W m-2 ! cell_methods: xq:point yh:mean "ocean_model", "T_ady_2d" [Unused] ! long_name: Vertically Integrated Advective Meridional Flux of Potential Temperature - ! units: degC m3 s-1 + ! units: W m-2 ! cell_methods: xh:mean yq:point "ocean_model", "T_diffx_2d" [Unused] ! long_name: Vertically Integrated Diffusive Zonal Flux of Potential Temperature - ! units: degC m3 s-1 + ! units: W m-2 ! cell_methods: xq:point yh:mean "ocean_model", "T_diffy_2d" [Unused] ! long_name: Vertically Integrated Diffusive Meridional Flux of Potential Temperature - ! units: degC m3 s-1 + ! units: W m-2 ! cell_methods: xh:mean yq:point "ocean_model", "S_adx_2d" [Unused] ! long_name: Vertically Integrated Advective Zonal Flux of Salinity diff --git a/src/MOM6 b/src/MOM6 index 56f2100714..e1e193a20a 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 56f2100714597a769e56bd2f8dd821264c7fe912 +Subproject commit e1e193a20acb81293f29360f06f05b26caa395b7 From 4b4f8ef2479601145f4fe808bc606bb91db0c35d Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Tue, 26 Sep 2017 13:11:41 -0400 Subject: [PATCH 40/89] MOM6: Merge pull request #612 from ESMG/OBC_tracers - Commit NOAA-GFDL/MOM6-examples@3296489 update MOM_parameter_doc.all - NOAA-GFDL/MOM6-examples@0db9c88 Merge pull request #615 from MJHarrison-GFDL/BT_OBC_halo_update - NOAA-GFDL/MOM6-examples@3296489 Merge pull request #612 from ESMG/OBC_tracers - NOAA-GFDL/MOM6-examples@3b9a647 *Halo updates within set_up_BT_OBC. Changes answers for CCS - NOAA-GFDL/MOM6-examples@5df4018 Merge remote-tracking branch 'gfdl/dev/gfdl' into OBC_tracers - NOAA-GFDL/MOM6-examples@e40d6a0 Setting h outside is needed for ALE regridding... - NOAA-GFDL/MOM6-examples@73e7cc8 Moved call to register_temp_salt_segments - NOAA-GFDL/MOM6-examples@fd49823 Take unused argument from register_segment_tracer - NOAA-GFDL/MOM6-examples@7c74416 Merge remote-tracking branch 'gfdl/dev/gfdl' into OBC_tracers - NOAA-GFDL/MOM6-examples@873e733 Deallocating OBC segment stuff. - NOAA-GFDL/MOM6-examples@e11efee Merge remote-tracking branch 'gfdl/dev/gfdl' into OBC_tracers - NOAA-GFDL/MOM6-examples@9c59753 *Next iteration of OBC tracer handling - NOAA-GFDL/MOM6-examples@276fc73 Merge branch 'user/ksh/open_bc' into OBC_tracers - NOAA-GFDL/MOM6-examples@f2bf0fe Stop filling in outside h during initialization. - NOAA-GFDL/MOM6-examples@e080d11 Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6-examples@d8bcdaa Merge remote-tracking branch 'hallberg/reorder_MOM_init' into OBC_tracers - NOAA-GFDL/MOM6-examples@7902877 Got the segment tracer registry working. - NOAA-GFDL/MOM6-examples@927c14a Fussing with OBC tracers - NOAA-GFDL/MOM6-examples@4686763 Added a segment tracer registry, not using it yet. - NOAA-GFDL/MOM6-examples@cc3aa24 Stop filling in outside h during initialization. - NOAA-GFDL/MOM6-examples@b31b158 My new files need new license text too. - NOAA-GFDL/MOM6-examples@c5a3127 Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6-examples@5331e6f Didn't need all of the dyed_obcs arrays, just half. - NOAA-GFDL/MOM6-examples@1e81e5b Merge branch 'user/ksh/open_bc' into OBC_tracers - NOAA-GFDL/MOM6-examples@60be800 Stop the zeroing of uhh, vhh on inflow tracer OBC. - NOAA-GFDL/MOM6-examples@a9ff625 Adding dyed_obcs test case - NOAA-GFDL/MOM6-examples@cf3e6c0 Thinking about OBC tracers... --- coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all | 2 ++ .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 2 ++ .../Concurrent_ice_1deg/MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 2 ++ .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 2 ++ .../OM_360x320_C180/MOM_parameter_doc.all | 2 ++ .../CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all | 2 ++ .../cooling_only/EPBL/MOM_parameter_doc.all | 2 ++ .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all | 2 ++ .../CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all | 2 ++ .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all | 2 ++ .../CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all | 2 ++ .../skin_warming_wind/BML/MOM_parameter_doc.all | 2 ++ .../skin_warming_wind/EPBL/MOM_parameter_doc.all | 2 ++ .../skin_warming_wind/KPP/MOM_parameter_doc.all | 2 ++ .../CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all | 2 ++ .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all | 2 ++ .../CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all | 2 ++ ocean_only/DOME/MOM_parameter_doc.all | 7 +++++-- ocean_only/DOME/MOM_parameter_doc.short | 5 +++-- ocean_only/Phillips_2layer/MOM_parameter_doc.all | 2 ++ ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all | 2 ++ ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 2 ++ ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 2 ++ ocean_only/adjustment2d/z/MOM_parameter_doc.all | 2 ++ ocean_only/benchmark/MOM_parameter_doc.all | 2 ++ ocean_only/circle_obcs/MOM_parameter_doc.all | 7 +++++-- ocean_only/double_gyre/MOM_parameter_doc.all | 2 ++ ocean_only/external_gwave/MOM_parameter_doc.all | 2 ++ ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 2 ++ ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 2 ++ ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 2 ++ ocean_only/flow_downslope/z/MOM_parameter_doc.all | 2 ++ ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 2 ++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 2 ++ ocean_only/global_ALE/z/MOM_parameter_doc.all | 2 ++ ocean_only/lock_exchange/MOM_parameter_doc.all | 2 ++ ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 2 ++ ocean_only/nonBous_global/MOM_parameter_doc.all | 2 ++ ocean_only/resting/layer/MOM_parameter_doc.all | 2 ++ ocean_only/resting/z/MOM_parameter_doc.all | 2 ++ ocean_only/seamount/layer/MOM_parameter_doc.all | 2 ++ ocean_only/seamount/rho/MOM_parameter_doc.all | 2 ++ ocean_only/seamount/sigma/MOM_parameter_doc.all | 2 ++ ocean_only/seamount/z/MOM_parameter_doc.all | 2 ++ ocean_only/single_column/BML/MOM_parameter_doc.all | 2 ++ ocean_only/single_column/EPBL/MOM_parameter_doc.all | 2 ++ ocean_only/single_column/KPP/MOM_parameter_doc.all | 2 ++ ocean_only/sloshing/layer/MOM_parameter_doc.all | 2 ++ ocean_only/sloshing/rho/MOM_parameter_doc.all | 2 ++ ocean_only/sloshing/z/MOM_parameter_doc.all | 2 ++ ocean_only/torus_advection_test/MOM_parameter_doc.all | 2 ++ ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 2 ++ ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 2 ++ ocean_only/unit_tests/MOM_parameter_doc.all | 2 ++ 60 files changed, 127 insertions(+), 6 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index 8571d0574a..8e28dea87b 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -340,6 +340,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 282f9a1faf..42be133e60 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -340,6 +340,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 282f9a1faf..42be133e60 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -340,6 +340,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 07ff48eb0e..33387ec844 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -340,6 +340,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True 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 24d6eb3d12..22bff31517 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 @@ -357,6 +357,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index fe693164ba..6dfa9303bd 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -362,6 +362,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 29313461f5..797b1f0c05 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -362,6 +362,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index b8a879c9f1..9a34a6f056 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -340,6 +340,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index a1afafc86d..d5a9a9641d 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -340,6 +340,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index a1afafc86d..d5a9a9641d 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -340,6 +340,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index f3f3067d84..805c1b8704 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -350,6 +350,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True 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 747fa46e60..8bee92b3d3 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 @@ -356,6 +356,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! 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 9be778515c..1f9597102d 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 @@ -358,6 +358,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 6b605be11e..db50fe12ff 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 @@ -358,6 +358,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 7158fd528f..f2533e78a4 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 @@ -356,6 +356,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! 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 223ecb9ba5..ed1d2ac866 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 @@ -358,6 +358,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 7212fa6411..0de5b700e4 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 @@ -358,6 +358,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 42c1eb62d0..84bb67ae83 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 @@ -356,6 +356,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! 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 f16383aaf5..40ee430009 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 @@ -358,6 +358,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 07b81ce376..a349836ec2 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 @@ -358,6 +358,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 9871c7d41f..c605518822 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 @@ -356,6 +356,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! 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 2133c73d42..8b282de75b 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 @@ -358,6 +358,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! 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 f5c1137109..37eaee64e4 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 @@ -358,6 +358,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 3edaca45ec..dc712ed5da 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -334,6 +334,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module DOME_tracer === DOME_TRACER_IC_FILE = "" ! default = "" @@ -443,10 +445,11 @@ OBC_USER_CONFIG = "DOME" ! default = "none" ! A string that sets how the user code is invoked to set open ! boundary data: ! DOME - specified inflow on northern boundary - ! tidal_bay - Flather with tidal forcing on eastern boundary - ! supercritical - now only needed here for the allocations + ! dyed_obcs - circle_obcs with dyes on the open boundaries ! Kelvin - barotropic Kelvin wave forcing on the western boundary ! shelfwave - Flather with shelf wave forcing on western boundary + ! supercritical - now only needed here for the allocations + ! tidal_bay - Flather with tidal forcing on eastern boundary ! USER - user specified ! === module MOM_diag_mediator === diff --git a/ocean_only/DOME/MOM_parameter_doc.short b/ocean_only/DOME/MOM_parameter_doc.short index e9cf4a61d9..1ee4ca6c95 100644 --- a/ocean_only/DOME/MOM_parameter_doc.short +++ b/ocean_only/DOME/MOM_parameter_doc.short @@ -209,10 +209,11 @@ OBC_USER_CONFIG = "DOME" ! default = "none" ! A string that sets how the user code is invoked to set open ! boundary data: ! DOME - specified inflow on northern boundary - ! tidal_bay - Flather with tidal forcing on eastern boundary - ! supercritical - now only needed here for the allocations + ! dyed_obcs - circle_obcs with dyes on the open boundaries ! Kelvin - barotropic Kelvin wave forcing on the western boundary ! shelfwave - Flather with shelf wave forcing on western boundary + ! supercritical - now only needed here for the allocations + ! tidal_bay - Flather with tidal forcing on eastern boundary ! USER - user specified ! === module MOM_diag_mediator === diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 3f44436283..7ceeaa120b 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -305,6 +305,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "gprime" ! diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index a9eeef4ca5..7fcf92ba04 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -358,6 +358,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 0238f28cf9..a91331e2df 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index ce2f2e5615..51c84f9f70 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index c8db147dee..0f2c987531 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 7177409c44..2a3ecae72a 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -358,6 +358,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 8483f68fda..2b09e99e36 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -354,6 +354,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module DOME_tracer === DOME_TRACER_IC_FILE = "" ! default = "" @@ -456,10 +458,11 @@ OBC_USER_CONFIG = "none" ! default = "none" ! A string that sets how the user code is invoked to set open ! boundary data: ! DOME - specified inflow on northern boundary - ! tidal_bay - Flather with tidal forcing on eastern boundary - ! supercritical - now only needed here for the allocations + ! dyed_obcs - circle_obcs with dyes on the open boundaries ! Kelvin - barotropic Kelvin wave forcing on the western boundary ! shelfwave - Flather with shelf wave forcing on western boundary + ! supercritical - now only needed here for the allocations + ! tidal_bay - Flather with tidal forcing on eastern boundary ! USER - user specified ! === module MOM_diag_mediator === diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 9df25723f1..c48807dbba 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -299,6 +299,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "gprime" ! diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 3000f93c9d..97d05d1729 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "layer_ref" ! diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 3f4bd69f45..260887de7f 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -374,6 +374,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index e4a2a1a7ba..c9d7d8aed1 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -374,6 +374,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 88f8d6109a..e32ff27ba5 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -374,6 +374,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index da74605592..136f9e219c 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -374,6 +374,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 22f33a9f3a..c1b4cd8477 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -357,6 +357,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index a763006173..3f66521ee7 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -355,6 +355,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index fa481917d1..6f9a64b3c1 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -357,6 +357,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index d8be1f3d9f..6871760372 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "layer_ref" ! 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 72af51c255..aa2aa130d6 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index cacd4b09bc..5393cb65c0 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -340,6 +340,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index be78f5b72a..6a4fc7ced4 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index c5f5148cc4..d5130f422a 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 8ccf630622..d59c2560bf 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -374,6 +374,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index ca86c068a2..fafcd4f184 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -374,6 +374,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index cbfeae3ba8..20466af270 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -374,6 +374,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index f36bc65e4d..f5d4f9c067 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -374,6 +374,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "ts_range" ! diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 6fbc6a1949..b6214099bc 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -345,6 +345,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index b97f4b79d9..546cf13444 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -347,6 +347,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index e5df023da0..b6e2bd5a3f 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -347,6 +347,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 7e21897a9e..958abe9344 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -366,6 +366,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index bab55fd9f1..924c843710 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -366,6 +366,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 0de1b8b662..8734df3a85 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -366,6 +366,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index a8c4f81612..e13c928954 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module advection_test_tracer === ADVECTION_TEST_X_ORIGIN = 43.2 ! [not defined] default = 0.0 diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 6689da7829..557c64b7ec 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index de6f84c49e..dcaa70bdf6 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -363,6 +363,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "linear" ! diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 1900f363ab..4df409e174 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -296,6 +296,8 @@ USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False ! If true, use the pseudo salt tracer, typically run as a diagnostic. USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. ! === module MOM_coord_initialization === COORD_CONFIG = "none" ! From 5e48ccdcafaedebde39135059feb3759e18900ae Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Tue, 26 Sep 2017 13:21:23 -0400 Subject: [PATCH 41/89] MOM6: Merge pull request #612 from ESMG/OBC_tracers - Last commit 4b4f8ef24796011 should have updated src/MOM6 (commit message duplicated below) - Commit NOAA-GFDL/MOM6-examples@3296489 update MOM_parameter_doc.all - NOAA-GFDL/MOM6-examples@0db9c88 Merge pull request #615 from MJHarrison-GFDL/BT_OBC_halo_update - NOAA-GFDL/MOM6-examples@3296489 Merge pull request #612 from ESMG/OBC_tracers - NOAA-GFDL/MOM6-examples@3b9a647 *Halo updates within set_up_BT_OBC. Changes answers for CCS - NOAA-GFDL/MOM6-examples@5df4018 Merge remote-tracking branch 'gfdl/dev/gfdl' into OBC_tracers - NOAA-GFDL/MOM6-examples@e40d6a0 Setting h outside is needed for ALE regridding... - NOAA-GFDL/MOM6-examples@73e7cc8 Moved call to register_temp_salt_segments - NOAA-GFDL/MOM6-examples@fd49823 Take unused argument from register_segment_tracer - NOAA-GFDL/MOM6-examples@7c74416 Merge remote-tracking branch 'gfdl/dev/gfdl' into OBC_tracers - NOAA-GFDL/MOM6-examples@873e733 Deallocating OBC segment stuff. - NOAA-GFDL/MOM6-examples@e11efee Merge remote-tracking branch 'gfdl/dev/gfdl' into OBC_tracers - NOAA-GFDL/MOM6-examples@9c59753 *Next iteration of OBC tracer handling - NOAA-GFDL/MOM6-examples@276fc73 Merge branch 'user/ksh/open_bc' into OBC_tracers - NOAA-GFDL/MOM6-examples@f2bf0fe Stop filling in outside h during initialization. - NOAA-GFDL/MOM6-examples@e080d11 Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6-examples@d8bcdaa Merge remote-tracking branch 'hallberg/reorder_MOM_init' into OBC_tracers - NOAA-GFDL/MOM6-examples@7902877 Got the segment tracer registry working. - NOAA-GFDL/MOM6-examples@927c14a Fussing with OBC tracers - NOAA-GFDL/MOM6-examples@4686763 Added a segment tracer registry, not using it yet. - NOAA-GFDL/MOM6-examples@cc3aa24 Stop filling in outside h during initialization. - NOAA-GFDL/MOM6-examples@b31b158 My new files need new license text too. - NOAA-GFDL/MOM6-examples@c5a3127 Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6-examples@5331e6f Didn't need all of the dyed_obcs arrays, just half. - NOAA-GFDL/MOM6-examples@1e81e5b Merge branch 'user/ksh/open_bc' into OBC_tracers - NOAA-GFDL/MOM6-examples@60be800 Stop the zeroing of uhh, vhh on inflow tracer OBC. - NOAA-GFDL/MOM6-examples@a9ff625 Adding dyed_obcs test case - NOAA-GFDL/MOM6-examples@cf3e6c0 Thinking about OBC tracers... --- src/MOM6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MOM6 b/src/MOM6 index e1e193a20a..0db9c886e2 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit e1e193a20acb81293f29360f06f05b26caa395b7 +Subproject commit 0db9c886e29e9e56cfa2020b1cf4d2088910bc9c From 52d52e3069ab52af780ceb99272c94a0d63ecd1a Mon Sep 17 00:00:00 2001 From: John Krasting Date: Tue, 26 Sep 2017 20:14:17 -0400 Subject: [PATCH 42/89] Consolidated refineDiag updates - Introduced "--refineDiagDir" command line option for saving output history file - Added refineDiag script for overturning diagnostics saved on rho vertical coordines (work-in-progress). - Added refineDiag script for heat transport diagnostics (work-in-progress) - Updated main MOM6_refineDiag.csh driver script --- tools/analysis/MOM6_refineDiag.csh | 4 + tools/analysis/m6toolbox.py | 2 +- tools/analysis/refineDiag_ocean_month.py | 218 ++++++++++++++++++ tools/analysis/refineDiag_ocean_month_rho2.py | 185 +++++++++++++++ ...e_diags.py => refineDiag_ocean_month_z.py} | 8 +- 5 files changed, 414 insertions(+), 3 deletions(-) create mode 100755 tools/analysis/refineDiag_ocean_month.py create mode 100755 tools/analysis/refineDiag_ocean_month_rho2.py rename tools/analysis/{CMIP6_offline_diags.py => refineDiag_ocean_month_z.py} (95%) diff --git a/tools/analysis/MOM6_refineDiag.csh b/tools/analysis/MOM6_refineDiag.csh index 25d2794493..ef3aa4fa79 100755 --- a/tools/analysis/MOM6_refineDiag.csh +++ b/tools/analysis/MOM6_refineDiag.csh @@ -100,6 +100,10 @@ if ( -e $yr1.ocean_static_no_mask_table.nc ) set ocean_static_file = $yr1.ocean_ $script_dir/EddyKineticEnergy.py -g $ocean_static_file -o $out_dir/refineDiag_ocean_annual/EddyKineticEnergy/EKE_mean_${yr1}.png -l ${yr1} $yr1.ocean_daily.nc $script_dir/calc_variance.py zos $yr1.ocean_daily.nc $refineDiagDir/$yr1.ocean_month_refined.nc +echo '==== Offline Diagnostics ====' +$script_dir/offline_overturning_z.py -b $ocean_static_file -r refineDiagDir $yr1.ocean_month_z.nc +$script_dir/offline_overturning_rho.py -b $ocean_static_file -r refineDiagDir $yr1.ocean_month_rho2.nc + echo " ---------- end yearly analysis ---------- " echo " -- end MOM6_refineDiag.csh -- " diff --git a/tools/analysis/m6toolbox.py b/tools/analysis/m6toolbox.py index 75e79870c4..eab1f7d5ea 100644 --- a/tools/analysis/m6toolbox.py +++ b/tools/analysis/m6toolbox.py @@ -193,7 +193,7 @@ def moc_maskedarray(vh,mask=None): _vh = vh * _mask _vh_btm = np.ma.expand_dims(_vh[:,-1,:,:]*0.,axis=1) _vh = np.ma.concatenate((_vh,_vh_btm),axis=1) - _vh = np.ma.sum(_vh,axis=-1) + _vh = np.ma.sum(_vh,axis=-1) * -1. _vh = _vh[:,::-1] # flip z-axis so running sum is from ocean floor to surface _vh = np.ma.cumsum(_vh,axis=1) _vh = _vh[:,::-1] # flip z-axis back to original order diff --git a/tools/analysis/refineDiag_ocean_month.py b/tools/analysis/refineDiag_ocean_month.py new file mode 100755 index 0000000000..238b52a01c --- /dev/null +++ b/tools/analysis/refineDiag_ocean_month.py @@ -0,0 +1,218 @@ +#!/usr/bin/env python + +import argparse +import m6toolbox +import netCDF4 as nc +import numpy as np +import os +import sys +import matplotlib.pyplot as plt + + + +##-- RefineDiag Script for CMIP6 +## +## Variables we intend to provide in z-coordinates: +## +## msftyyz -> vmo (ocean_z) * both 0.25 and 0.5 resolutions +## msftyzmpa -> vhGM (ocean_z) * applies only to 0.5 resolution +## msftyzsmpa -> vhml (ocean_z) * both 0.25 and 0.5 resolutions +## +## +## Variables we intend to provide in rho-coordinates: +## (potenital density referenced to 2000 m) +## +## msftyrho -> vmo +## msftyrhompa -> vhGM * applies only to 0.5 resolution +## +## +## 2-D variables we intent to provide: +## +## hfy -> T_ady_2d + ndiff_tracer_trans_y_2d_T * T_ady_2d needs to be converted to Watts (Cp = 3992.) +## ndiff_tracer_trans_y_2d_T already in Watts +## advective term in both 0.25 and 0.5 resolutions +## diffusive term only in 0.5 resolution +## +## hfx -> same recipie as above, expect for x-dimension +## hfbasin -> summed line of hfy in each basin +## +## +## Outstanding issues +## 1.) regirdding of vh, vhGM to rho-corrdinates +## 2.) vhGM and vhML units need to be in kg s-1 +## 2.) save out RHO_0 and Cp somewhere in netCDF files to key off of +## +## +## CMIP variables that will NOT be provided: +## +## hfbasinpmadv, hfbasinpsmadv, hfbasinpmdiff, hfbasinpadv +## (We advect the tracer with the residual mean velocity; individual terms cannot be diagnosed) +## +## htovgyre, htovovrt, sltovgyre, sltovovrt +## (Code for offline calculation not ready.) +## +##-- + +def run(): + parser = argparse.ArgumentParser(description='''CMIP6 RefineDiag Script for OM4''') + parser.add_argument('infile', type=str, help='''Input file''') + parser.add_argument('-b','--basinfile', type=str, default='', required=True, help='''File containing OM4 basin masks''') + parser.add_argument('-o','--outfile', type=str, default=None, help='''Output file name''') + parser.add_argument('-r','--refineDiagDir', type=str, default=None, help='''Path to refineDiagDir defined by FRE workflow)''') + args = parser.parse_args() + main(args) + +def main(args): + #-- Define Regions and their associated masks + # Note: The Atlantic should include other smaller bays/seas that are + # included in the definition used in meridional_overturning.py + + region = np.array(['atlantic_arctic_ocean','indian_pacific_ocean','global_ocean']) + + #-- Read basin masks + f_basin = nc.Dataset(args.basinfile) + basin_code = f_basin.variables['basin'][:] + + atlantic_arctic_mask = basin_code * 0. + atlantic_arctic_mask[(basin_code==2) | (basin_code==4) | (basin_code==6) | (basin_code==7) | (basin_code==8)] = 1. + + indo_pacific_mask = basin_code * 0. + indo_pacific_mask[(basin_code==3) | (basin_code==5)] = 1. + + #-- Read model data + f_in = nc.Dataset(args.infile) + + #-- Read in existing dimensions from history netcdf file + yq = f_in.variables['yq'] + xh = f_in.variables['xh'] + tax = f_in.variables['time'] + + #-- hfy + advective = f_in.variables['T_ady_2d'][:] + if 'ndiff_tracer_trans_y_2d_T' in f_in.variables.keys(): + diffusive = f_in.variables['ndiff_tracer_trans_y_2d_T'][:] + else: + print("Warning: diffusive term 'ndiff_tracer_trans_y_2d_T' not found. Check if this experiment is running with neutral diffusion.") + diffusive = advective * 0. + hfy = advective + diffusive + #hfy[hfy.mask] = 1.e20 + #hfy = np.ma.array(hfy,fill_value=1.e20) + hfy.long_name = 'Ocean Heat Y Transport' + hfy.units = 'W' + hfy.cell_methods = 'yq:point xh:mean time:mean' + hfy.time_avg_info = 'average_T1,average_T2,average_DT' + hfy.standard_name = 'ocean_heat_y_transport' + + #-- hfx + advective = f_in.variables['T_adx_2d'][:] + if 'ndiff_tracer_trans_x_2d_T' in f_in.variables.keys(): + diffusive = f_in.variables['ndiff_tracer_trans_x_2d_T'][:] + else: + print("Warning: diffusive term 'ndiff_tracer_trans_x_2d_T' not found. Check if this experiment is running with neutral diffusion.") + diffusive = advective * 0. + hfx = advective + diffusive + #hfx[hfx.mask] = 1.e20 + #hfx = np.ma.array(hfx,fill_value=1.e20) + hfx.long_name = 'Ocean Heat X Transport' + hfx.units = 'W' + hfx.cell_methods = 'yh:mean xq:point time:mean' + hfx.time_avg_info = 'average_T1,average_T2,average_DT' + hfx.standard_name = 'ocean_heat_x_transport' + + + #-- Read time bounds + nv = f_in.variables['nv'] + average_T1 = f_in.variables['average_T1'] + average_T2 = f_in.variables['average_T2'] + average_DT = f_in.variables['average_DT'] + time_bnds = f_in.variables['time_bnds'] + + #-- Generate output filename + if args.outfile is None: + if hasattr(f_in,'filename'): + args.outfile = f_in.filename + else: + args.outfile = os.path.basename(args.infile) + args.outfile = args.outfile.split('.') + args.outfile[-2] = args.outfile[-2]+'_refined' + args.outfile = '.'.join(args.outfile) + + if args.refineDiagDir is not None: + args.outfile = args.refineDiagDir + '/' + args.outfile + + #-- Write output file + try: + os.remove(args.outfile) + except: + pass + + if os.path.exists(args.outfile): + raise IOError('Output netCDF file already exists.') + exit(1) + + f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') + f_out.setncatts(f_in.__dict__) + f_out.filename = args.outfile + + time_dim = f_out.createDimension('time', size=None) + basin_dim = f_out.createDimension('basin', size=3) + strlen_dim = f_out.createDimension('strlen', size=21) + yq_dim = f_out.createDimension('yq', size=len(yq[:])) + xh_dim = f_out.createDimension('xh', size=len(xh[:])) + nv_dim = f_out.createDimension('nv', size=len(nv[:])) + + time_out = f_out.createVariable('time', np.float64, ('time')) + #basin_out = f_out.createVariable('basin', np.int32, ('basin')) + yq_out = f_out.createVariable('yq', np.float64, ('yq')) + region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) + xh_out = f_out.createVariable('xh', np.float64, ('xh')) + nv_out = f_out.createVariable('nv', np.float64, ('nv')) + + hfy_out = f_out.createVariable('hfy', np.float32, ('time', 'yq', 'xh'), fill_value=1.e20) + hfy_out.missing_value = 1.e20 + + hfx_out = f_out.createVariable('hfx', np.float32, ('time', 'yq', 'xh'), fill_value=1.e20) + hfx_out.missing_value = 1.e20 + + average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) + average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) + average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) + time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) + + time_out.setncatts(tax.__dict__) + yq_out.setncatts(yq.__dict__) + xh_out.setncatts(xh.__dict__) + nv_out.setncatts(nv.__dict__) + + for k in hfy.__dict__.keys(): + if k[0] != '_': hfy_out.setncattr(k,hfy.__dict__[k]) + + for k in hfx.__dict__.keys(): + if k[0] != '_': hfx_out.setncattr(k,hfx.__dict__[k]) + + average_T1_out.setncatts(average_T1.__dict__) + average_T2_out.setncatts(average_T2.__dict__) + average_DT_out.setncatts(average_DT.__dict__) + time_bnds_out.setncatts(time_bnds.__dict__) + + time_out[:] = np.array(tax[:]) + yq_out[:] = np.array(yq[:]) + xh_out[:] = np.array(xh[:]) + nv_out[:] = np.array(nv[:]) + + hfy_out[:] = np.ma.array(hfy[:]) + hfx_out[:] = np.ma.array(hfx[:]) + + average_T1_out[:] = average_T1[:] + average_T2_out[:] = average_T2[:] + average_DT_out[:] = average_DT[:] + time_bnds_out[:] = time_bnds[:] + + region_out[:] = nc.stringtochar(region) + + f_out.close() + + exit(0) + +if __name__ == '__main__': + run() diff --git a/tools/analysis/refineDiag_ocean_month_rho2.py b/tools/analysis/refineDiag_ocean_month_rho2.py new file mode 100755 index 0000000000..fa5e99c398 --- /dev/null +++ b/tools/analysis/refineDiag_ocean_month_rho2.py @@ -0,0 +1,185 @@ +#!/usr/bin/env python + +import argparse +import m6toolbox +import netCDF4 as nc +import numpy as np +import os +import sys +import matplotlib.pyplot as plt + +##-- RefineDiag Script for CMIP6 +## +## +## Variables we intend to provide in rho-coordinates: +## (potenital density referenced to 2000 m) +## +## msftyrho -> vmo +## msftyrhompa -> vhGM * applies only to 0.5 resolution +## +##-- + +def run(): + parser = argparse.ArgumentParser(description='''CMIP6 RefineDiag Script for OM4''') + parser.add_argument('infile', type=str, help='''Input file''') + parser.add_argument('-b','--basinfile', type=str, default='', required=True, help='''File containing OM4 basin masks''') + parser.add_argument('-o','--outfile', type=str, default=None, help='''Output file name''') + parser.add_argument('-r','--refineDiagDir', type=str, default=None, help='''Path to refineDiagDir defined by FRE workflow)''') + args = parser.parse_args() + main(args) + +def main(args): + #-- Define Regions and their associated masks + # Note: The Atlantic should include other smaller bays/seas that are + # included in the definition used in meridional_overturning.py + + region = np.array(['atlantic_arctic_ocean','indian_pacific_ocean','global_ocean']) + + #-- Read basin masks + f_basin = nc.Dataset(args.basinfile) + basin_code = f_basin.variables['basin'][:] + + atlantic_arctic_mask = basin_code * 0. + atlantic_arctic_mask[(basin_code==2) | (basin_code==4) | (basin_code==6) | (basin_code==7) | (basin_code==8)] = 1. + + indo_pacific_mask = basin_code * 0. + indo_pacific_mask[(basin_code==3) | (basin_code==5)] = 1. + + #-- Read model data + f_in = nc.Dataset(args.infile) + + #-- Read in existing dimensions from history netcdf file + yh = f_in.variables['yh'] + z_l = f_in.variables['z_l'] + z_i = f_in.variables['z_i'] + tax = f_in.variables['time'] + + #-- msftyrho + varname = 'vmo' + msftyrho = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. + msftyrho[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) + msftyrho[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) + msftyrho[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) + msftyrho[msftyrho.mask] = 1.e20 + msftyrho = np.ma.array(msftyrho,fill_value=1.e20) + msftyrho.long_name = 'Ocean Y Overturning Mass Streamfunction' + msftyrho.units = 'kg s-1' + msftyrho.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' + msftyrho.time_avg_info = 'average_T1,average_T2,average_DT' + msftyrho.standard_name = 'ocean_y_overturning_mass_streamfunction' + + #-- msftyrhompa + varname = 'vhGM' + msftyrhompa = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. + msftyrhompa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) + msftyrhompa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) + msftyrhompa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) + msftyrhompa[msftyrhompa.mask] = 1.e20 + msftyrhompa = np.ma.array(msftyrhompa,fill_value=1.e20) + msftyrhompa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' + msftyrhompa.units = 'kg s-1' + msftyrhompa.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' + msftyrhompa.time_avg_info = 'average_T1,average_T2,average_DT' + msftyrhompa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ + 'mesoscale_advection' + + + #-- Read time bounds + nv = f_in.variables['nv'] + average_T1 = f_in.variables['average_T1'] + average_T2 = f_in.variables['average_T2'] + average_DT = f_in.variables['average_DT'] + time_bnds = f_in.variables['time_bnds'] + + #-- Generate output filename + if args.outfile is None: + if hasattr(f_in,'filename'): + args.outfile = f_in.filename + else: + args.outfile = os.path.basename(args.infile) + args.outfile = args.outfile.split('.') + args.outfile[-2] = args.outfile[-2]+'_refined' + args.outfile = '.'.join(args.outfile) + + if args.refineDiagDir is not None: + args.outfile = args.refineDiagDir + '/' + args.outfile + + #-- Write output file + try: + os.remove(args.outfile) + except: + pass + + if os.path.exists(args.outfile): + raise IOError('Output netCDF file already exists.') + exit(1) + + f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') + f_out.setncatts(f_in.__dict__) + f_out.filename = args.outfile + + time_dim = f_out.createDimension('time', size=None) + basin_dim = f_out.createDimension('basin', size=3) + strlen_dim = f_out.createDimension('strlen', size=21) + yh_dim = f_out.createDimension('yh', size=len(yh[:])) + z_l_dim = f_out.createDimension('z_l', size=len(z_l[:])) + z_i_dim = f_out.createDimension('z_i', size=len(z_i[:])) + nv_dim = f_out.createDimension('nv', size=len(nv[:])) + + time_out = f_out.createVariable('time', np.float64, ('time')) + yh_out = f_out.createVariable('yh', np.float64, ('yh')) + region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) + z_l_out = f_out.createVariable('z_l', np.float64, ('z_l')) + z_i_out = f_out.createVariable('z_i', np.float64, ('z_i')) + nv_out = f_out.createVariable('nv', np.float64, ('nv')) + + msftyrho_out = f_out.createVariable('msftyrho', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=1.e20) + msftyrho_out.missing_value = 1.e20 + + msftyrhompa_out = f_out.createVariable('msftyrhompa', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=1.e20) + msftyrhompa_out.missing_value = 1.e20 + + average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) + average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) + average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) + time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) + + time_out.setncatts(tax.__dict__) + yh_out.setncatts(yh.__dict__) + z_l_out.setncatts(z_l.__dict__) + z_i_out.setncatts(z_i.__dict__) + nv_out.setncatts(nv.__dict__) + + for k in msftyrho.__dict__.keys(): + if k[0] != '_': msftyrho_out.setncattr(k,msftyrho.__dict__[k]) + + for k in msftyrhompa.__dict__.keys(): + if k[0] != '_': msftyrhompa_out.setncattr(k,msftyrhompa.__dict__[k]) + + average_T1_out.setncatts(average_T1.__dict__) + average_T2_out.setncatts(average_T2.__dict__) + average_DT_out.setncatts(average_DT.__dict__) + time_bnds_out.setncatts(time_bnds.__dict__) + + time_out[:] = np.array(tax[:]) + yh_out[:] = np.array(yh[:]) + z_l_out[:] = np.array(z_l[:]) + z_i_out[:] = np.array(z_i[:]) + nv_out[:] = np.array(nv[:]) + + msftyrho_out[:] = np.ma.array(msftyrho[:]) + msftyrhompa_out[:] = np.ma.array(msftyrhompa[:]) + + average_T1_out[:] = average_T1[:] + average_T2_out[:] = average_T2[:] + average_DT_out[:] = average_DT[:] + time_bnds_out[:] = time_bnds[:] + + region_out[:] = nc.stringtochar(region) + + f_out.close() + + exit(0) + +if __name__ == '__main__': + run() diff --git a/tools/analysis/CMIP6_offline_diags.py b/tools/analysis/refineDiag_ocean_month_z.py similarity index 95% rename from tools/analysis/CMIP6_offline_diags.py rename to tools/analysis/refineDiag_ocean_month_z.py index c22db96398..54a674bb8d 100755 --- a/tools/analysis/CMIP6_offline_diags.py +++ b/tools/analysis/refineDiag_ocean_month_z.py @@ -55,7 +55,8 @@ def run(): parser = argparse.ArgumentParser(description='''CMIP6 RefineDiag Script for OM4''') parser.add_argument('infile', type=str, help='''Input file''') parser.add_argument('-b','--basinfile', type=str, default='', required=True, help='''File containing OM4 basin masks''') - parser.add_argument('-o','--outfile', type=str, default=None, help='''Output file name''') + parser.add_argument('-o','--outfile', type=str, default=None, help='''Output file name''') + parser.add_argument('-r','--refineDiagDir', type=str, default=None, help='''Path to refineDiagDir defined by FRE workflow)''') args = parser.parse_args() main(args) @@ -111,7 +112,7 @@ def main(args): msftyzmpa.units = 'kg s-1' msftyzmpa.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' msftyzmpa.time_avg_info = 'average_T1,average_T2,average_DT' - msftyzmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ + msftyzmpa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ 'mesoscale_advection' #-- msftyzsmpa @@ -146,6 +147,9 @@ def main(args): args.outfile[-2] = args.outfile[-2]+'_refined' args.outfile = '.'.join(args.outfile) + if args.refineDiagDir is not None: + args.outfile = args.refineDiagDir + '/' + args.outfile + #-- Write output file try: os.remove(args.outfile) From 7f94c58bd52c13162da071144b939cf80e6654ee Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 27 Sep 2017 15:55:18 -0400 Subject: [PATCH 43/89] MOM6: Merge pull request #618 from adcroft/cell_measure_volcello - NOAA-GFDL/MOM6@60ce41f Merge pull request #618 from adcroft/cell_measure_volcello - NOAA-GFDL/MOM6@625a3a0 Register volcello as volume cell measure - NOAA-GFDL/MOM6@4986283 Provides means for associate cell measure "volume" - NOAA-GFDL/MOM6@7add3b8 Adds diagnostic field "volcello" - NOAA-GFDL/MOM6@8305575 Merge pull request #616 from ashao/fix_diag_remap_index_range - NOAA-GFDL/MOM6@c181210 Fix i,j range when updating diagnostic grids --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 25 ++++++++++++++++++- ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup | 4 +++ .../global_ALE/layer/available_diags.000000 | 20 +++++++++++++++ .../global_ALE/z/available_diags.000000 | 20 +++++++++++++++ src/MOM6 | 2 +- 5 files changed, 69 insertions(+), 2 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index e7cb45cab9..97cadbd276 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -69,6 +69,10 @@ # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table H1: scalar fields such as tracers, cell mass/volume, sea level, MLD # Generally save annuals, and sometimes monthly and daily. + "ocean_model_z", "volcello", "volcello", "ocean_annual_z", "all", "mean", "none",2 # Cell measure for 3d data + "ocean_model_z", "volcello", "volcello", "ocean_month_z", "all", "mean", "none",2 # Cell measure for 3d data + "ocean_model", "volcello", "volcello", "ocean_annual", "all", "mean", "none",2 # Cell measure for 3d data +#"ocean_model", "volcello", "volcello", "ocean_month", "all", "mean", "none",2 # Cell measure for 3d data "ocean_model", "pbo", "pbo", "ocean_annual", "all", "mean", "none",2 "ocean_model", "pbo", "pbo", "ocean_month", "all", "mean", "none",2 "ocean_model", "pso", "pso", "ocean_annual", "all", "mean", "none",2 @@ -220,114 +224,133 @@ # C/ Can use these sections for post-processing diagnostics to fill OMIP Table 2.4. # Barents Opening (north-south section) -"ocean_model_z", "thetao", "theta", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2 +"ocean_model_z", "volcello", "volcello", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2 +"ocean_model_z", "thetao","thetao", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2 "ocean_model_z", "umo", "umo", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2 "ocean_model_z", "uo", "uo", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2 # Bering Strait (east-west section) +"ocean_model_z", "volcello", "volcello", "ocean_Bering_Strait", "all", "mean", "-171.4 -168.7 66.1 66.1 -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_Bering_Strait", "all", "mean", "-171.4 -168.7 66.1 66.1 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Bering_Strait", "all", "mean", "-171.4 -168.7 66.1 66.1 -1 -1",2 "ocean_model_z", "vmo", "vmo", "ocean_Bering_Strait", "all", "mean", "-171.4 -168.7 66.1 66.1 -1 -1",2 "ocean_model_z", "vo", "vo", "ocean_Bering_Strait", "all", "mean", "-171.4 -168.7 66.1 66.1 -1 -1",2 # Caribbean (east-west section, Cuba-Haiti) Windward Passage +"ocean_model_z", "volcello", "volcello", "ocean_Windward_Passage", "all", "mean", "-75.0 -72.5 19.96 19.96 -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_Windward_Passage", "all", "mean", "-75.0 -72.5 19.96 19.96 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Windward_Passage", "all", "mean", "-75.0 -72.5 19.96 19.96 -1 -1",2 "ocean_model_z", "vmo", "vmo", "ocean_Windward_Passage", "all", "mean", "-75.0 -72.5 19.96 19.96 -1 -1",2 "ocean_model_z", "vo", "vo", "ocean_Windward_Passage", "all", "mean", "-75.0 -72.5 19.96 19.96 -1 -1",2 # Approximate section to capture outflow of Arctic through Davis Strait (east-west section) +"ocean_model_z", "volcello", "volcello", "ocean_Davis_Strait", "all", "mean", "-65.0 -48.0 66.0 66.0 -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_Davis_Strait", "all", "mean", "-65.0 -48.0 66.0 66.0 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Davis_Strait", "all", "mean", "-65.0 -48.0 66.0 66.0 -1 -1",2 "ocean_model_z", "vmo", "vmo", "ocean_Davis_Strait", "all", "mean", "-65.0 -48.0 66.0 66.0 -1 -1",2 "ocean_model_z", "vo", "vo", "ocean_Davis_Strait", "all", "mean", "-65.0 -48.0 66.0 66.0 -1 -1",2 # Approximate section to capture flow across Denmark Strait (east-west section) +"ocean_model_z", "volcello", "volcello", "ocean_Denmark_Strait", "all", "mean", "-42.5 -20. 65. 65. -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_Denmark_Strait", "all", "mean", "-42.5 -20. 65. 65. -1 -1",2 "ocean_model_z", "so", "so", "ocean_Denmark_Strait", "all", "mean", "-42.5 -20. 65. 65. -1 -1",2 "ocean_model_z", "vmo", "vmo", "ocean_Denmark_Strait", "all", "mean", "-42.5 -20. 65. 65. -1 -1",2 "ocean_model_z", "vo", "vo", "ocean_Denmark_Strait", "all", "mean", "-42.5 -20. 65. 65. -1 -1",2 # Approximate section to capture flow through Drake Passage (north-south section) +"ocean_model_z", "volcello", "volcello", "ocean_Drake_Passage", "all", "mean", "-70. -70. -71. -54.5 -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_Drake_Passage", "all", "mean", "-70. -70. -71. -54.5 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Drake_Passage", "all", "mean", "-70. -70. -71. -54.5 -1 -1",2 "ocean_model_z", "umo", "umo", "ocean_Drake_Passage", "all", "mean", "-70. -70. -71. -54.5 -1 -1",2 "ocean_model_z", "uo", "uo", "ocean_Drake_Passage", "all", "mean", "-70. -70. -71. -54.5 -1 -1",2 # English channel flow (north-south section) +"ocean_model_z", "volcello", "volcello", "ocean_English_Channel", "all", "mean", "2.16 2.16 50.8 51.2 -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_English_Channel", "all", "mean", "2.16 2.16 50.8 51.2 -1 -1",2 "ocean_model_z", "so", "so", "ocean_English_Channel", "all", "mean", "2.16 2.16 50.8 51.2 -1 -1",2 "ocean_model_z", "umo", "umo", "ocean_English_Channel", "all", "mean", "2.16 2.16 50.8 51.2 -1 -1",2 "ocean_model_z", "uo", "uo", "ocean_English_Channel", "all", "mean", "2.16 2.16 50.8 51.2 -1 -1",2 # Faroe-Scotland flow (north-south section) +"ocean_model_z", "volcello", "volcello", "ocean_Faroe_Scotland", "all", "mean", "-6.3 -6.3 58. 61.5 -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_Faroe_Scotland", "all", "mean", "-6.3 -6.3 58. 61.5 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Faroe_Scotland", "all", "mean", "-6.3 -6.3 58. 61.5 -1 -1",2 "ocean_model_z", "umo", "umo", "ocean_Faroe_Scotland", "all", "mean", "-6.3 -6.3 58. 61.5 -1 -1",2 "ocean_model_z", "uo", "uo", "ocean_Faroe_Scotland", "all", "mean", "-6.3 -6.3 58. 61.5 -1 -1",2 # Florida-Bahamas Strait (east-west section) +"ocean_model_z", "volcello", "volcello", "ocean_Florida_Bahamas", "all", "mean", "-80.5 -77.8 25. 25. -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_Florida_Bahamas", "all", "mean", "-80.5 -77.8 25. 25. -1 -1",2 "ocean_model_z", "so", "so", "ocean_Florida_Bahamas", "all", "mean", "-80.5 -77.8 25. 25. -1 -1",2 "ocean_model_z", "vmo", "vmo", "ocean_Florida_Bahamas", "all", "mean", "-80.5 -77.8 25. 25. -1 -1",2 "ocean_model_z", "vo", "vo", "ocean_Florida_Bahamas", "all", "mean", "-80.5 -77.8 25. 25. -1 -1",2 # Fram Strait (east-west section) +"ocean_model_z", "volcello", "volcello", "ocean_Fram_Strait", "all", "mean", "-22. 0.0 81.2 81.2 -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_Fram_Strait", "all", "mean", "-22. 0.0 81.2 81.2 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Fram_Strait", "all", "mean", "-22. 0.0 81.2 81.2 -1 -1",2 "ocean_model_z", "vmo", "vmo", "ocean_Fram_Strait", "all", "mean", "-22. 0.0 81.2 81.2 -1 -1",2 "ocean_model_z", "vo", "vo", "ocean_Fram_Strait", "all", "mean", "-22. 0.0 81.2 81.2 -1 -1",2 # Gibraltar Strait (north-south section) +"ocean_model_z", "volcello", "volcello", "ocean_Gibraltar_Strait", "all", "mean", "-5. -5. 35.8 36.2 -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_Gibraltar_Strait", "all", "mean", "-5. -5. 35.8 36.2 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Gibraltar_Strait", "all", "mean", "-5. -5. 35.8 36.2 -1 -1",2 "ocean_model_z", "umo", "umo", "ocean_Gibraltar_Strait", "all", "mean", "-5. -5. 35.8 36.2 -1 -1",2 "ocean_model_z", "uo", "uo", "ocean_Gibraltar_Strait", "all", "mean", "-5. -5. 35.8 36.2 -1 -1",2 # Iceland-Faroe flow: 1st part of zig-zag for flow moving north/south; specific settings for OM4 +"ocean_model_z", "volcello", "volcello", "ocean_Iceland_Faroe_V", "all", "mean", "-17.89 -6. 62.25 62.25 -1 -1",2 "ocean_model_z", "thetao", "thetao", "ocean_Iceland_Faroe_V", "all", "mean", "-17.89 -6. 62.25 62.25 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Iceland_Faroe_V", "all", "mean", "-17.89 -6. 62.25 62.25 -1 -1",2 "ocean_model_z", "vmo", "vmo", "ocean_Iceland_Faroe_V", "all", "mean", "-17.89 -6. 62.25 62.25 -1 -1",2 "ocean_model_z", "vo", "vo", "ocean_Iceland_Faroe_V", "all", "mean", "-17.89 -6. 62.25 62.25 -1 -1",2 # Iceland-Faroe flow: 2nd part of zig-zag for flow moving east/west; specific settings for OM4 +"ocean_model_z", "volcello", "volcello", "ocean_Iceland_Faroe_U", "all", "mean", "-17.74 -17.74 62.31 63.6 -1 -1",2 "ocean_model_z", "thetao", "thetao", "ocean_Iceland_Faroe_U", "all", "mean", "-17.74 -17.74 62.31 63.6 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Iceland_Faroe_U", "all", "mean", "-17.74 -17.74 62.31 63.6 -1 -1",2 "ocean_model_z", "umo", "umo", "ocean_Iceland_Faroe_U", "all", "mean", "-17.74 -17.74 62.31 63.6 -1 -1",2 "ocean_model_z", "uo", "uo", "ocean_Iceland_Faroe_U", "all", "mean", "-17.74 -17.74 62.31 63.6 -1 -1",2 # Indonesian Throughflow (east-west section): settings in spirit of OMIP "bulk" transport calculation +"ocean_model_z", "volcello", "volcello", "ocean_Indonesian_Throughflow", "all", "mean", "-246.0 -220.0 -8.1 -8.1 -1 -1",2 "ocean_model_z", "thetao", "thetao", "ocean_Indonesian_Throughflow", "all", "mean", "-246.0 -220.0 -8.1 -8.1 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Indonesian_Throughflow", "all", "mean", "-246.0 -220.0 -8.1 -8.1 -1 -1",2 "ocean_model_z", "vmo", "vmo", "ocean_Indonesian_Throughflow", "all", "mean", "-246.0 -220.0 -8.1 -8.1 -1 -1",2 "ocean_model_z", "vo", "vo", "ocean_Indonesian_Throughflow", "all", "mean", "-246.0 -220.0 -8.1 -8.1 -1 -1",2 # Mozambique Channel (east-west section) +"ocean_model_z", "volcello", "volcello", "ocean_Mozambique_Channel", "all", "mean", "39. 46. -16. -16. -1 -1",2 "ocean_model_z", "thetao", "thetao", "ocean_Mozambique_Channel", "all", "mean", "39. 46. -16. -16. -1 -1",2 "ocean_model_z", "so", "so", "ocean_Mozambique_Channel", "all", "mean", "39. 46. -16. -16. -1 -1",2 "ocean_model_z", "vmo", "vmo", "ocean_Mozambique_Channel", "all", "mean", "39. 46. -16. -16. -1 -1",2 "ocean_model_z", "vo", "vo", "ocean_Mozambique_Channel", "all", "mean", "39. 46. -16. -16. -1 -1",2 # Pacific Equatorial Undercurrent (north-south section) +"ocean_model_z", "volcello", "volcello", "ocean_Pacific_undercurrent", "all", "mean", "-155. -155. -2. 2. -1 -1",2 "ocean_model_z", "thetao", "thetao", "ocean_Pacific_undercurrent", "all", "mean", "-155. -155. -2. 2. -1 -1",2 "ocean_model_z", "so", "so", "ocean_Pacific_undercurrent", "all", "mean", "-155. -155. -2. 2. -1 -1",2 "ocean_model_z", "umo", "umo", "ocean_Pacific_undercurrent", "all", "mean", "-155. -155. -2. 2. -1 -1",2 "ocean_model_z", "uo", "uo", "ocean_Pacific_undercurrent", "all", "mean", "-155. -155. -2. 2. -1 -1",2 # Taiwan-Luzon (north-south section) +"ocean_model_z", "volcello", "volcello", "ocean_Taiwan_Luzon", "all", "mean", "-239.5 -239.5 17. 23. -1 -1",2 "ocean_model_z", "thetao", "thetao", "ocean_Taiwan_Luzon", "all", "mean", "-239.5 -239.5 17. 23. -1 -1",2 "ocean_model_z", "so", "so", "ocean_Taiwan_Luzon", "all", "mean", "-239.5 -239.5 17. 23. -1 -1",2 "ocean_model_z", "umo", "umo", "ocean_Taiwan_Luzon", "all", "mean", "-239.5 -239.5 17. 23. -1 -1",2 "ocean_model_z", "uo", "uo", "ocean_Taiwan_Luzon", "all", "mean", "-239.5 -239.5 17. 23. -1 -1",2 # Agulhas section (north-south section; transport is closely tied to Drake Passage transport) +"ocean_model_z", "volcello", "volcello", "ocean_Agulhas_section", "all", "mean", "20. 20. -71.0 -34 -1 -1",2 "ocean_model_z", "thetao", "thetao", "ocean_Agulhas_section", "all", "mean", "20. 20. -71.0 -34 -1 -1",2 "ocean_model_z", "so", "so", "ocean_Agulhas_section", "all", "mean", "20. 20. -71.0 -34 -1 -1",2 "ocean_model_z", "umo", "umo", "ocean_Agulhas_section", "all", "mean", "20. 20. -71.0 -34 -1 -1",2 "ocean_model_z", "uo", "uo", "ocean_Agulhas_section", "all", "mean", "20. 20. -71.0 -34 -1 -1",2 # Iceland-Norway (east-west section) +"ocean_model_z", "volcello", "volcello", "ocean_Iceland_Norway", "all", "mean", "-20. 15. 65. 65. -1 -1",2 "ocean_model_z", "thetao","thetao", "ocean_Iceland_Norway", "all", "mean", "-20. 15. 65. 65. -1 -1",2 "ocean_model_z", "so", "so", "ocean_Iceland_Norway", "all", "mean", "-20. 15. 65. 65. -1 -1",2 "ocean_model_z", "vmo", "vmo", "ocean_Iceland_Norway", "all", "mean", "-20. 15. 65. 65. -1 -1",2 diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup index c3662f0790..e7bb760e19 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup @@ -70,6 +70,10 @@ # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table H1: scalar fields such as tracers, cell mass/volume, sea level, MLD # Generally save annuals, and sometimes monthly and daily. +#"ocean_model_z", "volcello", "volcello", "ocean_annual_z", "all", "mean", "none",2 # Cell measure for 3d data +#"ocean_model_z", "volcello", "volcello", "ocean_month_z", "all", "mean", "none",2 # Cell measure for 3d data +#"ocean_model", "volcello", "volcello", "ocean_annual", "all", "mean", "none",2 # Cell measure for 3d data +#"ocean_model", "volcello", "volcello", "ocean_month", "all", "mean", "none",2 # Cell measure for 3d data "ocean_model", "pbo", "pbo", "ocean_annual", "all", "mean", "none",2 #"ocean_model", "pbo", "pbo", "ocean_month", "all", "mean", "none",2 "ocean_model", "pso", "pso", "ocean_annual", "all", "mean", "none",2 diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index ddcdf29027..c7692245ca 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -98,6 +98,26 @@ ! long_name: Sea Area Fraction ! units: % ! standard_name: SeaAreaFraction +"ocean_model", "volcello" [Unused] + ! long_name: Ocean grid-cell volume + ! units: m3 + ! standard_name: ocean_volume + ! cell_methods: xh:sum yh:sum zl:sum +"ocean_model", "volcello_xyave" [Unused] + ! long_name: Ocean grid-cell volume + ! units: m3 + ! standard_name: ocean_volume + ! cell_methods: zl:sum +"ocean_model_z", "volcello" [Unused] + ! long_name: Ocean grid-cell volume + ! units: m3 + ! standard_name: ocean_volume + ! cell_methods: xh:sum yh:sum z_l:sum +"ocean_model_z", "volcello_xyave" [Unused] + ! long_name: Ocean grid-cell volume + ! units: m3 + ! standard_name: ocean_volume + ! cell_methods: z_l:sum "ocean_model", "MEKE" [Used] ! long_name: Mesoscale Eddy Kinetic Energy ! units: m2 s-2 diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 95722f8640..af602f1b64 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -98,6 +98,26 @@ ! long_name: Sea Area Fraction ! units: % ! standard_name: SeaAreaFraction +"ocean_model", "volcello" [Unused] + ! long_name: Ocean grid-cell volume + ! units: m3 + ! standard_name: ocean_volume + ! cell_methods: xh:sum yh:sum zl:sum +"ocean_model", "volcello_xyave" [Unused] + ! long_name: Ocean grid-cell volume + ! units: m3 + ! standard_name: ocean_volume + ! cell_methods: zl:sum +"ocean_model_z", "volcello" [Unused] + ! long_name: Ocean grid-cell volume + ! units: m3 + ! standard_name: ocean_volume + ! cell_methods: xh:sum yh:sum z_l:sum +"ocean_model_z", "volcello_xyave" [Unused] + ! long_name: Ocean grid-cell volume + ! units: m3 + ! standard_name: ocean_volume + ! cell_methods: z_l:sum "ocean_model", "MEKE" [Used] ! long_name: Mesoscale Eddy Kinetic Energy ! units: m2 s-2 diff --git a/src/MOM6 b/src/MOM6 index 0db9c886e2..60ce41fc63 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 0db9c886e29e9e56cfa2020b1cf4d2088910bc9c +Subproject commit 60ce41fc636612c80628925a988dab23397a3e1e From 8d4de1ef7fd56d35d1f78b122d47203a5c6580fb Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 27 Sep 2017 17:32:53 -0400 Subject: [PATCH 44/89] MOM6: Merge pull request #621 from adcroft/adds_area_cell_method - Updates available_diags - NOAA-GFDL/MOM6@0822a17 Merge pull request #621 from adcroft/adds_area_cell_method - NOAA-GFDL/MOM6@e662697 Generates cell method "area" from axis methods --- .../global_ALE/layer/available_diags.000000 | 678 +++++++------- .../global_ALE/z/available_diags.000000 | 844 +++++++++--------- src/MOM6 | 2 +- 3 files changed, 762 insertions(+), 762 deletions(-) diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index c7692245ca..6e3b5b5fdf 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -102,7 +102,7 @@ ! long_name: Ocean grid-cell volume ! units: m3 ! standard_name: ocean_volume - ! cell_methods: xh:sum yh:sum zl:sum + ! cell_methods: xh:sum yh:sum zl:sum area:sum "ocean_model", "volcello_xyave" [Unused] ! long_name: Ocean grid-cell volume ! units: m3 @@ -112,7 +112,7 @@ ! long_name: Ocean grid-cell volume ! units: m3 ! standard_name: ocean_volume - ! cell_methods: xh:sum yh:sum z_l:sum + ! cell_methods: xh:sum yh:sum z_l:sum area:sum "ocean_model_z", "volcello_xyave" [Unused] ! long_name: Ocean grid-cell volume ! units: m3 @@ -121,35 +121,35 @@ "ocean_model", "MEKE" [Used] ! long_name: Mesoscale Eddy Kinetic Energy ! units: m2 s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_KH" [Used] ! long_name: MEKE derived diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_KU" [Unused] ! long_name: MEKE derived lateral viscosity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Ue" [Unused] ! long_name: MEKE derived eddy-velocity scale ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Ub" [Unused] ! long_name: MEKE derived bottom eddy-velocity scale ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Ut" [Unused] ! long_name: MEKE derived barotropic eddy-velocity scale ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_src" [Unused] ! long_name: MEKE energy source ! units: m2 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_decay" [Unused] ! long_name: MEKE decay rate ! units: s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "KHMEKE_u" [Unused] ! long_name: Zonal diffusivity of MEKE ! units: m2 s-1 @@ -161,31 +161,31 @@ "ocean_model", "MEKE_GM_src" [Unused] ! long_name: MEKE energy available from thickness mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_mom_src" [Unused] ! long_name: MEKE energy available from momentum ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Le" [Unused] ! long_name: Eddy mixing length used in the MEKE derived eddy diffusivity ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Lrhines" [Unused] ! long_name: Rhines length scale used in the MEKE derived eddy diffusivity ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Leady" [Unused] ! long_name: Eady length scale used in the MEKE derived eddy diffusivity ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_gamma_b" [Unused] ! long_name: Ratio of bottom-projected eddy velocity to column-mean eddy velocity ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_gamma_t" [Unused] ! long_name: Ratio of barotropic eddy velocity to column-mean eddy velocity ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SN_u" [Used] ! long_name: Inverse eddy time-scale, S*N, at u-points ! units: s-1 @@ -197,11 +197,11 @@ "ocean_model", "Res_fn" [Unused] ! long_name: Resolution function for scaling diffusivities ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Rd_dx" [Unused] ! long_name: Ratio between deformation radius and grid spacing ! units: m m-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "bbl_thick_u" [Unused] ! long_name: BBL thickness at u points ! units: m @@ -325,7 +325,7 @@ "ocean_model", "e_tidal" [Unused] ! long_name: Tidal Forcing Astronomical and SAL Height Anomaly ! units: meter - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "diffu" [Unused] ! long_name: Zonal Acceleration from Horizontal Viscosity ! units: m s-2 @@ -361,7 +361,7 @@ "ocean_model", "Ahh" [Unused] (CMOR equivalent is "difmxybo") ! long_name: Biharmonic Horizontal Viscosity at h Points ! units: m4 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Ahh_xyave" [Unused] (CMOR equivalent is "difmxybo_xyave") ! long_name: Biharmonic Horizontal Viscosity at h Points ! units: m4 s-1 @@ -370,7 +370,7 @@ ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 ! standard_name: ocean_momentum_xy_biharmonic_diffusivity - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "difmxybo_xyave" [Unused] (native name is "Ahh_xyave") ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 @@ -379,7 +379,7 @@ "ocean_model_z", "Ahh" [Unused] (CMOR equivalent is "difmxybo") ! long_name: Biharmonic Horizontal Viscosity at h Points ! units: m4 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Ahh_xyave" [Unused] (CMOR equivalent is "difmxybo_xyave") ! long_name: Biharmonic Horizontal Viscosity at h Points ! units: m4 s-1 @@ -388,7 +388,7 @@ ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 ! standard_name: ocean_momentum_xy_biharmonic_diffusivity - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "difmxybo_xyave" [Unused] (native name is "Ahh_xyave") ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 @@ -401,7 +401,7 @@ "ocean_model", "Khh" [Unused] (CMOR equivalent is "difmxylo") ! long_name: Laplacian Horizontal Viscosity at h Points ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Khh_xyave" [Unused] (CMOR equivalent is "difmxylo_xyave") ! long_name: Laplacian Horizontal Viscosity at h Points ! units: m2 s-1 @@ -410,7 +410,7 @@ ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 ! standard_name: ocean_momentum_xy_laplacian_diffusivity - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "difmxylo_xyave" [Unused] (native name is "Khh_xyave") ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 @@ -419,7 +419,7 @@ "ocean_model_z", "Khh" [Unused] (CMOR equivalent is "difmxylo") ! long_name: Laplacian Horizontal Viscosity at h Points ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Khh_xyave" [Unused] (CMOR equivalent is "difmxylo_xyave") ! long_name: Laplacian Horizontal Viscosity at h Points ! units: m2 s-1 @@ -428,7 +428,7 @@ ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 ! standard_name: ocean_momentum_xy_laplacian_diffusivity - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "difmxylo_xyave" [Unused] (native name is "Khh_xyave") ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 @@ -441,7 +441,7 @@ "ocean_model", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "FrictWork_xyave" [Unused] ! long_name: Integral work done by lateral friction terms ! units: W m-2 @@ -449,7 +449,7 @@ "ocean_model_z", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "FrictWork_xyave" [Unused] ! long_name: Integral work done by lateral friction terms ! units: W m-2 @@ -457,12 +457,12 @@ "ocean_model", "FrictWorkIntz" [Unused] (CMOR equivalent is "dispkexyfo") ! long_name: Depth integrated work done by lateral friction ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "dispkexyfo" [Used] (native name is "FrictWorkIntz") ! long_name: Depth integrated ocean kinetic energy dissipation due to lateral friction ! units: W m-2 ! standard_name: ocean_kinetic_energy_dissipation_per_unit_area_due_to_xy_friction - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "au_visc" [Unused] ! long_name: Zonal Viscous Vertical Coupling Coefficient ! units: m s-1 @@ -610,7 +610,7 @@ "ocean_model", "eta_bt" [Unused] ! long_name: Barotropic end SSH ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ubt" [Unused] ! long_name: Barotropic end zonal velocity ! units: m s-1 @@ -622,7 +622,7 @@ "ocean_model", "eta_st" [Unused] ! long_name: Barotropic start SSH ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ubt_st" [Unused] ! long_name: Barotropic start zonal velocity ! units: m s-1 @@ -642,7 +642,7 @@ "ocean_model", "eta_cor" [Unused] ! long_name: Corrective mass flux ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "visc_rem_u" [Unused] ! long_name: Viscous remnant at u ! units: nondim @@ -678,23 +678,23 @@ "ocean_model", "gtot_n" [Unused] ! long_name: gtot to North ! units: m s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "gtot_s" [Unused] ! long_name: gtot to South ! units: m s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "gtot_e" [Unused] ! long_name: gtot to East ! units: m s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "gtot_w" [Unused] ! long_name: gtot to West ! units: m s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "eta_hifreq" [Unused] ! long_name: High Frequency Barotropic SSH ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ubt_hifreq" [Unused] ! long_name: High Frequency Barotropic zonal velocity ! units: m s-1 @@ -706,7 +706,7 @@ "ocean_model", "eta_pred_hifreq" [Unused] ! long_name: High Frequency Predictor Barotropic SSH ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "uhbt_hifreq" [Unused] ! long_name: High Frequency Barotropic zonal transport ! units: m3 s-1 @@ -1038,12 +1038,12 @@ "ocean_model", "GMwork" [Used] (CMOR equivalent is "tnkebto") ! long_name: Integrated Tendency of Ocean Mesoscale Eddy KE from Parameterized Eddy Advection ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "tnkebto" [Unused] (native name is "GMwork") ! long_name: Integrated Tendency of Ocean Mesoscale Eddy KE from Parameterized Eddy Advection ! units: W m-2 ! standard_name: tendency_of_ocean_eddy_kinetic_energy_content_due_to_parameterized_eddy_advection - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "KHTH_u" [Used] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-point ! units: m s-2 @@ -1079,7 +1079,7 @@ "ocean_model", "KHTH_t" [Unused] (CMOR equivalent is "diftrblo") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m s-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KHTH_t_xyave" [Unused] (CMOR equivalent is "diftrblo_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m s-2 @@ -1088,7 +1088,7 @@ ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m2 s-1 ! standard_name: ocean_tracer_diffusivity_due_to_parameterized_mesoscale_advection - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "diftrblo_xyave" [Unused] (native name is "KHTH_t_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m2 s-1 @@ -1097,7 +1097,7 @@ "ocean_model_z", "KHTH_t" [Unused] (CMOR equivalent is "diftrblo") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m s-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KHTH_t_xyave" [Unused] (CMOR equivalent is "diftrblo_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m s-2 @@ -1106,7 +1106,7 @@ ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m2 s-1 ! standard_name: ocean_tracer_diffusivity_due_to_parameterized_mesoscale_advection - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "diftrblo_xyave" [Unused] (native name is "KHTH_t_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m2 s-1 @@ -1123,7 +1123,7 @@ "ocean_model", "KHTH_t1" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at T-points (2-D) ! units: m s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "neutral_slope_x" [Unused] ! long_name: Zonal slope of neutral surface ! units: nondim @@ -1263,11 +1263,11 @@ "ocean_model", "MLD_restrat" [Unused] ! long_name: Mixed Layer Depth as used in the mixed-layer restratification parameterization ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ML_buoy_restrat" [Unused] ! long_name: Mixed Layer Buoyancy as used in the mixed-layer restratification parameterization ! units: m s2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "udml_restrat" [Unused] ! long_name: Transport stream function amplitude for zonal restratification of mixed layer ! units: m3 s-1 @@ -1296,7 +1296,7 @@ ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 ! standard_name: sea_water_mass_per_unit_area - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "masscello_xyave" [Unused] ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 @@ -1306,7 +1306,7 @@ ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 ! standard_name: sea_water_mass_per_unit_area - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "masscello_xyave" [Unused] ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 @@ -1320,7 +1320,7 @@ ! long_name: Cell Thickness ! units: m ! standard_name: cell_thickness - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "thkcello_xyave" [Unused] ! long_name: Cell Thickness ! units: m @@ -1330,7 +1330,7 @@ ! long_name: Cell Thickness ! units: m ! standard_name: cell_thickness - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "thkcello_xyave" [Unused] ! long_name: Cell Thickness ! units: m @@ -1363,7 +1363,7 @@ "ocean_model", "e" [Used] ! long_name: Interface Height Relative to Mean Sea Level ! units: m - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "e_xyave" [Unused] ! long_name: Interface Height Relative to Mean Sea Level ! units: m @@ -1371,7 +1371,7 @@ "ocean_model_z", "e" [Unused] ! long_name: Interface Height Relative to Mean Sea Level ! units: m - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "e_xyave" [Unused] ! long_name: Interface Height Relative to Mean Sea Level ! units: m @@ -1379,7 +1379,7 @@ "ocean_model", "e_D" [Unused] ! long_name: Interface Height above the Seafloor ! units: m - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "e_D_xyave" [Unused] ! long_name: Interface Height above the Seafloor ! units: m @@ -1387,7 +1387,7 @@ "ocean_model_z", "e_D" [Unused] ! long_name: Interface Height above the Seafloor ! units: m - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "e_D_xyave" [Unused] ! long_name: Interface Height above the Seafloor ! units: m @@ -1395,7 +1395,7 @@ "ocean_model", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Rml_xyave" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg m-3 @@ -1403,7 +1403,7 @@ "ocean_model_z", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Rml_xyave" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg m-3 @@ -1411,7 +1411,7 @@ "ocean_model", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Rho_cv_xyave" [Unused] ! long_name: Coordinate Potential Density ! units: kg m-3 @@ -1419,7 +1419,7 @@ "ocean_model_z", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Rho_cv_xyave" [Unused] ! long_name: Coordinate Potential Density ! units: kg m-3 @@ -1427,7 +1427,7 @@ "ocean_model", "rhopot0" [Unused] ! long_name: Potential density referenced to surface ! units: kg m-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "rhopot0_xyave" [Unused] ! long_name: Potential density referenced to surface ! units: kg m-3 @@ -1435,7 +1435,7 @@ "ocean_model_z", "rhopot0" [Unused] ! long_name: Potential density referenced to surface ! units: kg m-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "rhopot0_xyave" [Unused] ! long_name: Potential density referenced to surface ! units: kg m-3 @@ -1443,7 +1443,7 @@ "ocean_model", "rhopot2" [Unused] ! long_name: Potential density referenced to 2000 dbar ! units: kg m-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "rhopot2_xyave" [Unused] ! long_name: Potential density referenced to 2000 dbar ! units: kg m-3 @@ -1451,7 +1451,7 @@ "ocean_model_z", "rhopot2" [Unused] ! long_name: Potential density referenced to 2000 dbar ! units: kg m-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "rhopot2_xyave" [Unused] ! long_name: Potential density referenced to 2000 dbar ! units: kg m-3 @@ -1459,7 +1459,7 @@ "ocean_model", "rhoinsitu" [Unused] ! long_name: In situ density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "rhoinsitu_xyave" [Unused] ! long_name: In situ density ! units: kg m-3 @@ -1467,7 +1467,7 @@ "ocean_model_z", "rhoinsitu" [Unused] ! long_name: In situ density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "rhoinsitu_xyave" [Unused] ! long_name: In situ density ! units: kg m-3 @@ -1507,7 +1507,7 @@ "ocean_model", "dhdt" [Unused] ! long_name: Thickness tendency ! units: m s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "dhdt_xyave" [Unused] ! long_name: Thickness tendency ! units: m s-1 @@ -1515,7 +1515,7 @@ "ocean_model_z", "dhdt" [Unused] ! long_name: Thickness tendency ! units: m s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "dhdt_xyave" [Unused] ! long_name: Thickness tendency ! units: m s-1 @@ -1523,7 +1523,7 @@ "ocean_model", "h_rho" [Used] ! long_name: Layer thicknesses in pure potential density coordinates ! units: m - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "h_rho_xyave" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates ! units: m @@ -1531,7 +1531,7 @@ "ocean_model_z", "h_rho" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates ! units: m - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "h_rho_xyave" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates ! units: m @@ -1603,7 +1603,7 @@ "ocean_model", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: m2 s-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_xyave" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: m2 s-2 @@ -1611,7 +1611,7 @@ "ocean_model_z", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: m2 s-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_xyave" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: m2 s-2 @@ -1619,7 +1619,7 @@ "ocean_model", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "dKE_dt_xyave" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: m3 s-3 @@ -1627,7 +1627,7 @@ "ocean_model_z", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "dKE_dt_xyave" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: m3 s-3 @@ -1635,7 +1635,7 @@ "ocean_model", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "PE_to_KE_xyave" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: m3 s-3 @@ -1643,7 +1643,7 @@ "ocean_model_z", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "PE_to_KE_xyave" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: m3 s-3 @@ -1651,7 +1651,7 @@ "ocean_model", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_Coradv_xyave" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: m3 s-3 @@ -1659,7 +1659,7 @@ "ocean_model_z", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_Coradv_xyave" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: m3 s-3 @@ -1667,7 +1667,7 @@ "ocean_model", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_adv_xyave" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: m3 s-3 @@ -1675,7 +1675,7 @@ "ocean_model_z", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_adv_xyave" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: m3 s-3 @@ -1683,7 +1683,7 @@ "ocean_model", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_visc_xyave" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: m3 s-3 @@ -1691,7 +1691,7 @@ "ocean_model_z", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_visc_xyave" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: m3 s-3 @@ -1699,7 +1699,7 @@ "ocean_model", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_horvisc_xyave" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: m3 s-3 @@ -1707,7 +1707,7 @@ "ocean_model_z", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_horvisc_xyave" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: m3 s-3 @@ -1715,7 +1715,7 @@ "ocean_model", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_dia_xyave" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: m3 s-3 @@ -1723,7 +1723,7 @@ "ocean_model_z", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_dia_xyave" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: m3 s-3 @@ -1731,35 +1731,35 @@ "ocean_model", "cg1" [Unused] ! long_name: First baroclinic gravity wave speed ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Rd1" [Unused] ! long_name: First baroclinic deformation radius ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "CFL_cg1" [Unused] ! long_name: CFL of first baroclinic gravity wave = dt*cg1*(1/dx+1/dy) ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "CFL_cg1_x" [Unused] ! long_name: i-component of CFL of first baroclinic gravity wave = dt*cg1*/dx ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "CFL_cg1_y" [Unused] ! long_name: j-component of CFL of first baroclinic gravity wave = dt*cg1*/dy ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "cg_ebt" [Unused] ! long_name: Equivalent barotropic gravity wave speed ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Rd_ebt" [Unused] ! long_name: Equivalent barotropic deformation radius ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "p_ebt" [Unused] ! long_name: Equivalent barotropic modal strcuture ! units: nondim - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "p_ebt_xyave" [Unused] ! long_name: Equivalent barotropic modal strcuture ! units: nondim @@ -1767,7 +1767,7 @@ "ocean_model_z", "p_ebt" [Unused] ! long_name: Equivalent barotropic modal strcuture ! units: nondim - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "p_ebt_xyave" [Unused] ! long_name: Equivalent barotropic modal strcuture ! units: nondim @@ -1775,38 +1775,38 @@ "ocean_model", "mass_wt" [Unused] ! long_name: The column mass for calculating mass-weighted average properties ! units: kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "temp_int" [Unused] (CMOR equivalent is "opottempmint") ! long_name: Density weighted column integrated potential temperature ! units: degC kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "opottempmint" [Used] (native name is "temp_int") ! long_name: integral_wrt_depth_of_product_of_sea_water_density_and_potential_temperature ! units: degC kg m-2 ! standard_name: Depth integrated density times potential temperature - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "salt_int" [Unused] (CMOR equivalent is "somint") ! long_name: Density weighted column integrated salinity ! units: psu kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "somint" [Used] (native name is "salt_int") ! long_name: integral_wrt_depth_of_product_of_sea_water_density_and_salinity ! units: psu kg m-2 ! standard_name: Depth integrated density times salinity - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "col_mass" [Unused] ! long_name: The column integrated in situ density ! units: kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "col_height" [Unused] ! long_name: The height of the water column ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "pbo" [Used] ! long_name: Sea Water Pressure at Sea Floor ! units: Pa ! standard_name: sea_water_pressure_at_sea_floor - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model_zold", "u" [Unused] (CMOR equivalent is "uo") ! long_name: Zonal Velocity in Depth Space ! units: m s-1 @@ -1830,7 +1830,7 @@ "ocean_model", "ea" [Unused] ! long_name: Layer entrainment from above per timestep ! units: m - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "ea_xyave" [Unused] ! long_name: Layer entrainment from above per timestep ! units: m @@ -1838,7 +1838,7 @@ "ocean_model_z", "ea" [Unused] ! long_name: Layer entrainment from above per timestep ! units: m - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "ea_xyave" [Unused] ! long_name: Layer entrainment from above per timestep ! units: m @@ -1846,7 +1846,7 @@ "ocean_model", "eb" [Unused] ! long_name: Layer entrainment from below per timestep ! units: m - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "eb_xyave" [Unused] ! long_name: Layer entrainment from below per timestep ! units: m @@ -1854,7 +1854,7 @@ "ocean_model_z", "eb" [Unused] ! long_name: Layer entrainment from below per timestep ! units: m - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "eb_xyave" [Unused] ! long_name: Layer entrainment from below per timestep ! units: m @@ -1894,7 +1894,7 @@ "ocean_model", "wd" [Used] ! long_name: Diapycnal Velocity ! units: m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "wd_xyave" [Unused] ! long_name: Diapycnal Velocity ! units: m s-1 @@ -1902,7 +1902,7 @@ "ocean_model_z", "wd" [Unused] ! long_name: Diapycnal Velocity ! units: m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "wd_xyave" [Unused] ! long_name: Diapycnal Velocity ! units: m s-1 @@ -1910,7 +1910,7 @@ "ocean_model", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Tflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 @@ -1918,7 +1918,7 @@ "ocean_model_z", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Tflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 @@ -1926,7 +1926,7 @@ "ocean_model", "Tflx_dia_adv" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces ! units: degC m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Tflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces ! units: degC m s-1 @@ -1934,7 +1934,7 @@ "ocean_model_z", "Tflx_dia_adv" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces ! units: degC m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Tflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces ! units: degC m s-1 @@ -1942,7 +1942,7 @@ "ocean_model", "Sflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces ! units: psu m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Sflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces ! units: psu m s-1 @@ -1950,7 +1950,7 @@ "ocean_model_z", "Sflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces ! units: psu m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Sflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces ! units: psu m s-1 @@ -1958,7 +1958,7 @@ "ocean_model", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces ! units: psu m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Sflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces ! units: psu m s-1 @@ -1966,7 +1966,7 @@ "ocean_model_z", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces ! units: psu m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Sflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces ! units: psu m s-1 @@ -1974,29 +1974,29 @@ "ocean_model", "MLD_003" [Used] (CMOR equivalent is "mlotst") ! long_name: Mixed layer depth (delta rho = 0.03) ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "mlotst" [Used] (native name is "MLD_003") ! long_name: Ocean Mixed Layer Thickness Defined by Sigma T ! units: m ! standard_name: ocean_mixed_layer_thickness_defined_by_sigma_t - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "mlotstsq" [Used] ! long_name: Square of Ocean Mixed Layer Thickness Defined by Sigma T ! units: m2 ! standard_name: square_of_ocean_mixed_layer_thickness_defined_by_sigma_t - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MLD_0125" [Unused] ! long_name: Mixed layer depth (delta rho = 0.125) ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "subML_N2" [Used] ! long_name: Squared buoyancy frequency below mixed layer ! units: s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MLD_user" [Unused] ! long_name: Mixed layer depth (used defined) ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model_zold", "Kd_interface" [Unused] ! long_name: Diapycnal diffusivity at interfaces, interpolated to z ! units: m2 s-1 @@ -2015,7 +2015,7 @@ "ocean_model", "Kd_interface" [Used] ! long_name: Total diapycnal diffusivity at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_interface_xyave" [Unused] ! long_name: Total diapycnal diffusivity at interfaces ! units: m2 s-1 @@ -2023,7 +2023,7 @@ "ocean_model_z", "Kd_interface" [Unused] ! long_name: Total diapycnal diffusivity at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_interface_xyave" [Unused] ! long_name: Total diapycnal diffusivity at interfaces ! units: m2 s-1 @@ -2031,7 +2031,7 @@ "ocean_model", "Kd_heat" [Unused] (CMOR equivalent is "difvho") ! long_name: Total diapycnal diffusivity for heat at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_heat_xyave" [Unused] (CMOR equivalent is "difvho_xyave") ! long_name: Total diapycnal diffusivity for heat at interfaces ! units: m2 s-1 @@ -2040,7 +2040,7 @@ ! long_name: Ocean vertical heat diffusivity ! units: m2 s-1 ! standard_name: ocean_vertical_heat_diffusivity - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "difvho_xyave" [Unused] (native name is "Kd_heat_xyave") ! long_name: Ocean vertical heat diffusivity ! units: m2 s-1 @@ -2049,7 +2049,7 @@ "ocean_model_z", "Kd_heat" [Unused] (CMOR equivalent is "difvho") ! long_name: Total diapycnal diffusivity for heat at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_heat_xyave" [Unused] (CMOR equivalent is "difvho_xyave") ! long_name: Total diapycnal diffusivity for heat at interfaces ! units: m2 s-1 @@ -2058,7 +2058,7 @@ ! long_name: Ocean vertical heat diffusivity ! units: m2 s-1 ! standard_name: ocean_vertical_heat_diffusivity - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "difvho_xyave" [Unused] (native name is "Kd_heat_xyave") ! long_name: Ocean vertical heat diffusivity ! units: m2 s-1 @@ -2067,7 +2067,7 @@ "ocean_model", "Kd_salt" [Unused] (CMOR equivalent is "difvso") ! long_name: Total diapycnal diffusivity for salt at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_salt_xyave" [Unused] (CMOR equivalent is "difvso_xyave") ! long_name: Total diapycnal diffusivity for salt at interfaces ! units: m2 s-1 @@ -2076,7 +2076,7 @@ ! long_name: Ocean vertical salt diffusivity ! units: m2 s-1 ! standard_name: ocean_vertical_salt_diffusivity - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "difvso_xyave" [Unused] (native name is "Kd_salt_xyave") ! long_name: Ocean vertical salt diffusivity ! units: m2 s-1 @@ -2085,7 +2085,7 @@ "ocean_model_z", "Kd_salt" [Unused] (CMOR equivalent is "difvso") ! long_name: Total diapycnal diffusivity for salt at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_salt_xyave" [Unused] (CMOR equivalent is "difvso_xyave") ! long_name: Total diapycnal diffusivity for salt at interfaces ! units: m2 s-1 @@ -2094,7 +2094,7 @@ ! long_name: Ocean vertical salt diffusivity ! units: m2 s-1 ! standard_name: ocean_vertical_salt_diffusivity - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "difvso_xyave" [Unused] (native name is "Kd_salt_xyave") ! long_name: Ocean vertical salt diffusivity ! units: m2 s-1 @@ -2103,7 +2103,7 @@ "ocean_model", "frazil_temp_tendency" [Used] ! long_name: Temperature tendency due to frazil formation ! units: degC s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "frazil_temp_tendency_xyave" [Unused] ! long_name: Temperature tendency due to frazil formation ! units: degC s-1 @@ -2111,7 +2111,7 @@ "ocean_model_z", "frazil_temp_tendency" [Unused] ! long_name: Temperature tendency due to frazil formation ! units: degC s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "frazil_temp_tendency_xyave" [Unused] ! long_name: Temperature tendency due to frazil formation ! units: degC s-1 @@ -2119,7 +2119,7 @@ "ocean_model", "frazil_heat_tendency" [Used] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 @@ -2127,7 +2127,7 @@ "ocean_model_z", "frazil_heat_tendency" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 @@ -2135,11 +2135,11 @@ "ocean_model", "frazil_heat_tendency_2d" [Used] ! long_name: Depth integrated heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Kd_effective" [Used] ! long_name: Diapycnal diffusivity as applied ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_effective_xyave" [Unused] ! long_name: Diapycnal diffusivity as applied ! units: m2 s-1 @@ -2147,7 +2147,7 @@ "ocean_model_z", "Kd_effective" [Unused] ! long_name: Diapycnal diffusivity as applied ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_effective_xyave" [Unused] ! long_name: Diapycnal diffusivity as applied ! units: m2 s-1 @@ -2155,7 +2155,7 @@ "ocean_model", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "diff_work_xyave" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 @@ -2163,7 +2163,7 @@ "ocean_model_z", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "diff_work_xyave" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 @@ -2178,7 +2178,7 @@ "ocean_model", "Kd_BBL" [Used] ! long_name: Bottom Boundary Layer Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_BBL_xyave" [Unused] ! long_name: Bottom Boundary Layer Diffusivity ! units: m2 s-1 @@ -2186,7 +2186,7 @@ "ocean_model_z", "Kd_BBL" [Unused] ! long_name: Bottom Boundary Layer Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_BBL_xyave" [Unused] ! long_name: Bottom Boundary Layer Diffusivity ! units: m2 s-1 @@ -2194,7 +2194,7 @@ "ocean_model", "Kd_layer" [Used] ! long_name: Diapycnal diffusivity of layers (as set) ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_layer_xyave" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) ! units: m2 s-1 @@ -2202,7 +2202,7 @@ "ocean_model_z", "Kd_layer" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_layer_xyave" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) ! units: m2 s-1 @@ -2210,11 +2210,11 @@ "ocean_model", "TKE_itidal" [Unused] ! long_name: Internal Tide Driven Turbulent Kinetic Energy ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "maxTKE" [Unused] ! long_name: Maximum layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "maxTKE_xyave" [Unused] ! long_name: Maximum layer TKE ! units: m3 s-3 @@ -2222,7 +2222,7 @@ "ocean_model_z", "maxTKE" [Unused] ! long_name: Maximum layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "maxTKE_xyave" [Unused] ! long_name: Maximum layer TKE ! units: m3 s-3 @@ -2230,7 +2230,7 @@ "ocean_model", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd ! units: s2 m - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "TKE_to_Kd_xyave" [Unused] ! long_name: Convert TKE to Kd ! units: s2 m @@ -2238,7 +2238,7 @@ "ocean_model_z", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd ! units: s2 m - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "TKE_to_Kd_xyave" [Unused] ! long_name: Convert TKE to Kd ! units: s2 m @@ -2246,11 +2246,11 @@ "ocean_model", "Nb" [Unused] ! long_name: Bottom Buoyancy Frequency ! units: s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Kd_itides" [Used] ! long_name: Internal Tide Driven Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_itides_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity ! units: m2 s-1 @@ -2258,7 +2258,7 @@ "ocean_model_z", "Kd_itides" [Unused] ! long_name: Internal Tide Driven Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_itides_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity ! units: m2 s-1 @@ -2266,7 +2266,7 @@ "ocean_model", "Kd_lowmode" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_lowmode_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) ! units: m2 s-1 @@ -2274,7 +2274,7 @@ "ocean_model_z", "Kd_lowmode" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_lowmode_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) ! units: m2 s-1 @@ -2282,7 +2282,7 @@ "ocean_model", "Fl_itides" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Fl_itides_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation ! units: m3 s-3 @@ -2290,7 +2290,7 @@ "ocean_model_z", "Fl_itides" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Fl_itides_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation ! units: m3 s-3 @@ -2298,7 +2298,7 @@ "ocean_model", "Fl_lowmode" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Fl_lowmode_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) ! units: m3 s-3 @@ -2306,7 +2306,7 @@ "ocean_model_z", "Fl_lowmode" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Fl_lowmode_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) ! units: m3 s-3 @@ -2314,23 +2314,23 @@ "ocean_model", "Polzin_decay_scale" [Unused] ! long_name: Vertical decay scale for the tidal turbulent dissipation with Polzin scheme ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Polzin_decay_scale_scaled" [Unused] ! long_name: Vertical decay scale for the tidal turbulent dissipation with Polzin scheme, scaled by N2_bot/N2_meanz ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "N2_b" [Unused] ! long_name: Bottom Buoyancy frequency squared ! units: s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "N2_meanz" [Unused] ! long_name: Buoyancy frequency squared averaged over the water column ! units: s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_Work_xyave" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: W m-2 @@ -2338,7 +2338,7 @@ "ocean_model_z", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_Work_xyave" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: W m-2 @@ -2346,7 +2346,7 @@ "ocean_model", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_Itidal_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: W m-2 @@ -2354,7 +2354,7 @@ "ocean_model_z", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_Itidal_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: W m-2 @@ -2362,7 +2362,7 @@ "ocean_model", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_Nikurashin_Work_xyave" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: W m-2 @@ -2370,7 +2370,7 @@ "ocean_model_z", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_Nikurashin_Work_xyave" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: W m-2 @@ -2378,7 +2378,7 @@ "ocean_model", "Kd_Lowmode_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_Lowmode_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) ! units: W m-2 @@ -2386,7 +2386,7 @@ "ocean_model_z", "Kd_Lowmode_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_Lowmode_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) ! units: W m-2 @@ -2394,7 +2394,7 @@ "ocean_model", "N2" [Unused] (CMOR equivalent is "obvfsq") ! long_name: Buoyancy frequency squared ! units: s-2 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "N2_xyave" [Unused] (CMOR equivalent is "obvfsq_xyave") ! long_name: Buoyancy frequency squared ! units: s-2 @@ -2403,7 +2403,7 @@ ! long_name: Square of seawater buoyancy frequency ! units: s-2 ! standard_name: square_of_brunt_vaisala_frequency_in_sea_water - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "obvfsq_xyave" [Unused] (native name is "N2_xyave") ! long_name: Square of seawater buoyancy frequency ! units: s-2 @@ -2412,7 +2412,7 @@ "ocean_model_z", "N2" [Unused] (CMOR equivalent is "obvfsq") ! long_name: Buoyancy frequency squared ! units: s-2 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "N2_xyave" [Unused] (CMOR equivalent is "obvfsq_xyave") ! long_name: Buoyancy frequency squared ! units: s-2 @@ -2421,7 +2421,7 @@ ! long_name: Square of seawater buoyancy frequency ! units: s-2 ! standard_name: square_of_brunt_vaisala_frequency_in_sea_water - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "obvfsq_xyave" [Unused] (native name is "N2_xyave") ! long_name: Square of seawater buoyancy frequency ! units: s-2 @@ -2436,7 +2436,7 @@ "ocean_model", "Kd_shear" [Used] ! long_name: Shear-driven Diapycnal Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_shear_xyave" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity ! units: m2 s-1 @@ -2444,7 +2444,7 @@ "ocean_model_z", "Kd_shear" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_shear_xyave" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity ! units: m2 s-1 @@ -2452,7 +2452,7 @@ "ocean_model", "TKE_shear" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy ! units: m2 s-2 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "TKE_shear_xyave" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy ! units: m2 s-2 @@ -2460,7 +2460,7 @@ "ocean_model_z", "TKE_shear" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy ! units: m2 s-2 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "TKE_shear_xyave" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy ! units: m2 s-2 @@ -2468,79 +2468,79 @@ "ocean_model", "h_ML" [Unused] ! long_name: Surface mixed layer depth ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "TKE_wind" [Unused] ! long_name: Wind-stirring source of mixed layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "TKE_RiBulk" [Unused] ! long_name: Mean kinetic energy source of mixed layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "TKE_conv" [Unused] ! long_name: Convective source of mixed layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "TKE_pen_SW" [Unused] ! long_name: TKE consumed by mixing penetrative shortwave radation through the mixed layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "TKE_mixing" [Unused] ! long_name: TKE consumed by mixing that deepens the mixed layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "TKE_mech_decay" [Unused] ! long_name: Mechanical energy decay sink of mixed layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "TKE_conv_decay" [Unused] ! long_name: Convective energy decay sink of mixed layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "TKE_conv_s2" [Unused] ! long_name: Spurious source of mixed layer TKE from sigma2 ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "PE_detrain" [Unused] ! long_name: Spurious source of potential energy from mixed layer detrainment ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "PE_detrain2" [Unused] ! long_name: Spurious source of potential energy from mixed layer only detrainment ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "h_miss_ML" [Unused] ! long_name: Summed absolute mismatch in entrainment terms ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Hs_used" [Unused] ! long_name: Surface region thickness that is used ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Hs_max" [Unused] ! long_name: Maximum surface region thickness ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Hs_min" [Unused] ! long_name: Minimum surface region thickness ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "deficit_ratio" [Unused] ! long_name: Max face thickness deficit ratio ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SW_pen" [Unused] ! long_name: Penetrating shortwave radiation flux into ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SW_vis_pen" [Unused] ! long_name: Visible penetrating shortwave radiation flux into ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: m-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "opac_1_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: m-1 @@ -2548,7 +2548,7 @@ "ocean_model_z", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: m-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "opac_1_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: m-1 @@ -2556,7 +2556,7 @@ "ocean_model", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: m-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "opac_2_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: m-1 @@ -2564,7 +2564,7 @@ "ocean_model_z", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: m-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "opac_2_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: m-1 @@ -2572,7 +2572,7 @@ "ocean_model", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: m-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "opac_3_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: m-1 @@ -2580,7 +2580,7 @@ "ocean_model_z", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: m-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "opac_3_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: m-1 @@ -2588,7 +2588,7 @@ "ocean_model", "Chl_opac" [Unused] ! long_name: Surface chlorophyll A concentration used to find opacity ! units: mg m-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "KHTR_u" [Used] ! long_name: Epipycnal tracer diffusivity at zonal faces of tracer cell ! units: m2 s-1 @@ -2600,12 +2600,12 @@ "ocean_model", "KHTR_h" [Unused] (CMOR equivalent is "diftrelo") ! long_name: Epipycnal tracer diffusivity at tracer cell center ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "diftrelo" [Used] (native name is "KHTR_h") ! long_name: Ocean Tracer Epineutral Laplacian Diffusivity ! units: m2 s-1 ! standard_name: ocean_tracer_epineutral_laplacian_diffusivity - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "KHDT_x" [Unused] ! long_name: Epipycnal tracer diffusivity operator at zonal faces of tracer cell ! units: m2 @@ -2689,7 +2689,7 @@ "ocean_model", "h" [Used] ! long_name: Layer Thickness ! units: m - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "h_xyave" [Unused] ! long_name: Layer Thickness ! units: m @@ -2697,7 +2697,7 @@ "ocean_model_z", "h" [Unused] ! long_name: Layer Thickness ! units: m - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "h_xyave" [Unused] ! long_name: Layer Thickness ! units: m @@ -2710,16 +2710,16 @@ ! long_name: Sea surface height above geoid ! units: m ! standard_name: sea_surface_height_above_geoid - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "zossq" [Used] ! long_name: Square of sea surface height above geoid ! units: m2 ! standard_name: square_of_sea_surface_height_above_geoid - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SSH" [Used] ! long_name: Sea Surface Height ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ssh_ga" [Used] ! long_name: Area averaged sea surface height ! units: m @@ -2727,7 +2727,7 @@ "ocean_model", "SSH_inst" [Unused] ! long_name: Instantaneous Sea Surface Height ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SSU" [Used] ! long_name: Sea Surface Zonal Velocity ! units: m s-1 @@ -2739,11 +2739,11 @@ "ocean_model", "speed" [Used] ! long_name: Sea Surface Speed ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "temp" [Used] (CMOR equivalent is "thetao") ! long_name: Potential Temperature ! units: degC - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "temp_xyave" [Unused] (CMOR equivalent is "thetao_xyave") ! long_name: Potential Temperature ! units: degC @@ -2752,7 +2752,7 @@ ! long_name: Sea Water Potential Temperature ! units: degC ! standard_name: sea_water_potential_temperature - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "thetao_xyave" [Unused] (native name is "temp_xyave") ! long_name: Sea Water Potential Temperature ! units: degC @@ -2761,7 +2761,7 @@ "ocean_model_z", "temp" [Used] (CMOR equivalent is "thetao") ! long_name: Potential Temperature ! units: degC - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "temp_xyave" [Used] (CMOR equivalent is "thetao_xyave") ! long_name: Potential Temperature ! units: degC @@ -2770,7 +2770,7 @@ ! long_name: Sea Water Potential Temperature ! units: degC ! standard_name: sea_water_potential_temperature - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "thetao_xyave" [Unused] (native name is "temp_xyave") ! long_name: Sea Water Potential Temperature ! units: degC @@ -2779,7 +2779,7 @@ "ocean_model", "salt" [Used] (CMOR equivalent is "so") ! long_name: Salinity ! units: psu - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "salt_xyave" [Unused] (CMOR equivalent is "so_xyave") ! long_name: Salinity ! units: psu @@ -2788,7 +2788,7 @@ ! long_name: Sea Water Salinity ! units: psu ! standard_name: sea_water_salinity - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "so_xyave" [Unused] (native name is "salt_xyave") ! long_name: Sea Water Salinity ! units: psu @@ -2797,7 +2797,7 @@ "ocean_model_z", "salt" [Used] (CMOR equivalent is "so") ! long_name: Salinity ! units: psu - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "salt_xyave" [Unused] (CMOR equivalent is "so_xyave") ! long_name: Salinity ! units: psu @@ -2806,7 +2806,7 @@ ! long_name: Sea Water Salinity ! units: psu ! standard_name: sea_water_salinity - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "so_xyave" [Unused] (native name is "salt_xyave") ! long_name: Sea Water Salinity ! units: psu @@ -2816,69 +2816,69 @@ ! long_name: Sea Water Potential Temperature at Sea Floor ! units: degC ! standard_name: sea_water_potential_temperature_at_sea_floor - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sob" [Unused] ! long_name: Sea Water Salinity at Sea Floor ! units: psu ! standard_name: sea_water_salinity_at_sea_floor - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SST" [Used] (CMOR equivalent is "tos") ! long_name: Sea Surface Temperature ! units: degC - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "tos" [Unused] (native name is "SST") ! long_name: Sea Surface Temperature ! units: degC ! standard_name: sea_surface_temperature - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SST_sq" [Unused] (CMOR equivalent is "tossq") ! long_name: Sea Surface Temperature Squared ! units: degC2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "tossq" [Unused] (native name is "SST_sq") ! long_name: Square of Sea Surface Temperature ! units: degC2 ! standard_name: square_of_sea_surface_temperature - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SSS" [Used] (CMOR equivalent is "sos") ! long_name: Sea Surface Salinity ! units: psu - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sos" [Unused] (native name is "SSS") ! long_name: Sea Surface Salinity ! units: psu ! standard_name: sea_surface_salinity - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SSS_sq" [Unused] (CMOR equivalent is "sossq") ! long_name: Sea Surface Salinity Squared ! units: psu - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sossq" [Unused] (native name is "SSS_sq") ! long_name: Square of Sea Surface Salinity ! units: psu ! standard_name: square_of_sea_surface_salinity - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "frazil" [Used] (CMOR equivalent is "hfsifrazil") ! long_name: Heat from frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfsifrazil" [Used] (native name is "frazil") ! long_name: Heat Flux into Sea Water due to Frazil Ice Formation ! units: W m-2 ! standard_name: heat_flux_into_sea_water_due_to_frazil_ice_formation - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "salt_deficit" [Unused] ! long_name: Salt sink in ocean due to ice flux ! units: psu m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Heat_PmE" [Used] ! long_name: Heat flux into ocean from mass flux into ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "internal_heat" [Unused] ! long_name: Heat flux into ocean from geothermal or other internal sources ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "T_adx" [Used] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature ! units: W m-2 @@ -3074,7 +3074,7 @@ "ocean_model", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: m - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "h_predia_xyave" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: m @@ -3082,7 +3082,7 @@ "ocean_model_z", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: m - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "h_predia_xyave" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: m @@ -3090,7 +3090,7 @@ "ocean_model", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: m - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "e_predia_xyave" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: m @@ -3098,7 +3098,7 @@ "ocean_model_z", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: m - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "e_predia_xyave" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: m @@ -3138,7 +3138,7 @@ "ocean_model", "h_preale" [Unused] ! long_name: Layer Thickness before remapping ! units: m - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "h_preale_xyave" [Unused] ! long_name: Layer Thickness before remapping ! units: m @@ -3146,7 +3146,7 @@ "ocean_model_z", "h_preale" [Unused] ! long_name: Layer Thickness before remapping ! units: m - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "h_preale_xyave" [Unused] ! long_name: Layer Thickness before remapping ! units: m @@ -3154,7 +3154,7 @@ "ocean_model", "T_preale" [Unused] ! long_name: Temperature before remapping ! units: degC - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "T_preale_xyave" [Unused] ! long_name: Temperature before remapping ! units: degC @@ -3162,7 +3162,7 @@ "ocean_model_z", "T_preale" [Unused] ! long_name: Temperature before remapping ! units: degC - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "T_preale_xyave" [Unused] ! long_name: Temperature before remapping ! units: degC @@ -3170,7 +3170,7 @@ "ocean_model", "S_preale" [Unused] ! long_name: Salinity before remapping ! units: psu - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "S_preale_xyave" [Unused] ! long_name: Salinity before remapping ! units: psu @@ -3178,7 +3178,7 @@ "ocean_model_z", "S_preale" [Unused] ! long_name: Salinity before remapping ! units: psu - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "S_preale_xyave" [Unused] ! long_name: Salinity before remapping ! units: psu @@ -3186,7 +3186,7 @@ "ocean_model", "e_preale" [Unused] ! long_name: Interface Heights before remapping ! units: m - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "e_preale_xyave" [Unused] ! long_name: Interface Heights before remapping ! units: m @@ -3194,7 +3194,7 @@ "ocean_model_z", "e_preale" [Unused] ! long_name: Interface Heights before remapping ! units: m - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "e_preale_xyave" [Unused] ! long_name: Interface Heights before remapping ! units: m @@ -3202,7 +3202,7 @@ "ocean_model", "temp_predia" [Unused] ! long_name: Potential Temperature ! units: degC - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "temp_predia_xyave" [Unused] ! long_name: Potential Temperature ! units: degC @@ -3210,7 +3210,7 @@ "ocean_model_z", "temp_predia" [Unused] ! long_name: Potential Temperature ! units: degC - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "temp_predia_xyave" [Unused] ! long_name: Potential Temperature ! units: degC @@ -3218,7 +3218,7 @@ "ocean_model", "salt_predia" [Unused] ! long_name: Salinity ! units: psu - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "salt_predia_xyave" [Unused] ! long_name: Salinity ! units: psu @@ -3226,7 +3226,7 @@ "ocean_model_z", "salt_predia" [Unused] ! long_name: Salinity ! units: psu - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "salt_predia_xyave" [Unused] ! long_name: Salinity ! units: psu @@ -3316,7 +3316,7 @@ "ocean_model", "T_advection_xy" [Used] ! long_name: Horizontal convergence of residual mean heat advective fluxes ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "T_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes ! units: W m-2 @@ -3324,7 +3324,7 @@ "ocean_model_z", "T_advection_xy" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "T_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes ! units: W m-2 @@ -3332,11 +3332,11 @@ "ocean_model", "T_advection_xy_2d" [Used] ! long_name: Vertical sum of horizontal convergence of residual mean heat advective fluxes ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "T_tendency" [Used] ! long_name: Net time tendency for temperature ! units: degC s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "T_tendency_xyave" [Unused] ! long_name: Net time tendency for temperature ! units: degC s-1 @@ -3344,7 +3344,7 @@ "ocean_model_z", "T_tendency" [Unused] ! long_name: Net time tendency for temperature ! units: degC s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "T_tendency_xyave" [Unused] ! long_name: Net time tendency for temperature ! units: degC s-1 @@ -3352,7 +3352,7 @@ "ocean_model", "Th_tendency" [Unused] (CMOR equivalent is "opottemptend") ! long_name: Net time tendency for heat ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "Th_tendency_xyave" [Unused] (CMOR equivalent is "opottemptend_xyave") ! long_name: Net time tendency for heat ! units: W m-2 @@ -3361,7 +3361,7 @@ ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "opottemptend_xyave" [Unused] (native name is "Th_tendency_xyave") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content ! units: W m-2 @@ -3370,7 +3370,7 @@ "ocean_model_z", "Th_tendency" [Unused] (CMOR equivalent is "opottemptend") ! long_name: Net time tendency for heat ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "Th_tendency_xyave" [Unused] (CMOR equivalent is "opottemptend_xyave") ! long_name: Net time tendency for heat ! units: W m-2 @@ -3379,7 +3379,7 @@ ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "opottemptend_xyave" [Unused] (native name is "Th_tendency_xyave") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content ! units: W m-2 @@ -3388,16 +3388,16 @@ "ocean_model", "Th_tendency_2d" [Unused] (CMOR equivalent is "opottemptend_2d") ! long_name: Vertical sum of net time tendency for heat ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "opottemptend_2d" [Used] (native name is "Th_tendency_2d") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content Vertical Sum ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content_vertical_sum - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "S_advection_xy" [Used] ! long_name: Horizontal convergence of residual mean salt advective fluxes ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "S_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes ! units: kg m-2 s-1 @@ -3405,7 +3405,7 @@ "ocean_model_z", "S_advection_xy" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "S_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes ! units: kg m-2 s-1 @@ -3413,11 +3413,11 @@ "ocean_model", "S_advection_xy_2d" [Used] ! long_name: Vertical sum of horizontal convergence of residual mean salt advective fluxes ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "S_tendency" [Used] ! long_name: Net time tendency for salinity ! units: psu s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "S_tendency_xyave" [Unused] ! long_name: Net time tendency for salinity ! units: psu s-1 @@ -3425,7 +3425,7 @@ "ocean_model_z", "S_tendency" [Unused] ! long_name: Net time tendency for salinity ! units: psu s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "S_tendency_xyave" [Unused] ! long_name: Net time tendency for salinity ! units: psu s-1 @@ -3433,7 +3433,7 @@ "ocean_model", "Sh_tendency" [Unused] (CMOR equivalent is "osalttend") ! long_name: Net time tendency for salt ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "Sh_tendency_xyave" [Unused] (CMOR equivalent is "osalttend_xyave") ! long_name: Net time tendency for salt ! units: kg m-2 s-1 @@ -3442,7 +3442,7 @@ ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "osalttend_xyave" [Unused] (native name is "Sh_tendency_xyave") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content ! units: kg m-2 s-1 @@ -3451,7 +3451,7 @@ "ocean_model_z", "Sh_tendency" [Unused] (CMOR equivalent is "osalttend") ! long_name: Net time tendency for salt ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "Sh_tendency_xyave" [Unused] (CMOR equivalent is "osalttend_xyave") ! long_name: Net time tendency for salt ! units: kg m-2 s-1 @@ -3460,7 +3460,7 @@ ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "osalttend_xyave" [Unused] (native name is "Sh_tendency_xyave") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content ! units: kg m-2 s-1 @@ -3469,12 +3469,12 @@ "ocean_model", "Sh_tendency_2d" [Unused] (CMOR equivalent is "osalttend_2d") ! long_name: Vertical sum of net time tendency for salt ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "osalttend_2d" [Used] (native name is "Sh_tendency_2d") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content Vertical Sum ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content_vertical_sum - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model_zold", "temp" [Used] ! long_name: Potential Temperature ! units: degC @@ -3510,7 +3510,7 @@ "ocean_model", "age" [Unused] (CMOR equivalent is "agessc") ! long_name: Ideal Age Tracer ! units: yr - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "age_xyave" [Unused] (CMOR equivalent is "agessc_xyave") ! long_name: Ideal Age Tracer ! units: yr @@ -3519,7 +3519,7 @@ ! long_name: Ideal Age Tracer ! units: yr ! standard_name: not provided - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "agessc_xyave" [Unused] (native name is "age_xyave") ! long_name: Ideal Age Tracer ! units: yr @@ -3528,7 +3528,7 @@ "ocean_model_z", "age" [Unused] (CMOR equivalent is "agessc") ! long_name: Ideal Age Tracer ! units: yr - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "age_xyave" [Unused] (CMOR equivalent is "agessc_xyave") ! long_name: Ideal Age Tracer ! units: yr @@ -3537,7 +3537,7 @@ ! long_name: Ideal Age Tracer ! units: yr ! standard_name: not provided - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "agessc_xyave" [Unused] (native name is "age_xyave") ! long_name: Ideal Age Tracer ! units: yr @@ -3638,104 +3638,104 @@ "ocean_model", "ustar" [Used] ! long_name: Surface friction velocity = [(gustiness + tau_magnitude)/rho0]^(1/2) ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "p_surf" [Used] (CMOR equivalent is "pso") ! long_name: Pressure at ice-ocean or atmosphere-ocean interface ! units: Pa - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "pso" [Used] (native name is "p_surf") ! long_name: Sea Water Pressure at Sea Water Surface ! units: Pa ! standard_name: sea_water_pressure_at_sea_water_surface - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "TKE_tidal" [Unused] ! long_name: Tidal source of BBL mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "PRCmE" [Used] (CMOR equivalent is "wfo") ! long_name: Net surface water flux (precip+melt+lrunoff+ice calving-evap) ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "wfo" [Used] (native name is "PRCmE") ! long_name: Water Flux Into Sea Water ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "evap" [Used] (CMOR equivalent is "evs") ! long_name: Evaporation/condensation at ocean surface (evaporation is negative) ! units: kg m-2 s-1 ! standard_name: water_evaporation_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "evs" [Used] (native name is "evap") ! long_name: Water Evaporation Flux Where Ice Free Ocean over Sea ! units: kg m-2 s-1 ! standard_name: water_evaporation_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "precip" [Unused] ! long_name: Liquid + frozen precipitation into ocean ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "fprec" [Used] (CMOR equivalent is "prsn") ! long_name: Frozen precipitation into ocean ! units: kg m-2 s-1 ! standard_name: snowfall_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "prsn" [Used] (native name is "fprec") ! long_name: Snowfall Flux where Ice Free Ocean over Sea ! units: kg m-2 s-1 ! standard_name: snowfall_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "lprec" [Used] (CMOR equivalent is "prlq") ! long_name: Liquid precipitation into ocean ! units: kg m-2 s-1 ! standard_name: rainfall_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "prlq" [Used] (native name is "lprec") ! long_name: Rainfall Flux where Ice Free Ocean over Sea ! units: kg m-2 s-1 ! standard_name: rainfall_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "vprec" [Used] ! long_name: Virtual liquid precip into ocean due to SSS restoring ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "frunoff" [Used] (CMOR equivalent is "ficeberg") ! long_name: Frozen runoff (calving) and iceberg melt into ocean ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_icebergs - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ficeberg" [Unused] (native name is "frunoff") ! long_name: Water Flux into Seawater from Icebergs ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_icebergs - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "lrunoff" [Used] (CMOR equivalent is "friver") ! long_name: Liquid runoff (rivers) into ocean ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_rivers - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "friver" [Used] (native name is "lrunoff") ! long_name: Water Flux into Sea Water From Rivers ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_rivers - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_massout" [Used] ! long_name: Net mass leaving the ocean due to evaporation, seaice formation ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_massin" [Used] ! long_name: Net mass entering ocean due to precip, runoff, ice melt ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "massout_flux" [Unused] ! long_name: Net mass flux of freshwater out of the ocean (used in the boundary flux calculation) ! units: kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "massin_flux" [Unused] ! long_name: Net mass flux of freshwater into the ocean (used in boundary flux calculation) ! units: kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "total_PRCmE" [Used] ! long_name: Area integrated net surface water flux (precip+melt+liq runoff+ice calving-evap) ! units: kg s-1 @@ -3836,146 +3836,146 @@ ! long_name: Heat content (relative to 0C) of solid runoff into ocean ! units: W m-2 ! standard_name: temperature_flux_due_to_solid_runoff_expressed_as_heat_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_lrunoff" [Used] ! long_name: Heat content (relative to 0C) of liquid runoff into ocean ! units: W m-2 ! standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfrunoffds" [Used] ! long_name: Heat content (relative to 0C) of liquid+solid runoff into ocean ! units: W m-2 ! standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_lprec" [Used] ! long_name: Heat content (relative to 0degC) of liquid precip entering ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_fprec" [Used] ! long_name: Heat content (relative to 0degC) of frozen prec entering ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_vprec" [Used] ! long_name: Heat content (relative to 0degC) of virtual precip entering ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_cond" [Used] ! long_name: Heat content (relative to 0degC) of water condensing into ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfrainds" [Used] ! long_name: Heat content (relative to 0degC) of liquid+frozen precip entering ocean ! units: W m-2 ! standard_name: temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_surfwater" [Used] ! long_name: Heat content (relative to 0degC) of net water crossing ocean surface (frozen+liquid) ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_massout" [Used] (CMOR equivalent is "hfevapds") ! long_name: Heat content (relative to 0degC) of net mass leaving ocean ocean via evap and ice form ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfevapds" [Used] (native name is "heat_content_massout") ! long_name: Heat Content (relative to 0degC) of Water Leaving Ocean via Evaporation and Ice Formation ! units: W m-2 ! standard_name: temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_massin" [Unused] ! long_name: Heat content (relative to 0degC) of net mass entering ocean ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_heat_coupler" [Used] ! long_name: Surface ocean heat flux from SW+LW+latent+sensible (via the coupler) ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_heat_surface" [Used] (CMOR equivalent is "hfds") ! long_name: Surface ocean heat flux from SW+LW+lat+sens+mass transfer+frazil+restore or flux adjustments ! units: W m-2 ! standard_name: surface_downward_heat_flux_in_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfds" [Used] (native name is "net_heat_surface") ! long_name: Surface ocean heat flux from SW+LW+latent+sensible+masstransfer+frazil ! units: W m-2 ! standard_name: surface_downward_heat_flux_in_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SW" [Used] (CMOR equivalent is "rsntds") ! long_name: Shortwave radiation flux into ocean ! units: W m-2 ! standard_name: net_downward_shortwave_flux_at_sea_water_surface - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "rsntds" [Used] (native name is "SW") ! long_name: Net Downward Shortwave Radiation at Sea Water Surface ! units: W m-2 ! standard_name: net_downward_shortwave_flux_at_sea_water_surface - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sw_vis" [Unused] ! long_name: Shortwave radiation direct and diffuse flux into the ocean in the visible band ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sw_nir" [Unused] ! long_name: Shortwave radiation direct and diffuse flux into the ocean in the near-infrared band ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "LwLatSens" [Used] ! long_name: Combined longwave, latent, and sensible heating at ocean surface ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "LW" [Used] (CMOR equivalent is "rlntds") ! long_name: Longwave radiation flux into ocean ! units: W m-2 ! standard_name: surface_net_downward_longwave_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "rlntds" [Used] (native name is "LW") ! long_name: Surface Net Downward Longwave Radiation ! units: W m-2 ! standard_name: surface_net_downward_longwave_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "latent" [Unused] (CMOR equivalent is "hflso") ! long_name: Latent heat flux into ocean due to fusion and evaporation (negative means ocean heat loss) ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hflso" [Used] (native name is "latent") ! long_name: Surface Downward Latent Heat Flux due to Evap + Melt Snow/Ice ! units: W m-2 ! standard_name: surface_downward_latent_heat_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "latent_evap" [Unused] ! long_name: Latent heat flux into ocean due to evaporation/condensation ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "latent_fprec_diag" [Unused] (CMOR equivalent is "hfsnthermds") ! long_name: Latent heat flux into ocean due to melting of frozen precipitation ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfsnthermds" [Used] (native name is "latent_fprec_diag") ! long_name: Latent Heat to Melt Frozen Precipitation ! units: W m-2 ! standard_name: heat_flux_into_sea_water_due_to_snow_thermodynamics - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "latent_frunoff" [Unused] (CMOR equivalent is "hfibthermds") ! long_name: Latent heat flux into ocean due to melting of icebergs ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfibthermds" [Used] (native name is "latent_frunoff") ! long_name: Latent Heat to Melt Frozen Runoff/Iceberg ! units: W m-2 ! standard_name: heat_flux_into_sea_water_due_to_iceberg_thermodynamics - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sensible" [Unused] (CMOR equivalent is "hfsso") ! long_name: Sensible heat flux into ocean ! units: W m-2 ! standard_name: surface_downward_sensible_heat_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfsso" [Used] (native name is "sensible") ! long_name: Surface Downward Sensible Heat Flux ! units: W m-2 ! standard_name: surface_downward_sensible_heat_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_added" [Unused] ! long_name: Flux Adjustment or restoring surface heat flux into ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "total_heat_content_frunoff" [Used] ! long_name: Area integrated heat content (relative to 0C) of solid runoff ! units: W @@ -4124,20 +4124,20 @@ "ocean_model", "salt_flux" [Used] (CMOR equivalent is "sfdsi") ! long_name: Net salt flux into ocean at surface (restoring + sea-ice) ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sfdsi" [Used] (native name is "salt_flux") ! long_name: Downward Sea Ice Basal Salt Flux ! units: kg m-2 s-1 ! standard_name: downward_sea_ice_basal_salt_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "salt_flux_in" [Unused] ! long_name: Salt flux into ocean at surface from coupler ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "salt_flux_added" [Unused] ! long_name: Salt flux into ocean at surface due to restoring or flux adjustment ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "salt_flux_global_restoring_adjustment" [Unused] ! long_name: Adjustment needed to balance net global salt flux into ocean at surface ! units: kg m-2 s-1 diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index af602f1b64..123bf47185 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -102,7 +102,7 @@ ! long_name: Ocean grid-cell volume ! units: m3 ! standard_name: ocean_volume - ! cell_methods: xh:sum yh:sum zl:sum + ! cell_methods: xh:sum yh:sum zl:sum area:sum "ocean_model", "volcello_xyave" [Unused] ! long_name: Ocean grid-cell volume ! units: m3 @@ -112,7 +112,7 @@ ! long_name: Ocean grid-cell volume ! units: m3 ! standard_name: ocean_volume - ! cell_methods: xh:sum yh:sum z_l:sum + ! cell_methods: xh:sum yh:sum z_l:sum area:sum "ocean_model_z", "volcello_xyave" [Unused] ! long_name: Ocean grid-cell volume ! units: m3 @@ -121,35 +121,35 @@ "ocean_model", "MEKE" [Used] ! long_name: Mesoscale Eddy Kinetic Energy ! units: m2 s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_KH" [Used] ! long_name: MEKE derived diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_KU" [Unused] ! long_name: MEKE derived lateral viscosity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Ue" [Unused] ! long_name: MEKE derived eddy-velocity scale ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Ub" [Unused] ! long_name: MEKE derived bottom eddy-velocity scale ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Ut" [Unused] ! long_name: MEKE derived barotropic eddy-velocity scale ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_src" [Unused] ! long_name: MEKE energy source ! units: m2 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_decay" [Unused] ! long_name: MEKE decay rate ! units: s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "KHMEKE_u" [Unused] ! long_name: Zonal diffusivity of MEKE ! units: m2 s-1 @@ -161,31 +161,31 @@ "ocean_model", "MEKE_GM_src" [Unused] ! long_name: MEKE energy available from thickness mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_mom_src" [Unused] ! long_name: MEKE energy available from momentum ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Le" [Unused] ! long_name: Eddy mixing length used in the MEKE derived eddy diffusivity ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Lrhines" [Unused] ! long_name: Rhines length scale used in the MEKE derived eddy diffusivity ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_Leady" [Unused] ! long_name: Eady length scale used in the MEKE derived eddy diffusivity ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_gamma_b" [Unused] ! long_name: Ratio of bottom-projected eddy velocity to column-mean eddy velocity ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MEKE_gamma_t" [Unused] ! long_name: Ratio of barotropic eddy velocity to column-mean eddy velocity ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SN_u" [Used] ! long_name: Inverse eddy time-scale, S*N, at u-points ! units: s-1 @@ -237,11 +237,11 @@ "ocean_model", "Res_fn" [Unused] ! long_name: Resolution function for scaling diffusivities ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Rd_dx" [Unused] ! long_name: Ratio between deformation radius and grid spacing ! units: m m-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "bbl_thick_u" [Unused] ! long_name: BBL thickness at u points ! units: m @@ -365,7 +365,7 @@ "ocean_model", "e_tidal" [Unused] ! long_name: Tidal Forcing Astronomical and SAL Height Anomaly ! units: meter - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "diffu" [Unused] ! long_name: Zonal Acceleration from Horizontal Viscosity ! units: m s-2 @@ -401,7 +401,7 @@ "ocean_model", "Ahh" [Unused] (CMOR equivalent is "difmxybo") ! long_name: Biharmonic Horizontal Viscosity at h Points ! units: m4 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Ahh_xyave" [Unused] (CMOR equivalent is "difmxybo_xyave") ! long_name: Biharmonic Horizontal Viscosity at h Points ! units: m4 s-1 @@ -410,7 +410,7 @@ ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 ! standard_name: ocean_momentum_xy_biharmonic_diffusivity - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "difmxybo_xyave" [Unused] (native name is "Ahh_xyave") ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 @@ -419,7 +419,7 @@ "ocean_model_z", "Ahh" [Unused] (CMOR equivalent is "difmxybo") ! long_name: Biharmonic Horizontal Viscosity at h Points ! units: m4 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Ahh_xyave" [Unused] (CMOR equivalent is "difmxybo_xyave") ! long_name: Biharmonic Horizontal Viscosity at h Points ! units: m4 s-1 @@ -428,7 +428,7 @@ ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 ! standard_name: ocean_momentum_xy_biharmonic_diffusivity - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "difmxybo_xyave" [Unused] (native name is "Ahh_xyave") ! long_name: Ocean lateral biharmonic viscosity ! units: m4 s-1 @@ -441,7 +441,7 @@ "ocean_model", "Khh" [Unused] (CMOR equivalent is "difmxylo") ! long_name: Laplacian Horizontal Viscosity at h Points ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Khh_xyave" [Unused] (CMOR equivalent is "difmxylo_xyave") ! long_name: Laplacian Horizontal Viscosity at h Points ! units: m2 s-1 @@ -450,7 +450,7 @@ ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 ! standard_name: ocean_momentum_xy_laplacian_diffusivity - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "difmxylo_xyave" [Unused] (native name is "Khh_xyave") ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 @@ -459,7 +459,7 @@ "ocean_model_z", "Khh" [Unused] (CMOR equivalent is "difmxylo") ! long_name: Laplacian Horizontal Viscosity at h Points ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Khh_xyave" [Unused] (CMOR equivalent is "difmxylo_xyave") ! long_name: Laplacian Horizontal Viscosity at h Points ! units: m2 s-1 @@ -468,7 +468,7 @@ ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 ! standard_name: ocean_momentum_xy_laplacian_diffusivity - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "difmxylo_xyave" [Unused] (native name is "Khh_xyave") ! long_name: Ocean lateral Laplacian viscosity ! units: m2 s-1 @@ -481,7 +481,7 @@ "ocean_model", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "FrictWork_xyave" [Unused] ! long_name: Integral work done by lateral friction terms ! units: W m-2 @@ -489,7 +489,7 @@ "ocean_model_z", "FrictWork" [Unused] ! long_name: Integral work done by lateral friction terms ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "FrictWork_xyave" [Unused] ! long_name: Integral work done by lateral friction terms ! units: W m-2 @@ -497,12 +497,12 @@ "ocean_model", "FrictWorkIntz" [Unused] (CMOR equivalent is "dispkexyfo") ! long_name: Depth integrated work done by lateral friction ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "dispkexyfo" [Used] (native name is "FrictWorkIntz") ! long_name: Depth integrated ocean kinetic energy dissipation due to lateral friction ! units: W m-2 ! standard_name: ocean_kinetic_energy_dissipation_per_unit_area_due_to_xy_friction - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "au_visc" [Unused] ! long_name: Zonal Viscous Vertical Coupling Coefficient ! units: m s-1 @@ -650,7 +650,7 @@ "ocean_model", "eta_bt" [Unused] ! long_name: Barotropic end SSH ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ubt" [Unused] ! long_name: Barotropic end zonal velocity ! units: m s-1 @@ -662,7 +662,7 @@ "ocean_model", "eta_st" [Unused] ! long_name: Barotropic start SSH ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ubt_st" [Unused] ! long_name: Barotropic start zonal velocity ! units: m s-1 @@ -682,7 +682,7 @@ "ocean_model", "eta_cor" [Unused] ! long_name: Corrective mass flux ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "visc_rem_u" [Unused] ! long_name: Viscous remnant at u ! units: nondim @@ -718,23 +718,23 @@ "ocean_model", "gtot_n" [Unused] ! long_name: gtot to North ! units: m s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "gtot_s" [Unused] ! long_name: gtot to South ! units: m s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "gtot_e" [Unused] ! long_name: gtot to East ! units: m s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "gtot_w" [Unused] ! long_name: gtot to West ! units: m s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "eta_hifreq" [Unused] ! long_name: High Frequency Barotropic SSH ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ubt_hifreq" [Unused] ! long_name: High Frequency Barotropic zonal velocity ! units: m s-1 @@ -746,7 +746,7 @@ "ocean_model", "eta_pred_hifreq" [Unused] ! long_name: High Frequency Predictor Barotropic SSH ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "uhbt_hifreq" [Unused] ! long_name: High Frequency Barotropic zonal transport ! units: m3 s-1 @@ -1078,12 +1078,12 @@ "ocean_model", "GMwork" [Used] (CMOR equivalent is "tnkebto") ! long_name: Integrated Tendency of Ocean Mesoscale Eddy KE from Parameterized Eddy Advection ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "tnkebto" [Unused] (native name is "GMwork") ! long_name: Integrated Tendency of Ocean Mesoscale Eddy KE from Parameterized Eddy Advection ! units: W m-2 ! standard_name: tendency_of_ocean_eddy_kinetic_energy_content_due_to_parameterized_eddy_advection - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "KHTH_u" [Used] ! long_name: Parameterized mesoscale eddy advection diffusivity at U-point ! units: m s-2 @@ -1119,7 +1119,7 @@ "ocean_model", "KHTH_t" [Unused] (CMOR equivalent is "diftrblo") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m s-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KHTH_t_xyave" [Unused] (CMOR equivalent is "diftrblo_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m s-2 @@ -1128,7 +1128,7 @@ ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m2 s-1 ! standard_name: ocean_tracer_diffusivity_due_to_parameterized_mesoscale_advection - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "diftrblo_xyave" [Unused] (native name is "KHTH_t_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m2 s-1 @@ -1137,7 +1137,7 @@ "ocean_model_z", "KHTH_t" [Unused] (CMOR equivalent is "diftrblo") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m s-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KHTH_t_xyave" [Unused] (CMOR equivalent is "diftrblo_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m s-2 @@ -1146,7 +1146,7 @@ ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m2 s-1 ! standard_name: ocean_tracer_diffusivity_due_to_parameterized_mesoscale_advection - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "diftrblo_xyave" [Unused] (native name is "KHTH_t_xyave") ! long_name: Ocean Tracer Diffusivity due to Parameterized Mesoscale Advection ! units: m2 s-1 @@ -1163,7 +1163,7 @@ "ocean_model", "KHTH_t1" [Unused] ! long_name: Parameterized mesoscale eddy advection diffusivity at T-points (2-D) ! units: m s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "neutral_slope_x" [Unused] ! long_name: Zonal slope of neutral surface ! units: nondim @@ -1303,11 +1303,11 @@ "ocean_model", "MLD_restrat" [Unused] ! long_name: Mixed Layer Depth as used in the mixed-layer restratification parameterization ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ML_buoy_restrat" [Unused] ! long_name: Mixed Layer Buoyancy as used in the mixed-layer restratification parameterization ! units: m s2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "udml_restrat" [Unused] ! long_name: Transport stream function amplitude for zonal restratification of mixed layer ! units: m3 s-1 @@ -1336,7 +1336,7 @@ ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 ! standard_name: sea_water_mass_per_unit_area - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "masscello_xyave" [Unused] ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 @@ -1346,7 +1346,7 @@ ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 ! standard_name: sea_water_mass_per_unit_area - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "masscello_xyave" [Unused] ! long_name: Mass per unit area of liquid ocean grid cell ! units: kg m-2 @@ -1360,7 +1360,7 @@ ! long_name: Cell Thickness ! units: m ! standard_name: cell_thickness - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "thkcello_xyave" [Unused] ! long_name: Cell Thickness ! units: m @@ -1370,7 +1370,7 @@ ! long_name: Cell Thickness ! units: m ! standard_name: cell_thickness - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "thkcello_xyave" [Unused] ! long_name: Cell Thickness ! units: m @@ -1403,7 +1403,7 @@ "ocean_model", "e" [Used] ! long_name: Interface Height Relative to Mean Sea Level ! units: m - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "e_xyave" [Unused] ! long_name: Interface Height Relative to Mean Sea Level ! units: m @@ -1411,7 +1411,7 @@ "ocean_model_z", "e" [Unused] ! long_name: Interface Height Relative to Mean Sea Level ! units: m - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "e_xyave" [Unused] ! long_name: Interface Height Relative to Mean Sea Level ! units: m @@ -1419,7 +1419,7 @@ "ocean_model", "e_D" [Unused] ! long_name: Interface Height above the Seafloor ! units: m - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "e_D_xyave" [Unused] ! long_name: Interface Height above the Seafloor ! units: m @@ -1427,7 +1427,7 @@ "ocean_model_z", "e_D" [Unused] ! long_name: Interface Height above the Seafloor ! units: m - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "e_D_xyave" [Unused] ! long_name: Interface Height above the Seafloor ! units: m @@ -1435,7 +1435,7 @@ "ocean_model", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Rml_xyave" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg m-3 @@ -1443,7 +1443,7 @@ "ocean_model_z", "Rml" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Rml_xyave" [Unused] ! long_name: Mixed Layer Coordinate Potential Density ! units: kg m-3 @@ -1451,7 +1451,7 @@ "ocean_model", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Rho_cv_xyave" [Unused] ! long_name: Coordinate Potential Density ! units: kg m-3 @@ -1459,7 +1459,7 @@ "ocean_model_z", "Rho_cv" [Unused] ! long_name: Coordinate Potential Density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Rho_cv_xyave" [Unused] ! long_name: Coordinate Potential Density ! units: kg m-3 @@ -1467,7 +1467,7 @@ "ocean_model", "rhopot0" [Unused] ! long_name: Potential density referenced to surface ! units: kg m-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "rhopot0_xyave" [Unused] ! long_name: Potential density referenced to surface ! units: kg m-3 @@ -1475,7 +1475,7 @@ "ocean_model_z", "rhopot0" [Unused] ! long_name: Potential density referenced to surface ! units: kg m-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "rhopot0_xyave" [Unused] ! long_name: Potential density referenced to surface ! units: kg m-3 @@ -1483,7 +1483,7 @@ "ocean_model", "rhopot2" [Unused] ! long_name: Potential density referenced to 2000 dbar ! units: kg m-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "rhopot2_xyave" [Unused] ! long_name: Potential density referenced to 2000 dbar ! units: kg m-3 @@ -1491,7 +1491,7 @@ "ocean_model_z", "rhopot2" [Unused] ! long_name: Potential density referenced to 2000 dbar ! units: kg m-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "rhopot2_xyave" [Unused] ! long_name: Potential density referenced to 2000 dbar ! units: kg m-3 @@ -1499,7 +1499,7 @@ "ocean_model", "rhoinsitu" [Unused] ! long_name: In situ density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "rhoinsitu_xyave" [Unused] ! long_name: In situ density ! units: kg m-3 @@ -1507,7 +1507,7 @@ "ocean_model_z", "rhoinsitu" [Unused] ! long_name: In situ density ! units: kg m-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "rhoinsitu_xyave" [Unused] ! long_name: In situ density ! units: kg m-3 @@ -1547,7 +1547,7 @@ "ocean_model", "dhdt" [Unused] ! long_name: Thickness tendency ! units: m s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "dhdt_xyave" [Unused] ! long_name: Thickness tendency ! units: m s-1 @@ -1555,7 +1555,7 @@ "ocean_model_z", "dhdt" [Unused] ! long_name: Thickness tendency ! units: m s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "dhdt_xyave" [Unused] ! long_name: Thickness tendency ! units: m s-1 @@ -1563,7 +1563,7 @@ "ocean_model", "h_rho" [Used] ! long_name: Layer thicknesses in pure potential density coordinates ! units: m - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "h_rho_xyave" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates ! units: m @@ -1571,7 +1571,7 @@ "ocean_model_z", "h_rho" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates ! units: m - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "h_rho_xyave" [Unused] ! long_name: Layer thicknesses in pure potential density coordinates ! units: m @@ -1643,7 +1643,7 @@ "ocean_model", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: m2 s-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_xyave" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: m2 s-2 @@ -1651,7 +1651,7 @@ "ocean_model_z", "KE" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: m2 s-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_xyave" [Unused] ! long_name: Layer kinetic energy per unit mass ! units: m2 s-2 @@ -1659,7 +1659,7 @@ "ocean_model", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "dKE_dt_xyave" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: m3 s-3 @@ -1667,7 +1667,7 @@ "ocean_model_z", "dKE_dt" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "dKE_dt_xyave" [Unused] ! long_name: Kinetic Energy Tendency of Layer ! units: m3 s-3 @@ -1675,7 +1675,7 @@ "ocean_model", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "PE_to_KE_xyave" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: m3 s-3 @@ -1683,7 +1683,7 @@ "ocean_model_z", "PE_to_KE" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "PE_to_KE_xyave" [Unused] ! long_name: Potential to Kinetic Energy Conversion of Layer ! units: m3 s-3 @@ -1691,7 +1691,7 @@ "ocean_model", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_Coradv_xyave" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: m3 s-3 @@ -1699,7 +1699,7 @@ "ocean_model_z", "KE_Coradv" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_Coradv_xyave" [Unused] ! long_name: Kinetic Energy Source from Coriolis and Advection ! units: m3 s-3 @@ -1707,7 +1707,7 @@ "ocean_model", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_adv_xyave" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: m3 s-3 @@ -1715,7 +1715,7 @@ "ocean_model_z", "KE_adv" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_adv_xyave" [Unused] ! long_name: Kinetic Energy Source from Advection ! units: m3 s-3 @@ -1723,7 +1723,7 @@ "ocean_model", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_visc_xyave" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: m3 s-3 @@ -1731,7 +1731,7 @@ "ocean_model_z", "KE_visc" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_visc_xyave" [Unused] ! long_name: Kinetic Energy Source from Vertical Viscosity and Stresses ! units: m3 s-3 @@ -1739,7 +1739,7 @@ "ocean_model", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_horvisc_xyave" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: m3 s-3 @@ -1747,7 +1747,7 @@ "ocean_model_z", "KE_horvisc" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_horvisc_xyave" [Unused] ! long_name: Kinetic Energy Source from Horizontal Viscosity ! units: m3 s-3 @@ -1755,7 +1755,7 @@ "ocean_model", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "KE_dia_xyave" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: m3 s-3 @@ -1763,7 +1763,7 @@ "ocean_model_z", "KE_dia" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "KE_dia_xyave" [Unused] ! long_name: Kinetic Energy Source from Diapycnal Diffusion ! units: m3 s-3 @@ -1771,35 +1771,35 @@ "ocean_model", "cg1" [Unused] ! long_name: First baroclinic gravity wave speed ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Rd1" [Unused] ! long_name: First baroclinic deformation radius ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "CFL_cg1" [Unused] ! long_name: CFL of first baroclinic gravity wave = dt*cg1*(1/dx+1/dy) ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "CFL_cg1_x" [Unused] ! long_name: i-component of CFL of first baroclinic gravity wave = dt*cg1*/dx ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "CFL_cg1_y" [Unused] ! long_name: j-component of CFL of first baroclinic gravity wave = dt*cg1*/dy ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "cg_ebt" [Unused] ! long_name: Equivalent barotropic gravity wave speed ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Rd_ebt" [Unused] ! long_name: Equivalent barotropic deformation radius ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "p_ebt" [Unused] ! long_name: Equivalent barotropic modal strcuture ! units: nondim - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "p_ebt_xyave" [Unused] ! long_name: Equivalent barotropic modal strcuture ! units: nondim @@ -1807,7 +1807,7 @@ "ocean_model_z", "p_ebt" [Unused] ! long_name: Equivalent barotropic modal strcuture ! units: nondim - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "p_ebt_xyave" [Unused] ! long_name: Equivalent barotropic modal strcuture ! units: nondim @@ -1815,38 +1815,38 @@ "ocean_model", "mass_wt" [Unused] ! long_name: The column mass for calculating mass-weighted average properties ! units: kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "temp_int" [Unused] (CMOR equivalent is "opottempmint") ! long_name: Density weighted column integrated potential temperature ! units: degC kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "opottempmint" [Used] (native name is "temp_int") ! long_name: integral_wrt_depth_of_product_of_sea_water_density_and_potential_temperature ! units: degC kg m-2 ! standard_name: Depth integrated density times potential temperature - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "salt_int" [Unused] (CMOR equivalent is "somint") ! long_name: Density weighted column integrated salinity ! units: psu kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "somint" [Used] (native name is "salt_int") ! long_name: integral_wrt_depth_of_product_of_sea_water_density_and_salinity ! units: psu kg m-2 ! standard_name: Depth integrated density times salinity - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "col_mass" [Unused] ! long_name: The column integrated in situ density ! units: kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "col_height" [Unused] ! long_name: The height of the water column ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "pbo" [Used] ! long_name: Sea Water Pressure at Sea Floor ! units: Pa ! standard_name: sea_water_pressure_at_sea_floor - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model_zold", "u" [Unused] (CMOR equivalent is "uo") ! long_name: Zonal Velocity in Depth Space ! units: m s-1 @@ -1870,7 +1870,7 @@ "ocean_model", "ea" [Unused] ! long_name: Layer entrainment from above per timestep ! units: m - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "ea_xyave" [Unused] ! long_name: Layer entrainment from above per timestep ! units: m @@ -1878,7 +1878,7 @@ "ocean_model_z", "ea" [Unused] ! long_name: Layer entrainment from above per timestep ! units: m - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "ea_xyave" [Unused] ! long_name: Layer entrainment from above per timestep ! units: m @@ -1886,7 +1886,7 @@ "ocean_model", "eb" [Unused] ! long_name: Layer entrainment from below per timestep ! units: m - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "eb_xyave" [Unused] ! long_name: Layer entrainment from below per timestep ! units: m @@ -1894,7 +1894,7 @@ "ocean_model_z", "eb" [Unused] ! long_name: Layer entrainment from below per timestep ! units: m - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "eb_xyave" [Unused] ! long_name: Layer entrainment from below per timestep ! units: m @@ -1934,7 +1934,7 @@ "ocean_model", "wd" [Used] ! long_name: Diapycnal Velocity ! units: m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "wd_xyave" [Unused] ! long_name: Diapycnal Velocity ! units: m s-1 @@ -1942,7 +1942,7 @@ "ocean_model_z", "wd" [Unused] ! long_name: Diapycnal Velocity ! units: m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "wd_xyave" [Unused] ! long_name: Diapycnal Velocity ! units: m s-1 @@ -1950,7 +1950,7 @@ "ocean_model", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Tflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 @@ -1958,7 +1958,7 @@ "ocean_model_z", "Tflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Tflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal temperature flux across interfaces ! units: degC m s-1 @@ -1966,7 +1966,7 @@ "ocean_model", "Tflx_dia_adv" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces ! units: degC m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Tflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces ! units: degC m s-1 @@ -1974,7 +1974,7 @@ "ocean_model_z", "Tflx_dia_adv" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces ! units: degC m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Tflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal temperature flux across interfaces ! units: degC m s-1 @@ -1982,7 +1982,7 @@ "ocean_model", "Sflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces ! units: psu m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Sflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces ! units: psu m s-1 @@ -1990,7 +1990,7 @@ "ocean_model_z", "Sflx_dia_diff" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces ! units: psu m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Sflx_dia_diff_xyave" [Unused] ! long_name: Diffusive diapycnal salnity flux across interfaces ! units: psu m s-1 @@ -1998,7 +1998,7 @@ "ocean_model", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces ! units: psu m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Sflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces ! units: psu m s-1 @@ -2006,7 +2006,7 @@ "ocean_model_z", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces ! units: psu m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Sflx_dia_adv_xyave" [Unused] ! long_name: Advective diapycnal salnity flux across interfaces ! units: psu m s-1 @@ -2014,29 +2014,29 @@ "ocean_model", "MLD_003" [Used] (CMOR equivalent is "mlotst") ! long_name: Mixed layer depth (delta rho = 0.03) ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "mlotst" [Used] (native name is "MLD_003") ! long_name: Ocean Mixed Layer Thickness Defined by Sigma T ! units: m ! standard_name: ocean_mixed_layer_thickness_defined_by_sigma_t - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "mlotstsq" [Used] ! long_name: Square of Ocean Mixed Layer Thickness Defined by Sigma T ! units: m2 ! standard_name: square_of_ocean_mixed_layer_thickness_defined_by_sigma_t - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MLD_0125" [Unused] ! long_name: Mixed layer depth (delta rho = 0.125) ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "subML_N2" [Used] ! long_name: Squared buoyancy frequency below mixed layer ! units: s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MLD_user" [Unused] ! long_name: Mixed layer depth (used defined) ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model_zold", "Kd_interface" [Unused] ! long_name: Diapycnal diffusivity at interfaces, interpolated to z ! units: m2 s-1 @@ -2055,7 +2055,7 @@ "ocean_model", "Kd_interface" [Used] ! long_name: Total diapycnal diffusivity at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_interface_xyave" [Unused] ! long_name: Total diapycnal diffusivity at interfaces ! units: m2 s-1 @@ -2063,7 +2063,7 @@ "ocean_model_z", "Kd_interface" [Unused] ! long_name: Total diapycnal diffusivity at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_interface_xyave" [Unused] ! long_name: Total diapycnal diffusivity at interfaces ! units: m2 s-1 @@ -2071,7 +2071,7 @@ "ocean_model", "Kd_ePBL" [Unused] ! long_name: ePBL diapycnal diffusivity at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_ePBL_xyave" [Unused] ! long_name: ePBL diapycnal diffusivity at interfaces ! units: m2 s-1 @@ -2079,7 +2079,7 @@ "ocean_model_z", "Kd_ePBL" [Unused] ! long_name: ePBL diapycnal diffusivity at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_ePBL_xyave" [Unused] ! long_name: ePBL diapycnal diffusivity at interfaces ! units: m2 s-1 @@ -2087,7 +2087,7 @@ "ocean_model", "Kd_heat" [Unused] (CMOR equivalent is "difvho") ! long_name: Total diapycnal diffusivity for heat at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_heat_xyave" [Unused] (CMOR equivalent is "difvho_xyave") ! long_name: Total diapycnal diffusivity for heat at interfaces ! units: m2 s-1 @@ -2096,7 +2096,7 @@ ! long_name: Ocean vertical heat diffusivity ! units: m2 s-1 ! standard_name: ocean_vertical_heat_diffusivity - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "difvho_xyave" [Unused] (native name is "Kd_heat_xyave") ! long_name: Ocean vertical heat diffusivity ! units: m2 s-1 @@ -2105,7 +2105,7 @@ "ocean_model_z", "Kd_heat" [Unused] (CMOR equivalent is "difvho") ! long_name: Total diapycnal diffusivity for heat at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_heat_xyave" [Unused] (CMOR equivalent is "difvho_xyave") ! long_name: Total diapycnal diffusivity for heat at interfaces ! units: m2 s-1 @@ -2114,7 +2114,7 @@ ! long_name: Ocean vertical heat diffusivity ! units: m2 s-1 ! standard_name: ocean_vertical_heat_diffusivity - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "difvho_xyave" [Unused] (native name is "Kd_heat_xyave") ! long_name: Ocean vertical heat diffusivity ! units: m2 s-1 @@ -2123,7 +2123,7 @@ "ocean_model", "Kd_salt" [Unused] (CMOR equivalent is "difvso") ! long_name: Total diapycnal diffusivity for salt at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_salt_xyave" [Unused] (CMOR equivalent is "difvso_xyave") ! long_name: Total diapycnal diffusivity for salt at interfaces ! units: m2 s-1 @@ -2132,7 +2132,7 @@ ! long_name: Ocean vertical salt diffusivity ! units: m2 s-1 ! standard_name: ocean_vertical_salt_diffusivity - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "difvso_xyave" [Unused] (native name is "Kd_salt_xyave") ! long_name: Ocean vertical salt diffusivity ! units: m2 s-1 @@ -2141,7 +2141,7 @@ "ocean_model_z", "Kd_salt" [Unused] (CMOR equivalent is "difvso") ! long_name: Total diapycnal diffusivity for salt at interfaces ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_salt_xyave" [Unused] (CMOR equivalent is "difvso_xyave") ! long_name: Total diapycnal diffusivity for salt at interfaces ! units: m2 s-1 @@ -2150,7 +2150,7 @@ ! long_name: Ocean vertical salt diffusivity ! units: m2 s-1 ! standard_name: ocean_vertical_salt_diffusivity - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "difvso_xyave" [Unused] (native name is "Kd_salt_xyave") ! long_name: Ocean vertical salt diffusivity ! units: m2 s-1 @@ -2159,7 +2159,7 @@ "ocean_model", "diabatic_diff_temp_tendency" [Unused] ! long_name: Diabatic diffusion temperature tendency ! units: degC s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "diabatic_diff_temp_tendency_xyave" [Unused] ! long_name: Diabatic diffusion temperature tendency ! units: degC s-1 @@ -2167,7 +2167,7 @@ "ocean_model_z", "diabatic_diff_temp_tendency" [Unused] ! long_name: Diabatic diffusion temperature tendency ! units: degC s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "diabatic_diff_temp_tendency_xyave" [Unused] ! long_name: Diabatic diffusion temperature tendency ! units: degC s-1 @@ -2175,7 +2175,7 @@ "ocean_model", "diabatic_diff_saln_tendency" [Unused] ! long_name: Diabatic diffusion salinity tendency ! units: psu s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "diabatic_diff_saln_tendency_xyave" [Unused] ! long_name: Diabatic diffusion salinity tendency ! units: psu s-1 @@ -2183,7 +2183,7 @@ "ocean_model_z", "diabatic_diff_saln_tendency" [Unused] ! long_name: Diabatic diffusion salinity tendency ! units: psu s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "diabatic_diff_saln_tendency_xyave" [Unused] ! long_name: Diabatic diffusion salinity tendency ! units: psu s-1 @@ -2191,7 +2191,7 @@ "ocean_model", "diabatic_heat_tendency" [Unused] (CMOR equivalent is "opottempdiff") ! long_name: Diabatic diffusion heat tendency ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "diabatic_heat_tendency_xyave" [Unused] (CMOR equivalent is "opottempdiff_xyave") ! long_name: Diabatic diffusion heat tendency ! units: W m-2 @@ -2200,7 +2200,7 @@ ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized dianeutral mixing ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "opottempdiff_xyave" [Unused] (native name is "diabatic_heat_tendency_xyave") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized dianeutral mixing ! units: W m-2 @@ -2209,7 +2209,7 @@ "ocean_model_z", "diabatic_heat_tendency" [Unused] (CMOR equivalent is "opottempdiff") ! long_name: Diabatic diffusion heat tendency ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "diabatic_heat_tendency_xyave" [Unused] (CMOR equivalent is "opottempdiff_xyave") ! long_name: Diabatic diffusion heat tendency ! units: W m-2 @@ -2218,7 +2218,7 @@ ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized dianeutral mixing ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "opottempdiff_xyave" [Unused] (native name is "diabatic_heat_tendency_xyave") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized dianeutral mixing ! units: W m-2 @@ -2227,7 +2227,7 @@ "ocean_model", "diabatic_salt_tendency" [Unused] (CMOR equivalent is "osaltdiff") ! long_name: Diabatic diffusion of salt tendency ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "diabatic_salt_tendency_xyave" [Unused] (CMOR equivalent is "osaltdiff_xyave") ! long_name: Diabatic diffusion of salt tendency ! units: kg m-2 s-1 @@ -2236,7 +2236,7 @@ ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized dianeutral mixing ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_dianeutral_mixing - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "osaltdiff_xyave" [Unused] (native name is "diabatic_salt_tendency_xyave") ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized dianeutral mixing ! units: kg m-2 s-1 @@ -2245,7 +2245,7 @@ "ocean_model_z", "diabatic_salt_tendency" [Unused] (CMOR equivalent is "osaltdiff") ! long_name: Diabatic diffusion of salt tendency ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "diabatic_salt_tendency_xyave" [Unused] (CMOR equivalent is "osaltdiff_xyave") ! long_name: Diabatic diffusion of salt tendency ! units: kg m-2 s-1 @@ -2254,7 +2254,7 @@ ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized dianeutral mixing ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_dianeutral_mixing - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "osaltdiff_xyave" [Unused] (native name is "diabatic_salt_tendency_xyave") ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized dianeutral mixing ! units: kg m-2 s-1 @@ -2263,25 +2263,25 @@ "ocean_model", "diabatic_heat_tendency_2d" [Unused] (CMOR equivalent is "opottempdiff_2d") ! long_name: Depth integrated diabatic diffusion heat tendency ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "opottempdiff_2d" [Unused] (native name is "diabatic_heat_tendency_2d") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized dianeutral mixing depth integrated ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing_depth_integrated - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "diabatic_salt_tendency_2d" [Unused] (CMOR equivalent is "osaltdiff_2d") ! long_name: Depth integrated diabatic diffusion salt tendency ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "osaltdiff_2d" [Unused] (native name is "diabatic_salt_tendency_2d") ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized dianeutral mixing depth integrated ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_dianeutral_mixing_depth_integrated - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "boundary_forcing_temp_tendency" [Unused] ! long_name: Boundary forcing temperature tendency ! units: degC s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "boundary_forcing_temp_tendency_xyave" [Unused] ! long_name: Boundary forcing temperature tendency ! units: degC s-1 @@ -2289,7 +2289,7 @@ "ocean_model_z", "boundary_forcing_temp_tendency" [Unused] ! long_name: Boundary forcing temperature tendency ! units: degC s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "boundary_forcing_temp_tendency_xyave" [Unused] ! long_name: Boundary forcing temperature tendency ! units: degC s-1 @@ -2297,7 +2297,7 @@ "ocean_model", "boundary_forcing_saln_tendency" [Unused] ! long_name: Boundary forcing saln tendency ! units: psu s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "boundary_forcing_saln_tendency_xyave" [Unused] ! long_name: Boundary forcing saln tendency ! units: psu s-1 @@ -2305,7 +2305,7 @@ "ocean_model_z", "boundary_forcing_saln_tendency" [Unused] ! long_name: Boundary forcing saln tendency ! units: psu s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "boundary_forcing_saln_tendency_xyave" [Unused] ! long_name: Boundary forcing saln tendency ! units: psu s-1 @@ -2313,7 +2313,7 @@ "ocean_model", "boundary_forcing_heat_tendency" [Unused] ! long_name: Boundary forcing heat tendency ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "boundary_forcing_heat_tendency_xyave" [Unused] ! long_name: Boundary forcing heat tendency ! units: W m-2 @@ -2321,7 +2321,7 @@ "ocean_model_z", "boundary_forcing_heat_tendency" [Unused] ! long_name: Boundary forcing heat tendency ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "boundary_forcing_heat_tendency_xyave" [Unused] ! long_name: Boundary forcing heat tendency ! units: W m-2 @@ -2329,7 +2329,7 @@ "ocean_model", "boundary_forcing_salt_tendency" [Unused] ! long_name: Boundary forcing salt tendency ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "boundary_forcing_salt_tendency_xyave" [Unused] ! long_name: Boundary forcing salt tendency ! units: kg m-2 s-1 @@ -2337,7 +2337,7 @@ "ocean_model_z", "boundary_forcing_salt_tendency" [Unused] ! long_name: Boundary forcing salt tendency ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "boundary_forcing_salt_tendency_xyave" [Unused] ! long_name: Boundary forcing salt tendency ! units: kg m-2 s-1 @@ -2345,15 +2345,15 @@ "ocean_model", "boundary_forcing_heat_tendency_2d" [Unused] ! long_name: Depth integrated boundary forcing of ocean heat ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "boundary_forcing_salt_tendency_2d" [Unused] ! long_name: Depth integrated boundary forcing of ocean salt ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "frazil_temp_tendency" [Used] ! long_name: Temperature tendency due to frazil formation ! units: degC s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "frazil_temp_tendency_xyave" [Unused] ! long_name: Temperature tendency due to frazil formation ! units: degC s-1 @@ -2361,7 +2361,7 @@ "ocean_model_z", "frazil_temp_tendency" [Unused] ! long_name: Temperature tendency due to frazil formation ! units: degC s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "frazil_temp_tendency_xyave" [Unused] ! long_name: Temperature tendency due to frazil formation ! units: degC s-1 @@ -2369,7 +2369,7 @@ "ocean_model", "frazil_heat_tendency" [Used] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 @@ -2377,7 +2377,7 @@ "ocean_model_z", "frazil_heat_tendency" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 @@ -2385,11 +2385,11 @@ "ocean_model", "frazil_heat_tendency_2d" [Used] ! long_name: Depth integrated heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Kd_effective" [Used] ! long_name: Diapycnal diffusivity as applied ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_effective_xyave" [Unused] ! long_name: Diapycnal diffusivity as applied ! units: m2 s-1 @@ -2397,7 +2397,7 @@ "ocean_model_z", "Kd_effective" [Unused] ! long_name: Diapycnal diffusivity as applied ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_effective_xyave" [Unused] ! long_name: Diapycnal diffusivity as applied ! units: m2 s-1 @@ -2405,7 +2405,7 @@ "ocean_model", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "diff_work_xyave" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 @@ -2413,7 +2413,7 @@ "ocean_model_z", "diff_work" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "diff_work_xyave" [Unused] ! long_name: Work actually done by diapycnal diffusion across each interface ! units: W m-2 @@ -2428,7 +2428,7 @@ "ocean_model", "Kd_BBL" [Used] ! long_name: Bottom Boundary Layer Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_BBL_xyave" [Unused] ! long_name: Bottom Boundary Layer Diffusivity ! units: m2 s-1 @@ -2436,7 +2436,7 @@ "ocean_model_z", "Kd_BBL" [Unused] ! long_name: Bottom Boundary Layer Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_BBL_xyave" [Unused] ! long_name: Bottom Boundary Layer Diffusivity ! units: m2 s-1 @@ -2444,7 +2444,7 @@ "ocean_model", "Kd_layer" [Used] ! long_name: Diapycnal diffusivity of layers (as set) ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_layer_xyave" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) ! units: m2 s-1 @@ -2452,7 +2452,7 @@ "ocean_model_z", "Kd_layer" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_layer_xyave" [Unused] ! long_name: Diapycnal diffusivity of layers (as set) ! units: m2 s-1 @@ -2460,11 +2460,11 @@ "ocean_model", "TKE_itidal" [Unused] ! long_name: Internal Tide Driven Turbulent Kinetic Energy ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "maxTKE" [Unused] ! long_name: Maximum layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "maxTKE_xyave" [Unused] ! long_name: Maximum layer TKE ! units: m3 s-3 @@ -2472,7 +2472,7 @@ "ocean_model_z", "maxTKE" [Unused] ! long_name: Maximum layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "maxTKE_xyave" [Unused] ! long_name: Maximum layer TKE ! units: m3 s-3 @@ -2480,7 +2480,7 @@ "ocean_model", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd ! units: s2 m - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "TKE_to_Kd_xyave" [Unused] ! long_name: Convert TKE to Kd ! units: s2 m @@ -2488,7 +2488,7 @@ "ocean_model_z", "TKE_to_Kd" [Unused] ! long_name: Convert TKE to Kd ! units: s2 m - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "TKE_to_Kd_xyave" [Unused] ! long_name: Convert TKE to Kd ! units: s2 m @@ -2496,11 +2496,11 @@ "ocean_model", "Nb" [Unused] ! long_name: Bottom Buoyancy Frequency ! units: s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Kd_itides" [Used] ! long_name: Internal Tide Driven Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_itides_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity ! units: m2 s-1 @@ -2508,7 +2508,7 @@ "ocean_model_z", "Kd_itides" [Unused] ! long_name: Internal Tide Driven Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_itides_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity ! units: m2 s-1 @@ -2516,7 +2516,7 @@ "ocean_model", "Kd_lowmode" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_lowmode_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) ! units: m2 s-1 @@ -2524,7 +2524,7 @@ "ocean_model_z", "Kd_lowmode" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_lowmode_xyave" [Unused] ! long_name: Internal Tide Driven Diffusivity (from propagating low modes) ! units: m2 s-1 @@ -2532,7 +2532,7 @@ "ocean_model", "Fl_itides" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Fl_itides_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation ! units: m3 s-3 @@ -2540,7 +2540,7 @@ "ocean_model_z", "Fl_itides" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Fl_itides_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation ! units: m3 s-3 @@ -2548,7 +2548,7 @@ "ocean_model", "Fl_lowmode" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Fl_lowmode_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) ! units: m3 s-3 @@ -2556,7 +2556,7 @@ "ocean_model_z", "Fl_lowmode" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Fl_lowmode_xyave" [Unused] ! long_name: Vertical flux of tidal turbulent dissipation (from propagating low modes) ! units: m3 s-3 @@ -2564,23 +2564,23 @@ "ocean_model", "Polzin_decay_scale" [Unused] ! long_name: Vertical decay scale for the tidal turbulent dissipation with Polzin scheme ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Polzin_decay_scale_scaled" [Unused] ! long_name: Vertical decay scale for the tidal turbulent dissipation with Polzin scheme, scaled by N2_bot/N2_meanz ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "N2_b" [Unused] ! long_name: Bottom Buoyancy frequency squared ! units: s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "N2_meanz" [Unused] ! long_name: Buoyancy frequency squared averaged over the water column ! units: s-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_Work_xyave" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: W m-2 @@ -2588,7 +2588,7 @@ "ocean_model_z", "Kd_Work" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_Work_xyave" [Unused] ! long_name: Work done by Diapycnal Mixing ! units: W m-2 @@ -2596,7 +2596,7 @@ "ocean_model", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_Itidal_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: W m-2 @@ -2604,7 +2604,7 @@ "ocean_model_z", "Kd_Itidal_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_Itidal_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing ! units: W m-2 @@ -2612,7 +2612,7 @@ "ocean_model", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_Nikurashin_Work_xyave" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: W m-2 @@ -2620,7 +2620,7 @@ "ocean_model_z", "Kd_Nikurashin_Work" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_Nikurashin_Work_xyave" [Unused] ! long_name: Work done by Nikurashin Lee Wave Drag Scheme ! units: W m-2 @@ -2628,7 +2628,7 @@ "ocean_model", "Kd_Lowmode_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "Kd_Lowmode_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) ! units: W m-2 @@ -2636,7 +2636,7 @@ "ocean_model_z", "Kd_Lowmode_Work" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "Kd_Lowmode_Work_xyave" [Unused] ! long_name: Work done by Internal Tide Diapycnal Mixing (low modes) ! units: W m-2 @@ -2644,7 +2644,7 @@ "ocean_model", "N2" [Unused] (CMOR equivalent is "obvfsq") ! long_name: Buoyancy frequency squared ! units: s-2 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "N2_xyave" [Unused] (CMOR equivalent is "obvfsq_xyave") ! long_name: Buoyancy frequency squared ! units: s-2 @@ -2653,7 +2653,7 @@ ! long_name: Square of seawater buoyancy frequency ! units: s-2 ! standard_name: square_of_brunt_vaisala_frequency_in_sea_water - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "obvfsq_xyave" [Unused] (native name is "N2_xyave") ! long_name: Square of seawater buoyancy frequency ! units: s-2 @@ -2662,7 +2662,7 @@ "ocean_model_z", "N2" [Unused] (CMOR equivalent is "obvfsq") ! long_name: Buoyancy frequency squared ! units: s-2 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "N2_xyave" [Unused] (CMOR equivalent is "obvfsq_xyave") ! long_name: Buoyancy frequency squared ! units: s-2 @@ -2671,7 +2671,7 @@ ! long_name: Square of seawater buoyancy frequency ! units: s-2 ! standard_name: square_of_brunt_vaisala_frequency_in_sea_water - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "obvfsq_xyave" [Unused] (native name is "N2_xyave") ! long_name: Square of seawater buoyancy frequency ! units: s-2 @@ -2686,7 +2686,7 @@ "ocean_model", "Kd_shear" [Used] ! long_name: Shear-driven Diapycnal Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Kd_shear_xyave" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity ! units: m2 s-1 @@ -2694,7 +2694,7 @@ "ocean_model_z", "Kd_shear" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Kd_shear_xyave" [Unused] ! long_name: Shear-driven Diapycnal Diffusivity ! units: m2 s-1 @@ -2702,7 +2702,7 @@ "ocean_model", "TKE_shear" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy ! units: m2 s-2 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "TKE_shear_xyave" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy ! units: m2 s-2 @@ -2710,7 +2710,7 @@ "ocean_model_z", "TKE_shear" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy ! units: m2 s-2 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "TKE_shear_xyave" [Unused] ! long_name: Shear-driven Turbulent Kinetic Energy ! units: m2 s-2 @@ -2718,12 +2718,12 @@ "ocean_model", "created_H" [Unused] ! long_name: The volume flux added to stop the ocean from drying out and becoming negative in depth ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "rsdoabsorb" [Unused] ! long_name: Convergence of Penetrative Shortwave Flux in Sea Water Layer ! units: W m-2 ! standard_name: net_rate_of_absorption_of_shortwave_energy_in_ocean_layer - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "rsdoabsorb_xyave" [Unused] ! long_name: Convergence of Penetrative Shortwave Flux in Sea Water Layer ! units: W m-2 @@ -2733,7 +2733,7 @@ ! long_name: Convergence of Penetrative Shortwave Flux in Sea Water Layer ! units: W m-2 ! standard_name: net_rate_of_absorption_of_shortwave_energy_in_ocean_layer - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "rsdoabsorb_xyave" [Unused] ! long_name: Convergence of Penetrative Shortwave Flux in Sea Water Layer ! units: W m-2 @@ -2743,7 +2743,7 @@ ! long_name: Downwelling Shortwave Flux in Sea Water at Grid Cell Upper Interface ! units: W m-2 ! standard_name: downwelling_shortwave_flux_in_sea_water - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "rsdo_xyave" [Unused] ! long_name: Downwelling Shortwave Flux in Sea Water at Grid Cell Upper Interface ! units: W m-2 @@ -2753,7 +2753,7 @@ ! long_name: Downwelling Shortwave Flux in Sea Water at Grid Cell Upper Interface ! units: W m-2 ! standard_name: downwelling_shortwave_flux_in_sea_water - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "rsdo_xyave" [Unused] ! long_name: Downwelling Shortwave Flux in Sea Water at Grid Cell Upper Interface ! units: W m-2 @@ -2763,47 +2763,47 @@ ! long_name: Non-downwelling SW radiation (i.e., SW absorbed in ocean surface with LW,SENS,LAT) ! units: W m-2 ! standard_name: nondownwelling_shortwave_flux_in_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ePBL_h_ML" [Unused] ! long_name: Surface boundary layer depth ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ePBL_TKE_wind" [Unused] ! long_name: Wind-stirring source of mixed layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ePBL_TKE_MKE" [Unused] ! long_name: Mean kinetic energy source of mixed layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ePBL_TKE_conv" [Unused] ! long_name: Convective source of mixed layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ePBL_TKE_forcing" [Unused] ! long_name: TKE consumed by mixing surface forcing or penetrative shortwave radation through model layers ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ePBL_TKE_mixing" [Unused] ! long_name: TKE consumed by mixing that deepens the mixed layer ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ePBL_TKE_mech_decay" [Unused] ! long_name: Mechanical energy decay sink of mixed layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ePBL_TKE_conv_decay" [Unused] ! long_name: Convective energy decay sink of mixed layer TKE ! units: m3 s-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ePBL_Hs_used" [Unused] ! long_name: Surface region thickness that is used ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Mixing_Length" [Unused] ! long_name: Mixing Length that is used ! units: m - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Mixing_Length_xyave" [Unused] ! long_name: Mixing Length that is used ! units: m @@ -2811,7 +2811,7 @@ "ocean_model_z", "Mixing_Length" [Unused] ! long_name: Mixing Length that is used ! units: m - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Mixing_Length_xyave" [Unused] ! long_name: Mixing Length that is used ! units: m @@ -2819,7 +2819,7 @@ "ocean_model", "Velocity_Scale" [Unused] ! long_name: Velocity Scale that is used. ! units: m s-1 - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "Velocity_Scale_xyave" [Unused] ! long_name: Velocity Scale that is used. ! units: m s-1 @@ -2827,7 +2827,7 @@ "ocean_model_z", "Velocity_Scale" [Unused] ! long_name: Velocity Scale that is used. ! units: m s-1 - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "Velocity_Scale_xyave" [Unused] ! long_name: Velocity Scale that is used. ! units: m s-1 @@ -2835,51 +2835,51 @@ "ocean_model", "LT_Enhancement" [Unused] ! long_name: LT enhancement that is used. ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MSTAR" [Unused] ! long_name: MSTAR that is used. ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ePBL_OSBL" [Unused] ! long_name: ePBL Surface Boundary layer depth. ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MLD_EKMAN" [Unused] ! long_name: Boundary layer depth over Ekman length. ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "MLD_OBUKHOV" [Unused] ! long_name: Boundary layer depth over Obukhov length. ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "EKMAN_OBUKHOV" [Unused] ! long_name: Ekman length over Obukhov length. ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "LA" [Unused] ! long_name: Langmuir number. ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "LA_MOD" [Unused] ! long_name: Modified Langmuir number. ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "deficit_ratio" [Unused] ! long_name: Max face thickness deficit ratio ! units: nondim - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SW_pen" [Unused] ! long_name: Penetrating shortwave radiation flux into ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SW_vis_pen" [Unused] ! long_name: Visible penetrating shortwave radiation flux into ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: m-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "opac_1_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: m-1 @@ -2887,7 +2887,7 @@ "ocean_model_z", "opac_1" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: m-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "opac_1_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 1 ! units: m-1 @@ -2895,7 +2895,7 @@ "ocean_model", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: m-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "opac_2_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: m-1 @@ -2903,7 +2903,7 @@ "ocean_model_z", "opac_2" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: m-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "opac_2_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 2 ! units: m-1 @@ -2911,7 +2911,7 @@ "ocean_model", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: m-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "opac_3_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: m-1 @@ -2919,7 +2919,7 @@ "ocean_model_z", "opac_3" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: m-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "opac_3_xyave" [Unused] ! long_name: Opacity for shortwave radiation in band 3 ! units: m-1 @@ -2927,7 +2927,7 @@ "ocean_model", "Chl_opac" [Unused] ! long_name: Surface chlorophyll A concentration used to find opacity ! units: mg m-3 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "KHTR_u" [Used] ! long_name: Epipycnal tracer diffusivity at zonal faces of tracer cell ! units: m2 s-1 @@ -2939,12 +2939,12 @@ "ocean_model", "KHTR_h" [Unused] (CMOR equivalent is "diftrelo") ! long_name: Epipycnal tracer diffusivity at tracer cell center ! units: m2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "diftrelo" [Used] (native name is "KHTR_h") ! long_name: Ocean Tracer Epineutral Laplacian Diffusivity ! units: m2 s-1 ! standard_name: ocean_tracer_epineutral_laplacian_diffusivity - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "KHDT_x" [Unused] ! long_name: Epipycnal tracer diffusivity operator at zonal faces of tracer cell ! units: m2 @@ -2956,7 +2956,7 @@ "ocean_model", "T_vardec" [Unused] ! long_name: ALE variance decay for temperature ! units: degC2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "T_vardec_xyave" [Unused] ! long_name: ALE variance decay for temperature ! units: degC2 s-1 @@ -2964,7 +2964,7 @@ "ocean_model_z", "T_vardec" [Unused] ! long_name: ALE variance decay for temperature ! units: degC2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "T_vardec_xyave" [Unused] ! long_name: ALE variance decay for temperature ! units: degC2 s-1 @@ -2972,7 +2972,7 @@ "ocean_model", "S_vardec" [Unused] ! long_name: ALE variance decay for salinity ! units: psu2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "S_vardec_xyave" [Unused] ! long_name: ALE variance decay for salinity ! units: psu2 s-1 @@ -2980,7 +2980,7 @@ "ocean_model_z", "S_vardec" [Unused] ! long_name: ALE variance decay for salinity ! units: psu2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "S_vardec_xyave" [Unused] ! long_name: ALE variance decay for salinity ! units: psu2 s-1 @@ -3060,7 +3060,7 @@ "ocean_model", "h" [Used] ! long_name: Layer Thickness ! units: m - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "h_xyave" [Unused] ! long_name: Layer Thickness ! units: m @@ -3068,7 +3068,7 @@ "ocean_model_z", "h" [Unused] ! long_name: Layer Thickness ! units: m - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "h_xyave" [Unused] ! long_name: Layer Thickness ! units: m @@ -3081,16 +3081,16 @@ ! long_name: Sea surface height above geoid ! units: m ! standard_name: sea_surface_height_above_geoid - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "zossq" [Used] ! long_name: Square of sea surface height above geoid ! units: m2 ! standard_name: square_of_sea_surface_height_above_geoid - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SSH" [Used] ! long_name: Sea Surface Height ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ssh_ga" [Used] ! long_name: Area averaged sea surface height ! units: m @@ -3098,7 +3098,7 @@ "ocean_model", "SSH_inst" [Unused] ! long_name: Instantaneous Sea Surface Height ! units: m - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SSU" [Used] ! long_name: Sea Surface Zonal Velocity ! units: m s-1 @@ -3110,11 +3110,11 @@ "ocean_model", "speed" [Used] ! long_name: Sea Surface Speed ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "temp" [Used] (CMOR equivalent is "thetao") ! long_name: Potential Temperature ! units: degC - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "temp_xyave" [Unused] (CMOR equivalent is "thetao_xyave") ! long_name: Potential Temperature ! units: degC @@ -3123,7 +3123,7 @@ ! long_name: Sea Water Potential Temperature ! units: degC ! standard_name: sea_water_potential_temperature - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "thetao_xyave" [Unused] (native name is "temp_xyave") ! long_name: Sea Water Potential Temperature ! units: degC @@ -3132,7 +3132,7 @@ "ocean_model_z", "temp" [Used] (CMOR equivalent is "thetao") ! long_name: Potential Temperature ! units: degC - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "temp_xyave" [Used] (CMOR equivalent is "thetao_xyave") ! long_name: Potential Temperature ! units: degC @@ -3141,7 +3141,7 @@ ! long_name: Sea Water Potential Temperature ! units: degC ! standard_name: sea_water_potential_temperature - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "thetao_xyave" [Unused] (native name is "temp_xyave") ! long_name: Sea Water Potential Temperature ! units: degC @@ -3150,7 +3150,7 @@ "ocean_model", "salt" [Used] (CMOR equivalent is "so") ! long_name: Salinity ! units: psu - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "salt_xyave" [Unused] (CMOR equivalent is "so_xyave") ! long_name: Salinity ! units: psu @@ -3159,7 +3159,7 @@ ! long_name: Sea Water Salinity ! units: psu ! standard_name: sea_water_salinity - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "so_xyave" [Unused] (native name is "salt_xyave") ! long_name: Sea Water Salinity ! units: psu @@ -3168,7 +3168,7 @@ "ocean_model_z", "salt" [Used] (CMOR equivalent is "so") ! long_name: Salinity ! units: psu - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "salt_xyave" [Unused] (CMOR equivalent is "so_xyave") ! long_name: Salinity ! units: psu @@ -3177,7 +3177,7 @@ ! long_name: Sea Water Salinity ! units: psu ! standard_name: sea_water_salinity - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "so_xyave" [Unused] (native name is "salt_xyave") ! long_name: Sea Water Salinity ! units: psu @@ -3187,69 +3187,69 @@ ! long_name: Sea Water Potential Temperature at Sea Floor ! units: degC ! standard_name: sea_water_potential_temperature_at_sea_floor - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sob" [Unused] ! long_name: Sea Water Salinity at Sea Floor ! units: psu ! standard_name: sea_water_salinity_at_sea_floor - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SST" [Used] (CMOR equivalent is "tos") ! long_name: Sea Surface Temperature ! units: degC - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "tos" [Unused] (native name is "SST") ! long_name: Sea Surface Temperature ! units: degC ! standard_name: sea_surface_temperature - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SST_sq" [Unused] (CMOR equivalent is "tossq") ! long_name: Sea Surface Temperature Squared ! units: degC2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "tossq" [Unused] (native name is "SST_sq") ! long_name: Square of Sea Surface Temperature ! units: degC2 ! standard_name: square_of_sea_surface_temperature - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SSS" [Used] (CMOR equivalent is "sos") ! long_name: Sea Surface Salinity ! units: psu - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sos" [Unused] (native name is "SSS") ! long_name: Sea Surface Salinity ! units: psu ! standard_name: sea_surface_salinity - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SSS_sq" [Unused] (CMOR equivalent is "sossq") ! long_name: Sea Surface Salinity Squared ! units: psu - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sossq" [Unused] (native name is "SSS_sq") ! long_name: Square of Sea Surface Salinity ! units: psu ! standard_name: square_of_sea_surface_salinity - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "frazil" [Used] (CMOR equivalent is "hfsifrazil") ! long_name: Heat from frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfsifrazil" [Used] (native name is "frazil") ! long_name: Heat Flux into Sea Water due to Frazil Ice Formation ! units: W m-2 ! standard_name: heat_flux_into_sea_water_due_to_frazil_ice_formation - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "salt_deficit" [Unused] ! long_name: Salt sink in ocean due to ice flux ! units: psu m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "Heat_PmE" [Used] ! long_name: Heat flux into ocean from mass flux into ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "internal_heat" [Unused] ! long_name: Heat flux into ocean from geothermal or other internal sources ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "T_adx" [Used] ! long_name: Advective (by residual mean) Zonal Flux of Potential Temperature ! units: W m-2 @@ -3445,7 +3445,7 @@ "ocean_model", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: m - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "h_predia_xyave" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: m @@ -3453,7 +3453,7 @@ "ocean_model_z", "h_predia" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: m - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "h_predia_xyave" [Unused] ! long_name: Layer Thickness before diabatic forcing ! units: m @@ -3461,7 +3461,7 @@ "ocean_model", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: m - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "e_predia_xyave" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: m @@ -3469,7 +3469,7 @@ "ocean_model_z", "e_predia" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: m - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "e_predia_xyave" [Unused] ! long_name: Interface Heights before diabatic forcing ! units: m @@ -3509,7 +3509,7 @@ "ocean_model", "h_preale" [Unused] ! long_name: Layer Thickness before remapping ! units: m - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "h_preale_xyave" [Unused] ! long_name: Layer Thickness before remapping ! units: m @@ -3517,7 +3517,7 @@ "ocean_model_z", "h_preale" [Unused] ! long_name: Layer Thickness before remapping ! units: m - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "h_preale_xyave" [Unused] ! long_name: Layer Thickness before remapping ! units: m @@ -3525,7 +3525,7 @@ "ocean_model", "T_preale" [Unused] ! long_name: Temperature before remapping ! units: degC - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "T_preale_xyave" [Unused] ! long_name: Temperature before remapping ! units: degC @@ -3533,7 +3533,7 @@ "ocean_model_z", "T_preale" [Unused] ! long_name: Temperature before remapping ! units: degC - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "T_preale_xyave" [Unused] ! long_name: Temperature before remapping ! units: degC @@ -3541,7 +3541,7 @@ "ocean_model", "S_preale" [Unused] ! long_name: Salinity before remapping ! units: psu - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "S_preale_xyave" [Unused] ! long_name: Salinity before remapping ! units: psu @@ -3549,7 +3549,7 @@ "ocean_model_z", "S_preale" [Unused] ! long_name: Salinity before remapping ! units: psu - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "S_preale_xyave" [Unused] ! long_name: Salinity before remapping ! units: psu @@ -3557,7 +3557,7 @@ "ocean_model", "e_preale" [Unused] ! long_name: Interface Heights before remapping ! units: m - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "e_preale_xyave" [Unused] ! long_name: Interface Heights before remapping ! units: m @@ -3565,7 +3565,7 @@ "ocean_model_z", "e_preale" [Unused] ! long_name: Interface Heights before remapping ! units: m - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "e_preale_xyave" [Unused] ! long_name: Interface Heights before remapping ! units: m @@ -3573,7 +3573,7 @@ "ocean_model", "temp_predia" [Unused] ! long_name: Potential Temperature ! units: degC - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "temp_predia_xyave" [Unused] ! long_name: Potential Temperature ! units: degC @@ -3581,7 +3581,7 @@ "ocean_model_z", "temp_predia" [Unused] ! long_name: Potential Temperature ! units: degC - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "temp_predia_xyave" [Unused] ! long_name: Potential Temperature ! units: degC @@ -3589,7 +3589,7 @@ "ocean_model", "salt_predia" [Unused] ! long_name: Salinity ! units: psu - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "salt_predia_xyave" [Unused] ! long_name: Salinity ! units: psu @@ -3597,7 +3597,7 @@ "ocean_model_z", "salt_predia" [Unused] ! long_name: Salinity ! units: psu - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "salt_predia_xyave" [Unused] ! long_name: Salinity ! units: psu @@ -3687,7 +3687,7 @@ "ocean_model", "T_advection_xy" [Used] ! long_name: Horizontal convergence of residual mean heat advective fluxes ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "T_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes ! units: W m-2 @@ -3695,7 +3695,7 @@ "ocean_model_z", "T_advection_xy" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "T_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean heat advective fluxes ! units: W m-2 @@ -3703,11 +3703,11 @@ "ocean_model", "T_advection_xy_2d" [Used] ! long_name: Vertical sum of horizontal convergence of residual mean heat advective fluxes ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "T_tendency" [Used] ! long_name: Net time tendency for temperature ! units: degC s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "T_tendency_xyave" [Unused] ! long_name: Net time tendency for temperature ! units: degC s-1 @@ -3715,7 +3715,7 @@ "ocean_model_z", "T_tendency" [Unused] ! long_name: Net time tendency for temperature ! units: degC s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "T_tendency_xyave" [Unused] ! long_name: Net time tendency for temperature ! units: degC s-1 @@ -3723,7 +3723,7 @@ "ocean_model", "Th_tendency" [Unused] (CMOR equivalent is "opottemptend") ! long_name: Net time tendency for heat ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "Th_tendency_xyave" [Unused] (CMOR equivalent is "opottemptend_xyave") ! long_name: Net time tendency for heat ! units: W m-2 @@ -3732,7 +3732,7 @@ ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "opottemptend_xyave" [Unused] (native name is "Th_tendency_xyave") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content ! units: W m-2 @@ -3741,7 +3741,7 @@ "ocean_model_z", "Th_tendency" [Unused] (CMOR equivalent is "opottemptend") ! long_name: Net time tendency for heat ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "Th_tendency_xyave" [Unused] (CMOR equivalent is "opottemptend_xyave") ! long_name: Net time tendency for heat ! units: W m-2 @@ -3750,7 +3750,7 @@ ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "opottemptend_xyave" [Unused] (native name is "Th_tendency_xyave") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content ! units: W m-2 @@ -3759,16 +3759,16 @@ "ocean_model", "Th_tendency_2d" [Unused] (CMOR equivalent is "opottemptend_2d") ! long_name: Vertical sum of net time tendency for heat ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "opottemptend_2d" [Used] (native name is "Th_tendency_2d") ! long_name: Tendency of Sea Water Potential Temperature Expressed as Heat Content Vertical Sum ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content_vertical_sum - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "S_advection_xy" [Used] ! long_name: Horizontal convergence of residual mean salt advective fluxes ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "S_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes ! units: kg m-2 s-1 @@ -3776,7 +3776,7 @@ "ocean_model_z", "S_advection_xy" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "S_advection_xy_xyave" [Unused] ! long_name: Horizontal convergence of residual mean salt advective fluxes ! units: kg m-2 s-1 @@ -3784,11 +3784,11 @@ "ocean_model", "S_advection_xy_2d" [Used] ! long_name: Vertical sum of horizontal convergence of residual mean salt advective fluxes ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "S_tendency" [Used] ! long_name: Net time tendency for salinity ! units: psu s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "S_tendency_xyave" [Unused] ! long_name: Net time tendency for salinity ! units: psu s-1 @@ -3796,7 +3796,7 @@ "ocean_model_z", "S_tendency" [Unused] ! long_name: Net time tendency for salinity ! units: psu s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "S_tendency_xyave" [Unused] ! long_name: Net time tendency for salinity ! units: psu s-1 @@ -3804,7 +3804,7 @@ "ocean_model", "Sh_tendency" [Unused] (CMOR equivalent is "osalttend") ! long_name: Net time tendency for salt ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "Sh_tendency_xyave" [Unused] (CMOR equivalent is "osalttend_xyave") ! long_name: Net time tendency for salt ! units: kg m-2 s-1 @@ -3813,7 +3813,7 @@ ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "osalttend_xyave" [Unused] (native name is "Sh_tendency_xyave") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content ! units: kg m-2 s-1 @@ -3822,7 +3822,7 @@ "ocean_model_z", "Sh_tendency" [Unused] (CMOR equivalent is "osalttend") ! long_name: Net time tendency for salt ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "Sh_tendency_xyave" [Unused] (CMOR equivalent is "osalttend_xyave") ! long_name: Net time tendency for salt ! units: kg m-2 s-1 @@ -3831,7 +3831,7 @@ ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "osalttend_xyave" [Unused] (native name is "Sh_tendency_xyave") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content ! units: kg m-2 s-1 @@ -3840,16 +3840,16 @@ "ocean_model", "Sh_tendency_2d" [Unused] (CMOR equivalent is "osalttend_2d") ! long_name: Vertical sum of net time tendency for salt ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "osalttend_2d" [Used] (native name is "Sh_tendency_2d") ! long_name: Tendency of Sea Water Salinity Expressed as Salt Content Vertical Sum ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content_vertical_sum - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "dzRegrid" [Unused] ! long_name: Change in interface height due to ALE regridding ! units: m - ! cell_methods: xh:mean yh:mean zi:point + ! cell_methods: xh:mean yh:mean zi:point area:mean "ocean_model", "dzRegrid_xyave" [Unused] ! long_name: Change in interface height due to ALE regridding ! units: m @@ -3857,7 +3857,7 @@ "ocean_model_z", "dzRegrid" [Unused] ! long_name: Change in interface height due to ALE regridding ! units: m - ! cell_methods: xh:mean yh:mean z_i:point + ! cell_methods: xh:mean yh:mean z_i:point area:mean "ocean_model_z", "dzRegrid_xyave" [Unused] ! long_name: Change in interface height due to ALE regridding ! units: m @@ -3865,7 +3865,7 @@ "ocean_model", "T_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration T ! units: degC s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "T_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration T ! units: degC s-1 @@ -3873,7 +3873,7 @@ "ocean_model_z", "T_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration T ! units: degC s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "T_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration T ! units: degC s-1 @@ -3881,7 +3881,7 @@ "ocean_model", "Th_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for heat ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "Th_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for heat ! units: W m-2 @@ -3889,7 +3889,7 @@ "ocean_model_z", "Th_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for heat ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "Th_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for heat ! units: W m-2 @@ -3897,11 +3897,11 @@ "ocean_model", "Th_tendency_vert_remap_2d" [Unused] ! long_name: Vertical sum of tendency from vertical remapping for heat ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "S_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration S ! units: tracer concentration * s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "S_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration S ! units: tracer concentration * s-1 @@ -3909,7 +3909,7 @@ "ocean_model_z", "S_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration S ! units: tracer concentration * s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "S_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration S ! units: tracer concentration * s-1 @@ -3917,7 +3917,7 @@ "ocean_model", "Sh_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer content S ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "Sh_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer content S ! units: kg m-2 s-1 @@ -3925,7 +3925,7 @@ "ocean_model_z", "Sh_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer content S ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "Sh_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer content S ! units: kg m-2 s-1 @@ -3933,11 +3933,11 @@ "ocean_model", "Sh_tendency_vert_remap_2d" [Unused] ! long_name: Vertical sum of tendency from vertical remapping for tracer content S ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "age_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration age ! units: tracer concentration * s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "age_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration age ! units: tracer concentration * s-1 @@ -3945,7 +3945,7 @@ "ocean_model_z", "age_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration age ! units: tracer concentration * s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "age_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer concentration age ! units: tracer concentration * s-1 @@ -3953,7 +3953,7 @@ "ocean_model", "ageh_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer content age ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "ageh_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer content age ! units: kg m-2 s-1 @@ -3961,7 +3961,7 @@ "ocean_model_z", "ageh_tendency_vert_remap" [Unused] ! long_name: Tendency from vertical remapping for tracer content age ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "ageh_tendency_vert_remap_xyave" [Unused] ! long_name: Tendency from vertical remapping for tracer content age ! units: kg m-2 s-1 @@ -3969,7 +3969,7 @@ "ocean_model", "ageh_tendency_vert_remap_2d" [Unused] ! long_name: Vertical sum of tendency from vertical remapping for tracer content age ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model_zold", "temp" [Used] ! long_name: Potential Temperature ! units: degC @@ -4005,7 +4005,7 @@ "ocean_model", "age" [Unused] (CMOR equivalent is "agessc") ! long_name: Ideal Age Tracer ! units: yr - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "age_xyave" [Unused] (CMOR equivalent is "agessc_xyave") ! long_name: Ideal Age Tracer ! units: yr @@ -4014,7 +4014,7 @@ ! long_name: Ideal Age Tracer ! units: yr ! standard_name: not provided - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "agessc_xyave" [Unused] (native name is "age_xyave") ! long_name: Ideal Age Tracer ! units: yr @@ -4023,7 +4023,7 @@ "ocean_model_z", "age" [Unused] (CMOR equivalent is "agessc") ! long_name: Ideal Age Tracer ! units: yr - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "age_xyave" [Unused] (CMOR equivalent is "agessc_xyave") ! long_name: Ideal Age Tracer ! units: yr @@ -4032,7 +4032,7 @@ ! long_name: Ideal Age Tracer ! units: yr ! standard_name: not provided - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "agessc_xyave" [Unused] (native name is "age_xyave") ! long_name: Ideal Age Tracer ! units: yr @@ -4113,7 +4113,7 @@ "ocean_model", "ndiff_tracer_conc_tendency_T" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for T ! units: degC s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "ndiff_tracer_conc_tendency_T_xyave" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for T ! units: degC s-1 @@ -4121,7 +4121,7 @@ "ocean_model_z", "ndiff_tracer_conc_tendency_T" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for T ! units: degC s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "ndiff_tracer_conc_tendency_T_xyave" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for T ! units: degC s-1 @@ -4129,7 +4129,7 @@ "ocean_model", "ndiff_tracer_cont_tendency_T" [Unused] (CMOR equivalent is "opottemppmdiff") ! long_name: Neutral diffusion tracer content tendency for T ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "ndiff_tracer_cont_tendency_T_xyave" [Unused] (CMOR equivalent is "opottemppmdiff_xyave") ! long_name: Neutral diffusion tracer content tendency for T ! units: W m-2 @@ -4138,7 +4138,7 @@ ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized mesocale diffusion ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesocale_diffusion - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "opottemppmdiff_xyave" [Unused] (native name is "ndiff_tracer_cont_tendency_T_xyave") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized mesocale diffusion ! units: W m-2 @@ -4147,7 +4147,7 @@ "ocean_model_z", "ndiff_tracer_cont_tendency_T" [Unused] (CMOR equivalent is "opottemppmdiff") ! long_name: Neutral diffusion tracer content tendency for T ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "ndiff_tracer_cont_tendency_T_xyave" [Unused] (CMOR equivalent is "opottemppmdiff_xyave") ! long_name: Neutral diffusion tracer content tendency for T ! units: W m-2 @@ -4156,7 +4156,7 @@ ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized mesocale diffusion ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesocale_diffusion - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "opottemppmdiff_xyave" [Unused] (native name is "ndiff_tracer_cont_tendency_T_xyave") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized mesocale diffusion ! units: W m-2 @@ -4165,12 +4165,12 @@ "ocean_model", "ndiff_tracer_cont_tendency_2d_T" [Unused] (CMOR equivalent is "opottemppmdiff_2d") ! long_name: Depth integrated neutral diffusion tracer content tendency for T ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "opottemppmdiff_2d" [Unused] (native name is "ndiff_tracer_cont_tendency_2d_T") ! long_name: Tendency of sea water potential temperature expressed as heat content due to parameterized mesocale diffusion depth integrated ! units: W m-2 ! standard_name: tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesocale_diffusion_depth_integrated - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ndiff_tracer_trans_x_2d_T" [Unused] ! long_name: Depth integrated neutral diffusion zonal tracer transport for T ! units: W @@ -4182,7 +4182,7 @@ "ocean_model", "ndiff_tracer_conc_tendency_S" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for S ! units: tracer concentration * s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "ndiff_tracer_conc_tendency_S_xyave" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for S ! units: tracer concentration * s-1 @@ -4190,7 +4190,7 @@ "ocean_model_z", "ndiff_tracer_conc_tendency_S" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for S ! units: tracer concentration * s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "ndiff_tracer_conc_tendency_S_xyave" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for S ! units: tracer concentration * s-1 @@ -4198,7 +4198,7 @@ "ocean_model", "ndiff_tracer_cont_tendency_S" [Unused] (CMOR equivalent is "osaltpmdiff") ! long_name: Neutral diffusion tracer content tendency for S ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "ndiff_tracer_cont_tendency_S_xyave" [Unused] (CMOR equivalent is "osaltpmdiff_xyave") ! long_name: Neutral diffusion tracer content tendency for S ! units: kg m-2 s-1 @@ -4207,7 +4207,7 @@ ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized mesocale diffusion ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_mesocale_diffusion - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "osaltpmdiff_xyave" [Unused] (native name is "ndiff_tracer_cont_tendency_S_xyave") ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized mesocale diffusion ! units: kg m-2 s-1 @@ -4216,7 +4216,7 @@ "ocean_model_z", "ndiff_tracer_cont_tendency_S" [Unused] (CMOR equivalent is "osaltpmdiff") ! long_name: Neutral diffusion tracer content tendency for S ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "ndiff_tracer_cont_tendency_S_xyave" [Unused] (CMOR equivalent is "osaltpmdiff_xyave") ! long_name: Neutral diffusion tracer content tendency for S ! units: kg m-2 s-1 @@ -4225,7 +4225,7 @@ ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized mesocale diffusion ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_mesocale_diffusion - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "osaltpmdiff_xyave" [Unused] (native name is "ndiff_tracer_cont_tendency_S_xyave") ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized mesocale diffusion ! units: kg m-2 s-1 @@ -4234,12 +4234,12 @@ "ocean_model", "ndiff_tracer_cont_tendency_2d_S" [Unused] (CMOR equivalent is "osaltpmdiff_2d") ! long_name: Depth integrated neutral diffusion tracer content tendency for S ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "osaltpmdiff_2d" [Unused] (native name is "ndiff_tracer_cont_tendency_2d_S") ! long_name: Tendency of sea water salinity expressed as salt content due to parameterized mesocale diffusion depth integrated ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_mesocale_diffusion_depth_integrated - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ndiff_tracer_trans_x_2d_S" [Unused] ! long_name: Depth integrated neutral diffusion zonal tracer transport for S ! units: kg s-1 @@ -4251,7 +4251,7 @@ "ocean_model", "ndiff_tracer_conc_tendency_age" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for age ! units: tracer concentration * m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "ndiff_tracer_conc_tendency_age_xyave" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for age ! units: tracer concentration * m-2 s-1 @@ -4259,7 +4259,7 @@ "ocean_model_z", "ndiff_tracer_conc_tendency_age" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for age ! units: tracer concentration * m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "ndiff_tracer_conc_tendency_age_xyave" [Unused] ! long_name: Neutral diffusion tracer concentration tendency for age ! units: tracer concentration * m-2 s-1 @@ -4267,7 +4267,7 @@ "ocean_model", "ndiff_tracer_cont_tendency_age" [Unused] ! long_name: Neutral diffusion tracer content tendency for age ! units: tracer content * m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:sum + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "ndiff_tracer_cont_tendency_age_xyave" [Unused] ! long_name: Neutral diffusion tracer content tendency for age ! units: tracer content * m-2 s-1 @@ -4275,7 +4275,7 @@ "ocean_model_z", "ndiff_tracer_cont_tendency_age" [Unused] ! long_name: Neutral diffusion tracer content tendency for age ! units: tracer content * m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:sum + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "ndiff_tracer_cont_tendency_age_xyave" [Unused] ! long_name: Neutral diffusion tracer content tendency for age ! units: tracer content * m-2 s-1 @@ -4283,7 +4283,7 @@ "ocean_model", "ndiff_tracer_cont_tendency_2d_age" [Unused] ! long_name: Depth integrated neutral diffusion tracer content tendency for age ! units: tracer content * m-2 s-1 - ! cell_methods: xh:mean yh:mean zl:mean + ! cell_methods: xh:mean yh:mean zl:mean area:mean "ocean_model", "ndiff_tracer_cont_tendency_2d_age_xyave" [Unused] ! long_name: Depth integrated neutral diffusion tracer content tendency for age ! units: tracer content * m-2 s-1 @@ -4291,7 +4291,7 @@ "ocean_model_z", "ndiff_tracer_cont_tendency_2d_age" [Unused] ! long_name: Depth integrated neutral diffusion tracer content tendency for age ! units: tracer content * m-2 s-1 - ! cell_methods: xh:mean yh:mean z_l:mean + ! cell_methods: xh:mean yh:mean z_l:mean area:mean "ocean_model_z", "ndiff_tracer_cont_tendency_2d_age_xyave" [Unused] ! long_name: Depth integrated neutral diffusion tracer content tendency for age ! units: tracer content * m-2 s-1 @@ -4327,104 +4327,104 @@ "ocean_model", "ustar" [Used] ! long_name: Surface friction velocity = [(gustiness + tau_magnitude)/rho0]^(1/2) ! units: m s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "p_surf" [Used] (CMOR equivalent is "pso") ! long_name: Pressure at ice-ocean or atmosphere-ocean interface ! units: Pa - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "pso" [Used] (native name is "p_surf") ! long_name: Sea Water Pressure at Sea Water Surface ! units: Pa ! standard_name: sea_water_pressure_at_sea_water_surface - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "TKE_tidal" [Unused] ! long_name: Tidal source of BBL mixing ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "PRCmE" [Used] (CMOR equivalent is "wfo") ! long_name: Net surface water flux (precip+melt+lrunoff+ice calving-evap) ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "wfo" [Used] (native name is "PRCmE") ! long_name: Water Flux Into Sea Water ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "evap" [Used] (CMOR equivalent is "evs") ! long_name: Evaporation/condensation at ocean surface (evaporation is negative) ! units: kg m-2 s-1 ! standard_name: water_evaporation_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "evs" [Used] (native name is "evap") ! long_name: Water Evaporation Flux Where Ice Free Ocean over Sea ! units: kg m-2 s-1 ! standard_name: water_evaporation_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "precip" [Unused] ! long_name: Liquid + frozen precipitation into ocean ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "fprec" [Used] (CMOR equivalent is "prsn") ! long_name: Frozen precipitation into ocean ! units: kg m-2 s-1 ! standard_name: snowfall_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "prsn" [Used] (native name is "fprec") ! long_name: Snowfall Flux where Ice Free Ocean over Sea ! units: kg m-2 s-1 ! standard_name: snowfall_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "lprec" [Used] (CMOR equivalent is "prlq") ! long_name: Liquid precipitation into ocean ! units: kg m-2 s-1 ! standard_name: rainfall_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "prlq" [Used] (native name is "lprec") ! long_name: Rainfall Flux where Ice Free Ocean over Sea ! units: kg m-2 s-1 ! standard_name: rainfall_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "vprec" [Used] ! long_name: Virtual liquid precip into ocean due to SSS restoring ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "frunoff" [Used] (CMOR equivalent is "ficeberg") ! long_name: Frozen runoff (calving) and iceberg melt into ocean ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_icebergs - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "ficeberg" [Unused] (native name is "frunoff") ! long_name: Water Flux into Seawater from Icebergs ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_icebergs - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "lrunoff" [Used] (CMOR equivalent is "friver") ! long_name: Liquid runoff (rivers) into ocean ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_rivers - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "friver" [Used] (native name is "lrunoff") ! long_name: Water Flux into Sea Water From Rivers ! units: kg m-2 s-1 ! standard_name: water_flux_into_sea_water_from_rivers - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_massout" [Used] ! long_name: Net mass leaving the ocean due to evaporation, seaice formation ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_massin" [Used] ! long_name: Net mass entering ocean due to precip, runoff, ice melt ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "massout_flux" [Unused] ! long_name: Net mass flux of freshwater out of the ocean (used in the boundary flux calculation) ! units: kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "massin_flux" [Unused] ! long_name: Net mass flux of freshwater into the ocean (used in boundary flux calculation) ! units: kg m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "total_PRCmE" [Used] ! long_name: Area integrated net surface water flux (precip+melt+liq runoff+ice calving-evap) ! units: kg s-1 @@ -4525,146 +4525,146 @@ ! long_name: Heat content (relative to 0C) of solid runoff into ocean ! units: W m-2 ! standard_name: temperature_flux_due_to_solid_runoff_expressed_as_heat_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_lrunoff" [Used] ! long_name: Heat content (relative to 0C) of liquid runoff into ocean ! units: W m-2 ! standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfrunoffds" [Used] ! long_name: Heat content (relative to 0C) of liquid+solid runoff into ocean ! units: W m-2 ! standard_name: temperature_flux_due_to_runoff_expressed_as_heat_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_lprec" [Used] ! long_name: Heat content (relative to 0degC) of liquid precip entering ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_fprec" [Used] ! long_name: Heat content (relative to 0degC) of frozen prec entering ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_vprec" [Used] ! long_name: Heat content (relative to 0degC) of virtual precip entering ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_cond" [Used] ! long_name: Heat content (relative to 0degC) of water condensing into ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfrainds" [Used] ! long_name: Heat content (relative to 0degC) of liquid+frozen precip entering ocean ! units: W m-2 ! standard_name: temperature_flux_due_to_rainfall_expressed_as_heat_flux_into_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_surfwater" [Used] ! long_name: Heat content (relative to 0degC) of net water crossing ocean surface (frozen+liquid) ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_massout" [Used] (CMOR equivalent is "hfevapds") ! long_name: Heat content (relative to 0degC) of net mass leaving ocean ocean via evap and ice form ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfevapds" [Used] (native name is "heat_content_massout") ! long_name: Heat Content (relative to 0degC) of Water Leaving Ocean via Evaporation and Ice Formation ! units: W m-2 ! standard_name: temperature_flux_due_to_evaporation_expressed_as_heat_flux_out_of_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_massin" [Unused] ! long_name: Heat content (relative to 0degC) of net mass entering ocean ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_heat_coupler" [Used] ! long_name: Surface ocean heat flux from SW+LW+latent+sensible (via the coupler) ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_heat_surface" [Used] (CMOR equivalent is "hfds") ! long_name: Surface ocean heat flux from SW+LW+lat+sens+mass transfer+frazil+restore or flux adjustments ! units: W m-2 ! standard_name: surface_downward_heat_flux_in_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfds" [Used] (native name is "net_heat_surface") ! long_name: Surface ocean heat flux from SW+LW+latent+sensible+masstransfer+frazil ! units: W m-2 ! standard_name: surface_downward_heat_flux_in_sea_water - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "SW" [Used] (CMOR equivalent is "rsntds") ! long_name: Shortwave radiation flux into ocean ! units: W m-2 ! standard_name: net_downward_shortwave_flux_at_sea_water_surface - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "rsntds" [Used] (native name is "SW") ! long_name: Net Downward Shortwave Radiation at Sea Water Surface ! units: W m-2 ! standard_name: net_downward_shortwave_flux_at_sea_water_surface - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sw_vis" [Unused] ! long_name: Shortwave radiation direct and diffuse flux into the ocean in the visible band ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sw_nir" [Unused] ! long_name: Shortwave radiation direct and diffuse flux into the ocean in the near-infrared band ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "LwLatSens" [Used] ! long_name: Combined longwave, latent, and sensible heating at ocean surface ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "LW" [Used] (CMOR equivalent is "rlntds") ! long_name: Longwave radiation flux into ocean ! units: W m-2 ! standard_name: surface_net_downward_longwave_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "rlntds" [Used] (native name is "LW") ! long_name: Surface Net Downward Longwave Radiation ! units: W m-2 ! standard_name: surface_net_downward_longwave_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "latent" [Unused] (CMOR equivalent is "hflso") ! long_name: Latent heat flux into ocean due to fusion and evaporation (negative means ocean heat loss) ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hflso" [Used] (native name is "latent") ! long_name: Surface Downward Latent Heat Flux due to Evap + Melt Snow/Ice ! units: W m-2 ! standard_name: surface_downward_latent_heat_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "latent_evap" [Unused] ! long_name: Latent heat flux into ocean due to evaporation/condensation ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "latent_fprec_diag" [Unused] (CMOR equivalent is "hfsnthermds") ! long_name: Latent heat flux into ocean due to melting of frozen precipitation ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfsnthermds" [Used] (native name is "latent_fprec_diag") ! long_name: Latent Heat to Melt Frozen Precipitation ! units: W m-2 ! standard_name: heat_flux_into_sea_water_due_to_snow_thermodynamics - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "latent_frunoff" [Unused] (CMOR equivalent is "hfibthermds") ! long_name: Latent heat flux into ocean due to melting of icebergs ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfibthermds" [Used] (native name is "latent_frunoff") ! long_name: Latent Heat to Melt Frozen Runoff/Iceberg ! units: W m-2 ! standard_name: heat_flux_into_sea_water_due_to_iceberg_thermodynamics - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sensible" [Unused] (CMOR equivalent is "hfsso") ! long_name: Sensible heat flux into ocean ! units: W m-2 ! standard_name: surface_downward_sensible_heat_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfsso" [Used] (native name is "sensible") ! long_name: Surface Downward Sensible Heat Flux ! units: W m-2 ! standard_name: surface_downward_sensible_heat_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_added" [Unused] ! long_name: Flux Adjustment or restoring surface heat flux into ocean ! units: W m-2 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "total_heat_content_frunoff" [Used] ! long_name: Area integrated heat content (relative to 0C) of solid runoff ! units: W @@ -4813,20 +4813,20 @@ "ocean_model", "salt_flux" [Used] (CMOR equivalent is "sfdsi") ! long_name: Net salt flux into ocean at surface (restoring + sea-ice) ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "sfdsi" [Used] (native name is "salt_flux") ! long_name: Downward Sea Ice Basal Salt Flux ! units: kg m-2 s-1 ! standard_name: downward_sea_ice_basal_salt_flux - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "salt_flux_in" [Unused] ! long_name: Salt flux into ocean at surface from coupler ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "salt_flux_added" [Unused] ! long_name: Salt flux into ocean at surface due to restoring or flux adjustment ! units: kg m-2 s-1 - ! cell_methods: xh:mean yh:mean + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "salt_flux_global_restoring_adjustment" [Unused] ! long_name: Adjustment needed to balance net global salt flux into ocean at surface ! units: kg m-2 s-1 diff --git a/src/MOM6 b/src/MOM6 index 60ce41fc63..0822a17489 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 60ce41fc636612c80628925a988dab23397a3e1e +Subproject commit 0822a17489575981756a0555611a6da43ad23877 From da8591d35bbf413cae5eee74935fd86ee565df35 Mon Sep 17 00:00:00 2001 From: Andrew Shao Date: Thu, 28 Sep 2017 18:27:11 -0400 Subject: [PATCH 45/89] Include wmo as part of refine diags A requested variable 'wmo' the upwards mass transport is a requested CMIP6 diagnostic which as of yet is not available from the prognostic model in z* space. Transport across a vertical interface in hybrid coordinates can be slightly different than what users may canonically think of as a upward (towards the surface) direction which is orthogonal to strictly meridional/zonal directions. To be consistent with this colloquial understanding of vertical direction, wmo is calculated from the convergence of umo and vmo which have been remapped to a z* coordinate. --- tools/analysis/refineDiag_ocean_month_z.py | 109 ++++++++++++--------- tools/analysis/verticalvelocity.py | 82 ++++++++++++++++ 2 files changed, 147 insertions(+), 44 deletions(-) create mode 100755 tools/analysis/verticalvelocity.py diff --git a/tools/analysis/refineDiag_ocean_month_z.py b/tools/analysis/refineDiag_ocean_month_z.py index 54a674bb8d..1b3e72f471 100755 --- a/tools/analysis/refineDiag_ocean_month_z.py +++ b/tools/analysis/refineDiag_ocean_month_z.py @@ -7,11 +7,12 @@ import os import sys import matplotlib.pyplot as plt +from verticalvelocity import calc_w_from_convergence ##-- RefineDiag Script for CMIP6 ## ## Variables we intend to provide in z-coordinates: -## +## ## msftyyz -> vmo (ocean_z) * both 0.25 and 0.5 resolutions ## msftyzmpa -> vhGM (ocean_z) * applies only to 0.5 resolution ## msftyzsmpa -> vhml (ocean_z) * both 0.25 and 0.5 resolutions @@ -20,7 +21,7 @@ ## Variables we intend to provide in rho-coordinates: ## (potenital density referenced to 2000 m) ## -## msftyrho -> vmo +## msftyrho -> vmo ## msftyrhompa -> vhGM * applies only to 0.5 resolution ## ## @@ -32,20 +33,20 @@ ## diffusive term only in 0.5 resolution ## ## hfx -> same recipie as above, expect for x-dimension -## hfbasin -> summed line of hfy in each basin -## +## hfbasin -> summed line of hfy in each basin +## ## ## Outstanding issues ## 1.) regirdding of vh, vhGM to rho-corrdinates ## 2.) vhGM and vhML units need to be in kg s-1 ## 2.) save out RHO_0 and Cp somewhere in netCDF files to key off of ## -## +## ## CMIP variables that will NOT be provided: ## ## hfbasinpmadv, hfbasinpsmadv, hfbasinpmdiff, hfbasinpadv ## (We advect the tracer with the residual mean velocity; individual terms cannot be diagnosed) -## +## ## htovgyre, htovovrt, sltovgyre, sltovovrt ## (Code for offline calculation not ready.) ## @@ -61,12 +62,13 @@ def run(): main(args) def main(args): + nc_misval = 1.e20 #-- Define Regions and their associated masks - # Note: The Atlantic should include other smaller bays/seas that are + # Note: The Atlantic should include other smaller bays/seas that are # included in the definition used in meridional_overturning.py - + region = np.array(['atlantic_arctic_ocean','indian_pacific_ocean','global_ocean']) - + #-- Read basin masks f_basin = nc.Dataset(args.basinfile) basin_code = f_basin.variables['basin'][:] @@ -76,24 +78,25 @@ def main(args): indo_pacific_mask = basin_code * 0. indo_pacific_mask[(basin_code==3) | (basin_code==5)] = 1. - + #-- Read model data f_in = nc.Dataset(args.infile) #-- Read in existing dimensions from history netcdf file + xh = f_in.variables['xh'] yh = f_in.variables['yh'] z_l = f_in.variables['z_l'] z_i = f_in.variables['z_i'] tax = f_in.variables['time'] - + #-- msftyyz varname = 'vmo' msftyyz = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. msftyyz[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyyz[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyyz[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) - msftyyz[msftyyz.mask] = 1.e20 - msftyyz = np.ma.array(msftyyz,fill_value=1.e20) + msftyyz[msftyyz.mask] = nc_misval + msftyyz = np.ma.array(msftyyz,fill_value=nc_misval) msftyyz.long_name = 'Ocean Y Overturning Mass Streamfunction' msftyyz.units = 'kg s-1' msftyyz.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' @@ -106,8 +109,8 @@ def main(args): msftyzmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyzmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyzmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) - msftyzmpa[msftyzmpa.mask] = 1.e20 - msftyzmpa = np.ma.array(msftyzmpa,fill_value=1.e20) + msftyzmpa[msftyzmpa.mask] = nc_misval + msftyzmpa = np.ma.array(msftyzmpa,fill_value=nc_misval) msftyzmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' msftyzmpa.units = 'kg s-1' msftyzmpa.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' @@ -121,8 +124,8 @@ def main(args): msftyzsmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyzsmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyzsmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) - msftyzsmpa[msftyzsmpa.mask] = 1.e20 - msftyzsmpa = np.ma.array(msftyzsmpa,fill_value=1.e20) + msftyzsmpa[msftyzsmpa.mask] = nc_misval + msftyzsmpa = np.ma.array(msftyzsmpa,fill_value=nc_misval) msftyzsmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized submesoscale advection' msftyzsmpa.units = 'kg s-1' msftyzsmpa.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' @@ -130,13 +133,24 @@ def main(args): msftyzsmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ 'submesoscale_advection' - #-- Read time bounds + #-- wmo + varname = 'wmo' + wmo = calc_w_from_convergence(infile, f_in.variables['umo'], f_in.variables['vmo']) + wmo[wmo.mask] = nc_misval + wmo = np.ma.array(wmo,fill_value=nc_misval) + wmo.long_name = 'Upward mass transport from resolved and parameterized advective transport' + wmo.units = 'kg s-1' + wmo.cell_methods = 'z_i:sum xh:sum yh:sum time:mean' + wmo.time_avg_info = 'average_T1,average_T2,average_DT' + wmo.standard_name = 'upward_ocean_mass_transport' + + #-- Read time bounds nv = f_in.variables['nv'] average_T1 = f_in.variables['average_T1'] average_T2 = f_in.variables['average_T2'] average_DT = f_in.variables['average_DT'] time_bnds = f_in.variables['time_bnds'] - + #-- Generate output filename if args.outfile is None: if hasattr(f_in,'filename'): @@ -146,7 +160,7 @@ def main(args): args.outfile = args.outfile.split('.') args.outfile[-2] = args.outfile[-2]+'_refined' args.outfile = '.'.join(args.outfile) - + if args.refineDiagDir is not None: args.outfile = args.refineDiagDir + '/' + args.outfile @@ -155,23 +169,24 @@ def main(args): os.remove(args.outfile) except: pass - + if os.path.exists(args.outfile): raise IOError('Output netCDF file already exists.') exit(1) - + f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') f_out.setncatts(f_in.__dict__) f_out.filename = args.outfile - + time_dim = f_out.createDimension('time', size=None) basin_dim = f_out.createDimension('basin', size=3) strlen_dim = f_out.createDimension('strlen', size=21) + xh_dim = f_out.createDimension('xh', size=len(xh[:])) yh_dim = f_out.createDimension('yh', size=len(yh[:])) z_l_dim = f_out.createDimension('z_l', size=len(z_l[:])) z_i_dim = f_out.createDimension('z_i', size=len(z_i[:])) nv_dim = f_out.createDimension('nv', size=len(nv[:])) - + time_out = f_out.createVariable('time', np.float64, ('time')) #basin_out = f_out.createVariable('basin', np.int32, ('basin')) yh_out = f_out.createVariable('yh', np.float64, ('yh')) @@ -179,22 +194,26 @@ def main(args): z_l_out = f_out.createVariable('z_l', np.float64, ('z_l')) z_i_out = f_out.createVariable('z_i', np.float64, ('z_i')) nv_out = f_out.createVariable('nv', np.float64, ('nv')) - - msftyyz_out = f_out.createVariable('msftyyz', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=1.e20) - msftyyz_out.missing_value = 1.e20 - - msftyzsmpa_out = f_out.createVariable('msftyzsmpa', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=1.e20) - msftyzsmpa_out.missing_value = 1.e20 - - msftyzmpa_out = f_out.createVariable('msftyzmpa', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=1.e20) - msftyzmpa_out.missing_value = 1.e20 - + + msftyyz_out = f_out.createVariable('msftyyz', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=nc_misval) + msftyyz_out.missing_value = nc_misval + + msftyzsmpa_out = f_out.createVariable('msftyzsmpa', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=nc_misval) + msftyzsmpa_out.missing_value = nc_misval + + msftyzmpa_out = f_out.createVariable('msftyzmpa', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=nc_misval) + msftyzmpa_out.missing_value = nc_misval + + wmo_out = f_out.createVariable('wmo', np.float32, ('time', 'z_i', 'yh', 'xh'), fill_value=nc_misval) + wmo_out.missing_value = nc_misval + average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) - + time_out.setncatts(tax.__dict__) + xh_out.setncatts(xh.__dict__) yh_out.setncatts(yh.__dict__) z_l_out.setncatts(z_l.__dict__) z_i_out.setncatts(z_i.__dict__) @@ -202,37 +221,39 @@ def main(args): for k in msftyyz.__dict__.keys(): if k[0] != '_': msftyyz_out.setncattr(k,msftyyz.__dict__[k]) - + for k in msftyzsmpa.__dict__.keys(): if k[0] != '_': msftyzsmpa_out.setncattr(k,msftyzsmpa.__dict__[k]) - + for k in msftyzmpa.__dict__.keys(): if k[0] != '_': msftyzmpa_out.setncattr(k,msftyzmpa.__dict__[k]) - + average_T1_out.setncatts(average_T1.__dict__) average_T2_out.setncatts(average_T2.__dict__) average_DT_out.setncatts(average_DT.__dict__) time_bnds_out.setncatts(time_bnds.__dict__) - + time_out[:] = np.array(tax[:]) + xh_out[:] = np.array(xh[:]) yh_out[:] = np.array(yh[:]) z_l_out[:] = np.array(z_l[:]) z_i_out[:] = np.array(z_i[:]) nv_out[:] = np.array(nv[:]) - + msftyyz_out[:] = np.ma.array(msftyyz[:]) msftyzsmpa_out[:] = np.ma.array(msftyzsmpa[:]) msftyzmpa_out[:] = np.ma.array(msftyzmpa[:]) - + wmo_out[:] = np.ma.array(wmo[:]) + average_T1_out[:] = average_T1[:] average_T2_out[:] = average_T2[:] average_DT_out[:] = average_DT[:] time_bnds_out[:] = time_bnds[:] - + region_out[:] = nc.stringtochar(region) - + f_out.close() - + exit(0) if __name__ == '__main__': diff --git a/tools/analysis/verticalvelocity.py b/tools/analysis/verticalvelocity.py new file mode 100755 index 0000000000..b10f6e44ad --- /dev/null +++ b/tools/analysis/verticalvelocity.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python +# Estimate vertical mass transport (wmo) by the divergence of the horizontal mass transports. The vertical mass transport across an +# interface is the cumulative integral starting from the bottom of a water column. The sign convention is w>0 is an upward transport, +# (i.e., towards the surface of the ocean). By this convention, then div(u,v)<0 implies a negative (downward) transport and vice versa. +# Written by Andrew Shao (andrew.shao@noaa.gov) 29 September 2017 +import numpy as np + +def calc_w_from_convergence(infile, gridspec, u_var, v_var, wrapx = True, wrapy = False): + + tmax = u_var.shape[0] + + ntime, nk, nlat, nlon = u_var.shape + w = np.ma.zeros( (ntime, nk+1, nlat, nlon) ) + # Work timelevel by timelevel + for tidx in range(0,tmax): + # Get and process the u component + u_dat = u_var[tidx,:,:,:] + h_mask = np.logical_or(np.ma.getmask(u_dat), np.ma.getmask(np.roll(u_dat,1,axis=-1))) + u_dat = u_dat.filled(0.) + + # Get and process the v component + v_dat = v_var[tidx,:,:,:] + h_mask = np.logical_or(h_mask,np.ma.getmask(v_dat)) + h_mask = np.logical_or(h_mask,np.ma.getmask(np.roll(v_dat,1,axis=-2))) + v_dat = v_dat.filled(0.) + + # Order of subtraction based on upwind sign convention and desire for w>0 to correspond with upwards velocity + w[tidx,:-1,:,:] += u_dat-np.roll(u_dat,1,axis=-1) + if not wrapx: # If not wrapping, then convergence on westernmost side is simply so add back the rolled value + w[tidx,:-1,:,0] += u_dat[:-1,:,-1] + w[tidx,:-1,:,:] += v_dat-np.roll(v_dat,1,axis=-2) + if not wrapy: # If not wrapping, convergence on westernmost side is -v + w[tidx,:-1,0,:] += -v_dat[:,-1,:] + w[tidx,-1,:,:] = 0. + # Do a double-flip so that we integrate from the bottom + w[tidx,:-1,:,:] = w[tidx,-2::-1,:,:].cumsum(axis=0)[::-1,:,:] + # Mask if any of u[i-1], u[i], v[j-1], v[j] are not masked + w[tidx,:-1,:,:] = np.ma.masked_where(h_mask, w[tidx,:-1,:,:]) + # Bottom should always be zero, mask applied wherever the top interface is a valid value + w[tidx,-1,:,:] = np.ma.masked_where(h_mask[-2,:,:], w[tidx,-1,:,:]) + + return w + +if __name__ == "__main__": + try: import argparse + except: raise Exception('This version of python is not new enough. python 2.7 or newer is required.') + import netCDF4 + + parser = argparse.ArgumentParser(description= + '''Script for calculating vertical velocity from divergence of horizontal mass transports.''') + parser.add_argument('infile', type=str, help='''Daily file containing ssu,ssv.''') + parser.add_argument('--uname', type=str, default='umo', help='''Name of the u-component of mass transport''') + parser.add_argument('--vname', type=str, default='vmo', help='''Name of the v-component of mass transport''') + parser.add_argument('--wrapx', type=bool, default=True, help='''True if the x-component is reentrant''') + parser.add_argument('--wrapy', type=bool, default=False, help='''True if the y-component is reentrant''') + parser.add_argument('--gridspec', type=str, default ='', + help='''File containing variables wet,areacello. Usually the ocean_static.nc from diag_table.''') + parser.add_argument('--plot', type=bool, default=False, help='''Plot w at the 8th interface (kind of random)''') + cmdLineArgs = parser.parse_args() + + # Check for presence of variables + rootGroup = netCDF4.Dataset( cmdLineArgs.infile ) + if cmdLineArgs.uname not in rootGroup.variables: + raise Exception('Could not find "%s" in file "%s"' % (cmdLineArgs.uname, cmdLineArgs.infile)) + if cmdLineArgs.vname not in rootGroup.variables: + raise Exception('Could not find "%s" in file "%s"' % (cmdLineArgs.vname, cmdLineArgs.infile)) + + u_var = netCDF4.Dataset(cmdLineArgs.infile).variables[cmdLineArgs.uname] + v_var = netCDF4.Dataset(cmdLineArgs.infile).variables[cmdLineArgs.vname] + + w = calc_w_from_convergence( cmdLineArgs.infile, cmdLineArgs.gridspec, u_var, v_var, + cmdLineArgs.wrapx, cmdLineArgs.wrapy ) + if len(cmdLineArgs.gridspec) > 0: + area = netCDF4.Dataset(cmdLineArgs.gridspec).variables['areacello'][:,:] + w = w/(area*1035.0) + # Plot if requested + if cmdLineArgs.plot: + import matplotlib.pyplot as plt + plt.pcolormesh(w[0,7,:,:],vmin=-2e-5,vmax=2e-5,cmap=plt.cm.coolwarm) + plt.colorbar() + plt.show() + From a38e9834d035dc7e4cecf42f8e66d277ef8fda72 Mon Sep 17 00:00:00 2001 From: Andrew Shao Date: Thu, 28 Sep 2017 18:52:10 -0400 Subject: [PATCH 46/89] w had the wrong sign because divergence was calculated, not convergence --- tools/analysis/verticalvelocity.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/analysis/verticalvelocity.py b/tools/analysis/verticalvelocity.py index b10f6e44ad..c94cd0b873 100755 --- a/tools/analysis/verticalvelocity.py +++ b/tools/analysis/verticalvelocity.py @@ -25,11 +25,11 @@ def calc_w_from_convergence(infile, gridspec, u_var, v_var, wrapx = True, wrapy v_dat = v_dat.filled(0.) # Order of subtraction based on upwind sign convention and desire for w>0 to correspond with upwards velocity - w[tidx,:-1,:,:] += u_dat-np.roll(u_dat,1,axis=-1) - if not wrapx: # If not wrapping, then convergence on westernmost side is simply so add back the rolled value - w[tidx,:-1,:,0] += u_dat[:-1,:,-1] - w[tidx,:-1,:,:] += v_dat-np.roll(v_dat,1,axis=-2) - if not wrapy: # If not wrapping, convergence on westernmost side is -v + w[tidx,:-1,:,:] += np.roll(u_dat,1,axis=-1)-u_dat + if not wrapx: # If not wrapping, then convergence on westernmost side is simply so subtract back the rolled value + w[tidx,:-1,:,0] += -u_dat[:-1,:,-1] + w[tidx,:-1,:,:] += np.roll(v_dat,1,axis=-2)-v_dat + if not wrapy: # If not wrapping, convergence on westernmost side is v w[tidx,:-1,0,:] += -v_dat[:,-1,:] w[tidx,-1,:,:] = 0. # Do a double-flip so that we integrate from the bottom From 769eb6b208fd1ed3f10ffc2321b115b51304e031 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Sun, 1 Oct 2017 12:28:09 -0400 Subject: [PATCH 47/89] refineDiag script uses basin_codes.nc file - Also temporarily commented out daily variance of zos for testing purposes. --- tools/analysis/MOM6_refineDiag.csh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/analysis/MOM6_refineDiag.csh b/tools/analysis/MOM6_refineDiag.csh index ef3aa4fa79..b4b0ef1f38 100755 --- a/tools/analysis/MOM6_refineDiag.csh +++ b/tools/analysis/MOM6_refineDiag.csh @@ -91,18 +91,24 @@ ls -l set script_dir=${out_dir}/mom6/tools/analysis -echo '==Run some example annual scripts. These are not reviewed by scientists.' +set ocean_static_file = $yr1.ocean_static.nc +if ( -e $yr1.ocean_static_no_mask_table.nc ) set ocean_static_file = $yr1.ocean_static_no_mask_table.nc + +set basin_codes_file = $yr1.basin_codes.nc echo '====annual mean Eddy Kinetic Energy======' mkdir -p $out_dir/refineDiag_ocean_annual/EddyKineticEnergy -set ocean_static_file = $yr1.ocean_static.nc -if ( -e $yr1.ocean_static_no_mask_table.nc ) set ocean_static_file = $yr1.ocean_static_no_mask_table.nc $script_dir/EddyKineticEnergy.py -g $ocean_static_file -o $out_dir/refineDiag_ocean_annual/EddyKineticEnergy/EKE_mean_${yr1}.png -l ${yr1} $yr1.ocean_daily.nc -$script_dir/calc_variance.py zos $yr1.ocean_daily.nc $refineDiagDir/$yr1.ocean_month_refined.nc + +#-- ZOS temporarily commented out for now. This calculation needs to be merged into the +# refinedDiag_ocean_month.py script +#echo '====calculate zos as refineDiag====' +#$script_dir/calc_variance.py zos $yr1.ocean_daily.nc $refineDiagDir/$yr1.ocean_month_refined.nc echo '==== Offline Diagnostics ====' -$script_dir/offline_overturning_z.py -b $ocean_static_file -r refineDiagDir $yr1.ocean_month_z.nc -$script_dir/offline_overturning_rho.py -b $ocean_static_file -r refineDiagDir $yr1.ocean_month_rho2.nc +$script_dir/refineDiag_ocean_month.py -b $basin_codes_file -r refineDiagDir $yr1.ocean_month.nc +$script_dir/refineDiag_ocean_month_z.py -b $basin_codes_file -r refineDiagDir $yr1.ocean_month_z.nc +$script_dir/refineDiag_ocean_month_rho2.py -b $basin_codes_file -r refineDiagDir $yr1.ocean_month_rho2.nc echo " ---------- end yearly analysis ---------- " From 7f0ab79e346729780353548b6600b16f92c8a176 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Mon, 2 Oct 2017 13:32:02 -0400 Subject: [PATCH 48/89] Added hfbasin diagnostic to refineDiag script --- tools/analysis/refineDiag_ocean_month.py | 64 +++++++++++++----------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/tools/analysis/refineDiag_ocean_month.py b/tools/analysis/refineDiag_ocean_month.py index 238b52a01c..247001beb3 100755 --- a/tools/analysis/refineDiag_ocean_month.py +++ b/tools/analysis/refineDiag_ocean_month.py @@ -8,25 +8,9 @@ import sys import matplotlib.pyplot as plt - - ##-- RefineDiag Script for CMIP6 ## -## Variables we intend to provide in z-coordinates: -## -## msftyyz -> vmo (ocean_z) * both 0.25 and 0.5 resolutions -## msftyzmpa -> vhGM (ocean_z) * applies only to 0.5 resolution -## msftyzsmpa -> vhml (ocean_z) * both 0.25 and 0.5 resolutions -## -## -## Variables we intend to provide in rho-coordinates: -## (potenital density referenced to 2000 m) -## -## msftyrho -> vmo -## msftyrhompa -> vhGM * applies only to 0.5 resolution -## -## -## 2-D variables we intent to provide: +## 2-D variables we intend to provide: ## ## hfy -> T_ady_2d + ndiff_tracer_trans_y_2d_T * T_ady_2d needs to be converted to Watts (Cp = 3992.) ## ndiff_tracer_trans_y_2d_T already in Watts @@ -36,13 +20,6 @@ ## hfx -> same recipie as above, expect for x-dimension ## hfbasin -> summed line of hfy in each basin ## -## -## Outstanding issues -## 1.) regirdding of vh, vhGM to rho-corrdinates -## 2.) vhGM and vhML units need to be in kg s-1 -## 2.) save out RHO_0 and Cp somewhere in netCDF files to key off of -## -## ## CMIP variables that will NOT be provided: ## ## hfbasinpmadv, hfbasinpsmadv, hfbasinpmdiff, hfbasinpadv @@ -62,7 +39,20 @@ def run(): args = parser.parse_args() main(args) +def heat_trans_by_basin(x,mask=None): + if mask is not None: + varmask = np.sum(mask,axis=-1) + varmask = np.expand_dims(varmask,0) + varmask = np.where(np.equal(varmask,0.),True,False) + else: + mask = 1. + varmask = False + result = np.ma.sum((x*mask),axis=-1) + result.mask = varmask + return result + def main(args): + nc_misval = 1.e20 #-- Define Regions and their associated masks # Note: The Atlantic should include other smaller bays/seas that are # included in the definition used in meridional_overturning.py @@ -95,8 +85,6 @@ def main(args): print("Warning: diffusive term 'ndiff_tracer_trans_y_2d_T' not found. Check if this experiment is running with neutral diffusion.") diffusive = advective * 0. hfy = advective + diffusive - #hfy[hfy.mask] = 1.e20 - #hfy = np.ma.array(hfy,fill_value=1.e20) hfy.long_name = 'Ocean Heat Y Transport' hfy.units = 'W' hfy.cell_methods = 'yq:point xh:mean time:mean' @@ -111,14 +99,24 @@ def main(args): print("Warning: diffusive term 'ndiff_tracer_trans_x_2d_T' not found. Check if this experiment is running with neutral diffusion.") diffusive = advective * 0. hfx = advective + diffusive - #hfx[hfx.mask] = 1.e20 - #hfx = np.ma.array(hfx,fill_value=1.e20) hfx.long_name = 'Ocean Heat X Transport' hfx.units = 'W' hfx.cell_methods = 'yh:mean xq:point time:mean' hfx.time_avg_info = 'average_T1,average_T2,average_DT' hfx.standard_name = 'ocean_heat_x_transport' + #-- hfbasin + hfbasin = np.ma.ones((len(tax),3,len(yq)))*0. + hfbasin[:,0,:] = heat_trans_by_basin(hfy,mask=atlantic_arctic_mask) + hfbasin[:,1,:] = heat_trans_by_basin(hfy,mask=indo_pacific_mask) + hfbasin[:,2,:] = heat_trans_by_basin(hfy) + hfbasin[hfbasin.mask] = nc_misval + hfbasin = np.ma.array(hfbasin,fill_value=nc_misval) + hfbasin.long_name = 'Northward Ocean Heat Transport' + hfbasin.units = 'W' + hfbasin.cell_methods = 'xh:sum yq:sum basin:mean time:mean' + hfbasin.time_avg_info = 'average_T1,average_T2,average_DT' + hfbasin.standard_name = 'northward_ocean_heat_transport' #-- Read time bounds nv = f_in.variables['nv'] @@ -162,7 +160,6 @@ def main(args): nv_dim = f_out.createDimension('nv', size=len(nv[:])) time_out = f_out.createVariable('time', np.float64, ('time')) - #basin_out = f_out.createVariable('basin', np.int32, ('basin')) yq_out = f_out.createVariable('yq', np.float64, ('yq')) region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) xh_out = f_out.createVariable('xh', np.float64, ('xh')) @@ -174,6 +171,9 @@ def main(args): hfx_out = f_out.createVariable('hfx', np.float32, ('time', 'yq', 'xh'), fill_value=1.e20) hfx_out.missing_value = 1.e20 + hfbasin_out = f_out.createVariable('hfbasin', np.float32, ('time', 'basin', 'yq'), fill_value=1.e20) + hfbasin_out.missing_value = 1.e20 + average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) @@ -189,7 +189,10 @@ def main(args): for k in hfx.__dict__.keys(): if k[0] != '_': hfx_out.setncattr(k,hfx.__dict__[k]) - + + for k in hfbasin.__dict__.keys(): + if k[0] != '_': hfbasin_out.setncattr(k,hfbasin.__dict__[k]) + average_T1_out.setncatts(average_T1.__dict__) average_T2_out.setncatts(average_T2.__dict__) average_DT_out.setncatts(average_DT.__dict__) @@ -202,6 +205,7 @@ def main(args): hfy_out[:] = np.ma.array(hfy[:]) hfx_out[:] = np.ma.array(hfx[:]) + hfbasin_out[:] = np.ma.array(hfbasin[:]) average_T1_out[:] = average_T1[:] average_T2_out[:] = average_T2[:] From 5d039f628a9c78605a5855aefc84a81480d46aaf Mon Sep 17 00:00:00 2001 From: Andrew Shao Date: Tue, 3 Oct 2017 18:19:55 -0400 Subject: [PATCH 49/89] Adds a script to calculate transport in straits The diag table outputs diagnostic along some straits on a daily basis. The CMIP/OMIP requested 'mfo' diagnostic is a timeseries of monthly averaged, summed mass transport across the strait. The included script does this averaging and sums. The script can be extended if additional sections are added. --- tools/analysis/MOM6_refineDiag.csh | 35 ++--- tools/analysis/refineDiag_ocean_month_z.py | 24 +++- tools/analysis/strait_transport_timeseries.py | 124 ++++++++++++++++++ 3 files changed, 163 insertions(+), 20 deletions(-) create mode 100644 tools/analysis/strait_transport_timeseries.py diff --git a/tools/analysis/MOM6_refineDiag.csh b/tools/analysis/MOM6_refineDiag.csh index b4b0ef1f38..bde51f054a 100755 --- a/tools/analysis/MOM6_refineDiag.csh +++ b/tools/analysis/MOM6_refineDiag.csh @@ -2,23 +2,23 @@ #------------------------------------------------------------------------------ # MOM6_refineDiag.csh # -# DESCRIPTION: This is a script that is inteded to drive all the +# DESCRIPTION: This is a script that is inteded to drive all the # pre-postprocessing stages of data manipulations on analysis nodes. -# It is intended to be called by FRE at the "refineDiag" stage +# It is intended to be called by FRE at the "refineDiag" stage # which happens just before the components are post processed by frepp. -# To make this happen a path to the (would be) script should appear -# in the tag of the xmls, e.g., +# To make this happen a path to the (would be) script should appear +# in the tag of the xmls, e.g., # # Note that the above script should exist when frepp is called. -# This could be achieved by cloning the mom6 git repo in the section of the setup block -# in the corresponding the gfdl platfrom. E.g., +# This could be achieved by cloning the mom6 git repo in the section of the setup block +# in the corresponding the gfdl platfrom. E.g., # 0.: + z_i = v_vargroup['z_i'][:] + zidx = np.sum(z_i strait[sidx].zlim: + frac = min(1., (z_i[zidx] - strait[sidx].zlim)/(z_i[zidx]-z_i[zidx-1])) + vmo[:,-1,:] = vmo[:,-1,:]*frac + else: + vmo = v_vargroup['vmo'][:,:,:,:] + strait[sidx].transport += vmo.sum(axis=(1,2,3)) + Dataset(v_file[0]).close() + + if strait[sidx].is_meridional: + strait[sidx].time = u_vargroup['time'][:] + if strait[sidx].zlim > 0.: + z_i = u_vargroup['z_i'][:] + zidx = np.sum(z_i strait[sidx].zlim: + frac = min(1., (z_i[zidx] - strait[sidx].zlim)/(z_i[zidx]-z_i[zidx-1])) + umo[:,-1,:] = umo[:,-1,:]*frac + else: + umo = u_vargroup['umo'][:,:,:,:] + strait[sidx].transport += umo.sum(axis=(1,2,3)) + Dataset(u_file[0]).close() + if monthly_average: + strait[sidx].transport = make_monthly_averages(strait[sidx].transport) + strait[sidx].time = make_monthly_averages(strait[sidx].time) + ntime = strait[sidx].time.size + time = strait[sidx].time + + transport_array = np.zeros((ntime, nstraits)) + for sidx in range(0,nstraits): + transport_array[:,sidx] = strait[sidx].transport + return time, transport_array, strait + +def make_monthly_averages(data): + # This fundamentally assumes that the output is only one year long, any longer and we'd have to know the actual year to properly + # handle leap years + idx = daily_indices(data.size == 366) + idx_r = [range(0,idx[0])] ; + [idx_r.append(range(idx[t-1],idx[t])) for t in range(1,12)] + return np.array([np.mean(data[idx_r[t]]) for t in range(0,12)]) + +def daily_indices(leap = False): + days_in_months = np.array([31, 28, 31, 30, 31, 30, 31, 31, 30 ,31, 30 ,31]) + if leap: # Change number of days in Feb if leapyear + days_in_months[1] = 29 + return days_in_months.cumsum() + + +def set_strait_info(): + + strait = [] + # The standard list of straits from CMIP/OMIP request + strait.append(strait_type("barents_opening", "Barents_opening", is_meridional = True)) + strait.append(strait_type("bering_strait", "Bering_Strait" , is_zonal = True)) + strait.append(strait_type("carribean_windward_passage", "Windward_Passage", is_zonal = True)) + strait.append(strait_type("davis_strait", "Davis_Strait", is_zonal = True)) + strait.append(strait_type("denmark_strait", "Denmark_Strait", is_zonal = True)) + strait.append(strait_type("drake_passage", "Drake_Passage", is_meridional = True)) + strait.append(strait_type("english_channel", "English_Channel", is_meridional = True)) + strait.append(strait_type("faroe_scotland_channel", "Faroe_Scotland", is_meridional = True)) + strait.append(strait_type("florida_bahamas_strait", "Florida_Bahamas", is_zonal = True)) + strait.append(strait_type("fram_strait", "Fram_Strait", is_zonal = True)) + strait.append(strait_type("gibraltar_strait", "Gibraltar_Strait", is_meridional = True)) + strait.append(strait_type("iceland_faroe_channel", "Iceland_Faroe", is_meridional = True, is_zonal = True)) + strait.append(strait_type("mozambique_channel", "Mozambique_Channel", is_zonal = True)) + strait.append(strait_type("pacific_equatorial_undercurrent", "Pacific_undercurrent", is_meridional = True, zlim = 350)) + strait.append(strait_type("taiwan_and_luzon_straits", "Taiwan_Luzon", is_meridional = True)) + strait.append(strait_type("agulhas_section", "Agulhas_section", is_meridional = True)) + strait.append(strait_type("indonesian_throughflow", "Indonesian_Throughflow", is_zonal = True)) + + return strait + +class strait_type: + def __init__(self, cmor_name, mom6_name, is_meridional = False, is_zonal = False, zlim = -1): + self.cmor_name = cmor_name + self.mom6_name = mom6_name + self.is_meridional = is_meridional + self.is_zonal = is_zonal + self.zlim = zlim + self.time = None + self.transport = None + + From 350462b8a6601315fe7166ba7005a3546e79a437 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 4 Oct 2017 08:53:21 -0400 Subject: [PATCH 50/89] Updated coordinates in rho2 refineDiag script --- tools/analysis/refineDiag_ocean_month_rho2.py | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tools/analysis/refineDiag_ocean_month_rho2.py b/tools/analysis/refineDiag_ocean_month_rho2.py index fa5e99c398..f9a0122483 100755 --- a/tools/analysis/refineDiag_ocean_month_rho2.py +++ b/tools/analysis/refineDiag_ocean_month_rho2.py @@ -49,14 +49,14 @@ def main(args): f_in = nc.Dataset(args.infile) #-- Read in existing dimensions from history netcdf file - yh = f_in.variables['yh'] - z_l = f_in.variables['z_l'] - z_i = f_in.variables['z_i'] + yq = f_in.variables['yq'] + rho2_l = f_in.variables['rho2_l'] + rho2_i = f_in.variables['rho2_i'] tax = f_in.variables['time'] #-- msftyrho varname = 'vmo' - msftyrho = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. + msftyrho = np.ma.ones((len(tax),3,len(rho2_i),len(yq)))*0. msftyrho[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyrho[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyrho[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) @@ -64,13 +64,13 @@ def main(args): msftyrho = np.ma.array(msftyrho,fill_value=1.e20) msftyrho.long_name = 'Ocean Y Overturning Mass Streamfunction' msftyrho.units = 'kg s-1' - msftyrho.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' + msftyrho.cell_methods = 'rho2_i:sum yq:sum basin:mean time:mean' msftyrho.time_avg_info = 'average_T1,average_T2,average_DT' msftyrho.standard_name = 'ocean_y_overturning_mass_streamfunction' #-- msftyrhompa varname = 'vhGM' - msftyrhompa = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. + msftyrhompa = np.ma.ones((len(tax),3,len(rho2_i),len(yq)))*0. msftyrhompa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyrhompa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyrhompa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) @@ -78,7 +78,7 @@ def main(args): msftyrhompa = np.ma.array(msftyrhompa,fill_value=1.e20) msftyrhompa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' msftyrhompa.units = 'kg s-1' - msftyrhompa.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' + msftyrhompa.cell_methods = 'rho2_i:sum yq:sum basin:mean time:mean' msftyrhompa.time_avg_info = 'average_T1,average_T2,average_DT' msftyrhompa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ 'mesoscale_advection' @@ -121,22 +121,22 @@ def main(args): time_dim = f_out.createDimension('time', size=None) basin_dim = f_out.createDimension('basin', size=3) strlen_dim = f_out.createDimension('strlen', size=21) - yh_dim = f_out.createDimension('yh', size=len(yh[:])) - z_l_dim = f_out.createDimension('z_l', size=len(z_l[:])) - z_i_dim = f_out.createDimension('z_i', size=len(z_i[:])) + yq_dim = f_out.createDimension('yq', size=len(yq[:])) + rho2_l_dim = f_out.createDimension('rho2_l', size=len(rho2_l[:])) + rho2_i_dim = f_out.createDimension('rho2_i', size=len(rho2_i[:])) nv_dim = f_out.createDimension('nv', size=len(nv[:])) time_out = f_out.createVariable('time', np.float64, ('time')) - yh_out = f_out.createVariable('yh', np.float64, ('yh')) + yq_out = f_out.createVariable('yq', np.float64, ('yq')) region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) - z_l_out = f_out.createVariable('z_l', np.float64, ('z_l')) - z_i_out = f_out.createVariable('z_i', np.float64, ('z_i')) + rho2_l_out = f_out.createVariable('rho2_l', np.float64, ('rho2_l')) + rho2_i_out = f_out.createVariable('rho2_i', np.float64, ('rho2_i')) nv_out = f_out.createVariable('nv', np.float64, ('nv')) - msftyrho_out = f_out.createVariable('msftyrho', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=1.e20) + msftyrho_out = f_out.createVariable('msftyrho', np.float32, ('time', 'basin', 'rho2_i', 'yq'), fill_value=1.e20) msftyrho_out.missing_value = 1.e20 - msftyrhompa_out = f_out.createVariable('msftyrhompa', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=1.e20) + msftyrhompa_out = f_out.createVariable('msftyrhompa', np.float32, ('time', 'basin', 'rho2_i', 'yq'), fill_value=1.e20) msftyrhompa_out.missing_value = 1.e20 average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) @@ -145,9 +145,9 @@ def main(args): time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) time_out.setncatts(tax.__dict__) - yh_out.setncatts(yh.__dict__) - z_l_out.setncatts(z_l.__dict__) - z_i_out.setncatts(z_i.__dict__) + yq_out.setncatts(yq.__dict__) + rho2_l_out.setncatts(rho2_l.__dict__) + rho2_i_out.setncatts(rho2_i.__dict__) nv_out.setncatts(nv.__dict__) for k in msftyrho.__dict__.keys(): @@ -162,9 +162,9 @@ def main(args): time_bnds_out.setncatts(time_bnds.__dict__) time_out[:] = np.array(tax[:]) - yh_out[:] = np.array(yh[:]) - z_l_out[:] = np.array(z_l[:]) - z_i_out[:] = np.array(z_i[:]) + yq_out[:] = np.array(yq[:]) + rho2_l_out[:] = np.array(rho2_l[:]) + rho2_i_out[:] = np.array(rho2_i[:]) nv_out[:] = np.array(nv[:]) msftyrho_out[:] = np.ma.array(msftyrho[:]) From b235c772e955c0d156210e2b30ba37b2618b1eb0 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 4 Oct 2017 10:51:06 -0400 Subject: [PATCH 51/89] Masked Indo-Pacific heat transport below 34S - Southern latititude boudaries different between the Indian and Pacific basins. This shows up as a discontinuity in the Y-ward ocean heat transport when summing the two basins. - Data masked below 34 S and comment added to the 'hfbasin' diagnostic --- tools/analysis/refineDiag_ocean_month.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/analysis/refineDiag_ocean_month.py b/tools/analysis/refineDiag_ocean_month.py index 247001beb3..4c5db85bb4 100755 --- a/tools/analysis/refineDiag_ocean_month.py +++ b/tools/analysis/refineDiag_ocean_month.py @@ -39,7 +39,7 @@ def run(): args = parser.parse_args() main(args) -def heat_trans_by_basin(x,mask=None): +def heat_trans_by_basin(x,mask=None,lat=None,minlat=None): if mask is not None: varmask = np.sum(mask,axis=-1) varmask = np.expand_dims(varmask,0) @@ -49,6 +49,10 @@ def heat_trans_by_basin(x,mask=None): varmask = False result = np.ma.sum((x*mask),axis=-1) result.mask = varmask + if (minlat is not None) and (lat is not None): + if len(lat.shape) == 1: + lat = np.expand_dims(lat,0) + result = np.ma.masked_where(np.less(lat,minlat),result) return result def main(args): @@ -68,7 +72,7 @@ def main(args): indo_pacific_mask = basin_code * 0. indo_pacific_mask[(basin_code==3) | (basin_code==5)] = 1. - + #-- Read model data f_in = nc.Dataset(args.infile) @@ -108,13 +112,14 @@ def main(args): #-- hfbasin hfbasin = np.ma.ones((len(tax),3,len(yq)))*0. hfbasin[:,0,:] = heat_trans_by_basin(hfy,mask=atlantic_arctic_mask) - hfbasin[:,1,:] = heat_trans_by_basin(hfy,mask=indo_pacific_mask) + hfbasin[:,1,:] = heat_trans_by_basin(hfy,mask=indo_pacific_mask,minlat=-34,lat=yq) hfbasin[:,2,:] = heat_trans_by_basin(hfy) hfbasin[hfbasin.mask] = nc_misval hfbasin = np.ma.array(hfbasin,fill_value=nc_misval) hfbasin.long_name = 'Northward Ocean Heat Transport' hfbasin.units = 'W' hfbasin.cell_methods = 'xh:sum yq:sum basin:mean time:mean' + hfbasin.comment = 'Indo-Pacific heat transport begins at 34 S' hfbasin.time_avg_info = 'average_T1,average_T2,average_DT' hfbasin.standard_name = 'northward_ocean_heat_transport' From 6ff7aac8790304ad33a6de4025699c8105aec59f Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 4 Oct 2017 10:56:27 -0400 Subject: [PATCH 52/89] Modified interface to calc_w_from_convergence() - infile and gridspec arguments appear to be unused. - temporarily commented out mfo diagnostic ; failing after merge --- tools/analysis/refineDiag_ocean_month_z.py | 70 +++++++++++++--------- tools/analysis/verticalvelocity.py | 4 +- 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/tools/analysis/refineDiag_ocean_month_z.py b/tools/analysis/refineDiag_ocean_month_z.py index cf54c3fb06..4d2c0b279a 100755 --- a/tools/analysis/refineDiag_ocean_month_z.py +++ b/tools/analysis/refineDiag_ocean_month_z.py @@ -86,13 +86,23 @@ def main(args): #-- Read in existing dimensions from history netcdf file xh = f_in.variables['xh'] yh = f_in.variables['yh'] + yq = f_in.variables['yq'] z_l = f_in.variables['z_l'] z_i = f_in.variables['z_i'] tax = f_in.variables['time'] + #-- Note: based on conversations with @adcroft, the overturning should be reported on the interfaces, z_i. + # Also, the nominal latitude is insufficient for the basin-average fields. Based on the methods in + # meridional_overturning.py, the latitude dimension should be: + # + # y = netCDF4.Dataset(cmdLineArgs.gridspec+'/ocean_hgrid.nc').variables['y'][::2,::2] + # yy = y[1:,:].max(axis=-1)+0*z + # + # The quanity 'yy' above is numerically-equivalent to 'yq' + #-- msftyyz varname = 'vmo' - msftyyz = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. + msftyyz = np.ma.ones((len(tax),3,len(z_i),len(yq)))*0. msftyyz[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyyz[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyyz[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) @@ -100,13 +110,13 @@ def main(args): msftyyz = np.ma.array(msftyyz,fill_value=nc_misval) msftyyz.long_name = 'Ocean Y Overturning Mass Streamfunction' msftyyz.units = 'kg s-1' - msftyyz.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' + msftyyz.cell_methods = 'z_i:sum yq:sum basin:mean time:mean' msftyyz.time_avg_info = 'average_T1,average_T2,average_DT' msftyyz.standard_name = 'ocean_y_overturning_mass_streamfunction' #-- msftyzmpa varname = 'vhGM' - msftyzmpa = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. + msftyzmpa = np.ma.ones((len(tax),3,len(z_i),len(yq)))*0. msftyzmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyzmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyzmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) @@ -114,14 +124,14 @@ def main(args): msftyzmpa = np.ma.array(msftyzmpa,fill_value=nc_misval) msftyzmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' msftyzmpa.units = 'kg s-1' - msftyzmpa.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' + msftyzmpa.cell_methods = 'z_i:sum yq:sum basin:mean time:mean' msftyzmpa.time_avg_info = 'average_T1,average_T2,average_DT' msftyzmpa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ 'mesoscale_advection' #-- msftyzsmpa varname = 'vhml' - msftyzsmpa = np.ma.ones((len(tax),3,len(z_i),len(yh)))*0. + msftyzsmpa = np.ma.ones((len(tax),3,len(z_i),len(yq)))*0. msftyzsmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) msftyzsmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) msftyzsmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) @@ -129,14 +139,14 @@ def main(args): msftyzsmpa = np.ma.array(msftyzsmpa,fill_value=nc_misval) msftyzsmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized submesoscale advection' msftyzsmpa.units = 'kg s-1' - msftyzsmpa.cell_methods = 'z_i:sum yh:sum basin:mean time:mean' + msftyzsmpa.cell_methods = 'z_i:sum yq:sum basin:mean time:mean' msftyzsmpa.time_avg_info = 'average_T1,average_T2,average_DT' msftyzsmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ 'submesoscale_advection' #-- wmo varname = 'wmo' - wmo = calc_w_from_convergence(infile, f_in.variables['umo'], f_in.variables['vmo']) + wmo = calc_w_from_convergence(f_in.variables['umo'], f_in.variables['vmo']) wmo[wmo.mask] = nc_misval wmo = np.ma.array(wmo,fill_value=nc_misval) wmo.long_name = 'Upward mass transport from resolved and parameterized advective transport' @@ -146,15 +156,15 @@ def main(args): wmo.standard_name = 'upward_ocean_mass_transport' #-- mfo - _, mfo, straits = sum_transport_in_straits(args.straitdir, monthly_average = True) - mfo[mfo].mask] = nc_misval - mfo = np.ma.array(mfo, fill_value=nc_misval) - strait_names = np.array( [strait.cmor_name for strait in straits] ) - mfo.long_name = 'Sea Water Transport' - mfo.units = 'kg s-1' - mfo.cell_methods = 'time:mean' - mfo.time_avg_info = 'average_T1,average_T2,average_DT' - mfo.standard_name = 'sea_water_transport_across_line' + #_, mfo, straits = sum_transport_in_straits(args.straitdir, monthly_average = True) + #mfo[mfo].mask = nc_misval + #mfo = np.ma.array(mfo, fill_value=nc_misval) + #strait_names = np.array( [strait.cmor_name for strait in straits] ) + #mfo.long_name = 'Sea Water Transport' + #mfo.units = 'kg s-1' + #mfo.cell_methods = 'time:mean' + #mfo.time_avg_info = 'average_T1,average_T2,average_DT' + #mfo.standard_name = 'sea_water_transport_across_line' #-- Read time bounds nv = f_in.variables['nv'] @@ -192,10 +202,11 @@ def main(args): time_dim = f_out.createDimension('time', size=None) basin_dim = f_out.createDimension('basin', size=3) - strait_dim = f_out.createDimension('strait', size=len(straits)) - strlen_dim = f_out.createDimension('strlen', size=31) + #strait_dim = f_out.createDimension('strait', size=len(straits)) + strlen_dim = f_out.createDimension('strlen', size=21) xh_dim = f_out.createDimension('xh', size=len(xh[:])) yh_dim = f_out.createDimension('yh', size=len(yh[:])) + yq_dim = f_out.createDimension('yq', size=len(yq[:])) z_l_dim = f_out.createDimension('z_l', size=len(z_l[:])) z_i_dim = f_out.createDimension('z_i', size=len(z_i[:])) nv_dim = f_out.createDimension('nv', size=len(nv[:])) @@ -203,26 +214,27 @@ def main(args): time_out = f_out.createVariable('time', np.float64, ('time')) #basin_out = f_out.createVariable('basin', np.int32, ('basin')) yh_out = f_out.createVariable('yh', np.float64, ('yh')) + yq_out = f_out.createVariable('yq', np.float64, ('yq')) region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) - strait_out = f_out.createVariable('strait', 'c', ('strait', 'strlen')) + #strait_out = f_out.createVariable('strait', 'c', ('strait', 'strlen')) z_l_out = f_out.createVariable('z_l', np.float64, ('z_l')) z_i_out = f_out.createVariable('z_i', np.float64, ('z_i')) nv_out = f_out.createVariable('nv', np.float64, ('nv')) - msftyyz_out = f_out.createVariable('msftyyz', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=nc_misval) + msftyyz_out = f_out.createVariable('msftyyz', np.float32, ('time', 'basin', 'z_i', 'yq'), fill_value=nc_misval) msftyyz_out.missing_value = nc_misval - msftyzsmpa_out = f_out.createVariable('msftyzsmpa', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=nc_misval) + msftyzsmpa_out = f_out.createVariable('msftyzsmpa', np.float32, ('time', 'basin', 'z_i', 'yq'), fill_value=nc_misval) msftyzsmpa_out.missing_value = nc_misval - msftyzmpa_out = f_out.createVariable('msftyzmpa', np.float32, ('time', 'basin', 'z_i', 'yh'), fill_value=nc_misval) + msftyzmpa_out = f_out.createVariable('msftyzmpa', np.float32, ('time', 'basin', 'z_i', 'yq'), fill_value=nc_misval) msftyzmpa_out.missing_value = nc_misval wmo_out = f_out.createVariable('wmo', np.float32, ('time', 'z_i', 'yh', 'xh'), fill_value=nc_misval) wmo_out.missing_value = nc_misval - mfo_out = f_out.createVariable('wmo', np.float32, ('time', 'strait'), fill_value=nc_misval) - mfo_out.missing_value = nc_misval + #mfo_out = f_out.createVariable('wmo', np.float32, ('time', 'strait'), fill_value=nc_misval) + #mfo_out.missing_value = nc_misval average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) @@ -230,8 +242,9 @@ def main(args): time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) time_out.setncatts(tax.__dict__) - xh_out.setncatts(xh.__dict__) + #xh_out.setncatts(xh.__dict__) yh_out.setncatts(yh.__dict__) + yq_out.setncatts(yq.__dict__) z_l_out.setncatts(z_l.__dict__) z_i_out.setncatts(z_i.__dict__) nv_out.setncatts(nv.__dict__) @@ -251,8 +264,9 @@ def main(args): time_bnds_out.setncatts(time_bnds.__dict__) time_out[:] = np.array(tax[:]) - xh_out[:] = np.array(xh[:]) + #xh_out[:] = np.array(xh[:]) yh_out[:] = np.array(yh[:]) + yq_out[:] = np.array(yq[:]) z_l_out[:] = np.array(z_l[:]) z_i_out[:] = np.array(z_i[:]) nv_out[:] = np.array(nv[:]) @@ -261,7 +275,7 @@ def main(args): msftyzsmpa_out[:] = np.ma.array(msftyzsmpa[:]) msftyzmpa_out[:] = np.ma.array(msftyzmpa[:]) wmo_out[:] = np.ma.array(wmo[:]) - mfo_out[:] = np.ma.array(mfo[:]) + #mfo_out[:] = np.ma.array(mfo[:]) average_T1_out[:] = average_T1[:] average_T2_out[:] = average_T2[:] @@ -269,7 +283,7 @@ def main(args): time_bnds_out[:] = time_bnds[:] region_out[:] = nc.stringtochar(region) - strait_out[:] = nc.stringtochar(strait_names) + #strait_out[:] = nc.stringtochar(strait_names) f_out.close() exit(0) diff --git a/tools/analysis/verticalvelocity.py b/tools/analysis/verticalvelocity.py index c94cd0b873..451c1c4c07 100755 --- a/tools/analysis/verticalvelocity.py +++ b/tools/analysis/verticalvelocity.py @@ -5,7 +5,7 @@ # Written by Andrew Shao (andrew.shao@noaa.gov) 29 September 2017 import numpy as np -def calc_w_from_convergence(infile, gridspec, u_var, v_var, wrapx = True, wrapy = False): +def calc_w_from_convergence(u_var, v_var, wrapx = True, wrapy = False): tmax = u_var.shape[0] @@ -68,7 +68,7 @@ def calc_w_from_convergence(infile, gridspec, u_var, v_var, wrapx = True, wrapy u_var = netCDF4.Dataset(cmdLineArgs.infile).variables[cmdLineArgs.uname] v_var = netCDF4.Dataset(cmdLineArgs.infile).variables[cmdLineArgs.vname] - w = calc_w_from_convergence( cmdLineArgs.infile, cmdLineArgs.gridspec, u_var, v_var, + w = calc_w_from_convergence( u_var, v_var, cmdLineArgs.wrapx, cmdLineArgs.wrapy ) if len(cmdLineArgs.gridspec) > 0: area = netCDF4.Dataset(cmdLineArgs.gridspec).variables['areacello'][:,:] From 69f35ec016de3554c678039362cc65d2307b912b Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 4 Oct 2017 11:40:51 -0400 Subject: [PATCH 53/89] Updated calc_variance.py - Script now either created the ocean_month_refined.nc file if it does not exist, or it appends variables to the file if does exist. - For CMIP6 runs, recommended that this script be called last in the refineDiag call order for best compatibility --- tools/analysis/MOM6_refineDiag.csh | 8 +-- tools/analysis/calc_variance.py | 102 ++++++++++++++++++++--------- 2 files changed, 76 insertions(+), 34 deletions(-) diff --git a/tools/analysis/MOM6_refineDiag.csh b/tools/analysis/MOM6_refineDiag.csh index bde51f054a..d1fe08d6c4 100755 --- a/tools/analysis/MOM6_refineDiag.csh +++ b/tools/analysis/MOM6_refineDiag.csh @@ -101,15 +101,15 @@ echo '====annual mean Eddy Kinetic Energy======' mkdir -p $out_dir/refineDiag_ocean_annual/EddyKineticEnergy $script_dir/EddyKineticEnergy.py -g $ocean_static_file -o $out_dir/refineDiag_ocean_annual/EddyKineticEnergy/EKE_mean_${yr1}.png -l ${yr1} $yr1.ocean_daily.nc -#-- ZOS temporarily commented out for now. This calculation needs to be merged into the -# refinedDiag_ocean_month.py script -#echo '====calculate zos as refineDiag====' -#$script_dir/calc_variance.py zos $yr1.ocean_daily.nc $refineDiagDir/$yr1.ocean_month_refined.nc echo '==== Offline Diagnostics ====' $script_dir/refineDiag_ocean_month.py -b $basin_codes_file -r refineDiagDir $yr1.ocean_month.nc $script_dir/refineDiag_ocean_month_z.py -b $basin_codes_file -r refineDiagDir -s $straitdir $yr1.ocean_month_z.nc $script_dir/refineDiag_ocean_month_rho2.py -b $basin_codes_file -r refineDiagDir $yr1.ocean_month_rho2.nc +$script_dir/calc_variance.py zos $yr1.ocean_daily.nc $refineDiagDir/$yr1.ocean_month_refined.nc + +#-- Note: the calc_variance script should be called LAST, since it appends to the ocean_month_refined.nc file +# that is created first by the other scripts. echo " ---------- end yearly analysis ---------- " diff --git a/tools/analysis/calc_variance.py b/tools/analysis/calc_variance.py index 1c4d84f46c..378fb6f890 100755 --- a/tools/analysis/calc_variance.py +++ b/tools/analysis/calc_variance.py @@ -2,6 +2,7 @@ import netCDF4 import numpy +import os try: import argparse except: raise Exception('This version of python is not new enough. python 2.7 or newer is required.') @@ -23,7 +24,25 @@ nxy = shape[1:] if args.verbose: print 'Creating',args.annual_file -nc_out = netCDF4.Dataset( args.annual_file, 'w', format='NETCDF3_64BIT' ) +if os.path.exists(args.annual_file): + mode = 'r+' + append = True +else: + mode = 'w' + append = False +nc_out = netCDF4.Dataset( args.annual_file, mode, format='NETCDF3_CLASSIC' ) + +if append is True: + if 'time' in nc_out.variables.keys(): + time_var = 'time' + elif 'Time' in nc_out.variables.keys(): + time_var = 'Time' + else: + nc_out.close() + raise ValueError('Time dimension could not be found in existing file.') + if len(nc_out.variables[time_var][:]) <= 1: + nc_out.close() + raise ValueError('Existing file has only one time value. Assuming this is annual output. Aborting.') if nt==365: days_in_month = [31,28,31,30,31,30,31,31,30,31,30,31] elif nt==366: days_in_month = [31,29,31,30,31,30,31,31,30,31,30,31] @@ -32,12 +51,15 @@ # Create dimensions for d in variable.dimensions: - if nc_in.dimensions[d].isunlimited(): nc_out.createDimension(d, None) - else: nc_out.createDimension(d, len(nc_in.dimensions[d])) + if d not in nc_out.dimensions: + if nc_in.dimensions[d].isunlimited(): nc_out.createDimension(d, None) + else: nc_out.createDimension(d, len(nc_in.dimensions[d])) # Copy global attributes -for a in nc_in.ncattrs(): - nc_out.__setattr__(a ,nc_in.__getattr__(a)) +if append is False: + for a in nc_in.ncattrs(): + if a not in nc_out.dimensions: + nc_out.__setattr__(a ,nc_in.__getattr__(a)) # Copy variables corresponding to dimensions used by variable copy_vars = list(variable.dimensions) @@ -46,31 +68,50 @@ else: time_bounds_vars = [] for v in copy_vars+time_bounds_vars: if v in nc_in.variables: - hv = nc_out.createVariable(v, nc_in.variables[v].dtype, nc_in.variables[v].dimensions) - for a in nc_in.variables[v].ncattrs(): - hv.setncattr(a, nc_in.variables[v].__getattr__(a)) + if v not in nc_out.variables: + hv = nc_out.createVariable(v, nc_in.variables[v].dtype, nc_in.variables[v].dimensions) + for a in nc_in.variables[v].ncattrs(): + hv.setncattr(a, nc_in.variables[v].__getattr__(a)) + if v in variable.dimensions: + if not nc_in.dimensions[v].isunlimited(): + hv[:] = nc_in.variables[v][:] + print(str(v)) if v in variable.dimensions: - if not nc_in.dimensions[v].isunlimited(): - hv[:] = nc_in.variables[v][:] - else: + if nc_in.dimensions[v].isunlimited(): intime = nc_in.variables[v] - time = hv # Keep around for later + time = intime[:] # Keep around for later # Create new variables -new_mean = nc_out.createVariable(args.variable, variable.dtype, variable.dimensions) -new_squared = nc_out.createVariable(args.variable+'_squared', variable.dtype, variable.dimensions) -new_variance = nc_out.createVariable(args.variable+'_var', variable.dtype, variable.dimensions) +if args.variable not in nc_out.variables: + new_mean = nc_out.createVariable(args.variable, variable.dtype, variable.dimensions) + do_mean = True +else: + do_mean = False + +if args.variable+'_squared' not in nc_out.variables: + new_squared = nc_out.createVariable(args.variable+'_squared', variable.dtype, variable.dimensions) + do_squared = True +else: + do_squared = False + +if args.variable+'_var' not in nc_out.variables: + new_variance = nc_out.createVariable(args.variable+'_var', variable.dtype, variable.dimensions) + do_variance = True +else: + do_variance = False + + for a in variable.ncattrs(): - new_mean.setncattr(a, variable.__getattr__(a)) + if do_mean: new_mean.setncattr(a, variable.__getattr__(a)) if a == 'long_name': - new_squared.setncattr(a, 'Square of '+variable.__getattr__(a)) - new_variance.setncattr(a, 'Variance of '+variable.__getattr__(a)) + if do_squared: new_squared.setncattr(a, 'Square of '+variable.__getattr__(a)) + if do_variance: new_variance.setncattr(a, 'Variance of '+variable.__getattr__(a)) elif a == 'units': - new_squared.setncattr(a, '('+variable.__getattr__(a)+')^2') - new_variance.setncattr(a, '('+variable.__getattr__(a)+')^2') + if do_squared: new_squared.setncattr(a, '('+variable.__getattr__(a)+')^2') + if do_variance: new_variance.setncattr(a, '('+variable.__getattr__(a)+')^2') else: - new_squared.setncattr(a, variable.__getattr__(a)) - new_variance.setncattr(a, variable.__getattr__(a)) + if do_squared: new_squared.setncattr(a, variable.__getattr__(a)) + if do_variance: new_variance.setncattr(a, variable.__getattr__(a)) numpy.seterr(divide='ignore', invalid='ignore', over='ignore') # To avoid warnings record = -1 @@ -97,14 +138,15 @@ count += 1. mean_val = mean_val/count squared_val = squared_val/count - new_mean[month,:] = mean_val - new_squared[month,:] = squared_val - new_variance[month,:] = squared_val - mean_val**2 - time[month] = time_val/count - if len(time_bounds_vars): - nc_out.variables[time_bounds_vars[0]][month] = b0 - nc_out.variables[time_bounds_vars[1]][month] = b1 - nc_out.variables[time_bounds_vars[2]][month] = count + if do_mean: new_mean[month,:] = mean_val + if do_squared: new_squared[month,:] = squared_val + if do_variance: new_variance[month,:] = squared_val - mean_val**2 + if append is False: + time[month] = time_val/count + if len(time_bounds_vars): + nc_out.variables[time_bounds_vars[0]][month] = b0 + nc_out.variables[time_bounds_vars[1]][month] = b1 + nc_out.variables[time_bounds_vars[2]][month] = count nc_out.close() nc_in.close() From c7c337503ebc98feb0aea508fd2670f40440975c Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 4 Oct 2017 08:07:42 -0400 Subject: [PATCH 54/89] Updated diag table for transport diags - T_ady_2d and T_adx_2d now in ocean_month output stream (needed for CMIP6) - Added umo to ocean_month output stream --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index 97cadbd276..19be1c24a7 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -162,7 +162,7 @@ "ocean_model_z","vo", "vo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vo", "vo", "ocean_month", "all", "mean", "none",2 #"ocean_model", "umo", "umo", "ocean_annual", "all", "mean", "none",2 - "ocean_model_z","umo", "umo", "ocean_annual_z", "all", "mean", "none",2 + "ocean_model_z","umo", "umo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model_z","umo", "umo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vmo", "vmo", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","vmo", "vmo", "ocean_annual_z", "all", "mean", "none",2 @@ -185,16 +185,16 @@ "ocean_model_z","vh", "vh", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","T_adx", "T_adx", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","T_ady", "T_ady", "ocean_annual_z", "all", "mean", "none",2 - "ocean_model", "T_adx_2d", "T_adx_2d", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "T_ady_2d", "T_ady_2d", "ocean_annual", "all", "mean", "none",2 + "ocean_model", "T_adx_2d", "T_adx_2d", "ocean_month", "all", "mean", "none",2 + "ocean_model", "T_ady_2d", "T_ady_2d", "ocean_month", "all", "mean", "none",2 "ocean_model_z","S_adx", "S_adx", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","S_ady", "S_ady", "ocean_annual_z", "all", "mean", "none",2 - "ocean_model", "S_adx_2d", "S_adx_2d", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "S_ady_2d", "S_ady_2d", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "ndiff_tracer_trans_x_2d_T","ndiff_tracer_trans_x_2d_T", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "ndiff_tracer_trans_y_2d_T","ndiff_tracer_trans_y_2d_T", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "ndiff_tracer_trans_x_2d_S","ndiff_tracer_trans_x_2d_S", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "ndiff_tracer_trans_y_2d_S","ndiff_tracer_trans_y_2d_S", "ocean_annual", "all", "mean", "none",2 + "ocean_model", "S_adx_2d", "S_adx_2d", "ocean_month", "all", "mean", "none",2 + "ocean_model", "S_ady_2d", "S_ady_2d", "ocean_month", "all", "mean", "none",2 + "ocean_model", "ndiff_tracer_trans_x_2d_T","ndiff_tracer_trans_x_2d_T", "ocean_month", "all", "mean", "none",2 + "ocean_model", "ndiff_tracer_trans_y_2d_T","ndiff_tracer_trans_y_2d_T", "ocean_month", "all", "mean", "none",2 + "ocean_model", "ndiff_tracer_trans_x_2d_S","ndiff_tracer_trans_x_2d_S", "ocean_month", "all", "mean", "none",2 + "ocean_model", "ndiff_tracer_trans_y_2d_S","ndiff_tracer_trans_y_2d_S", "ocean_month", "all", "mean", "none",2 # Density space diagnostics (not necessarily using CMIP names but needed to generate CMIP output in post-processing) "ocean_model_rho2","umo", "umo", "ocean_annual_rho2", "all", "mean", "none",2 From f4c5c9525940ab457904cf7d35b5057157ce0554 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 4 Oct 2017 14:45:10 -0400 Subject: [PATCH 55/89] Added thkcello/volcello for rho2 output --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index 19be1c24a7..f2600e12f6 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -71,6 +71,8 @@ # Generally save annuals, and sometimes monthly and daily. "ocean_model_z", "volcello", "volcello", "ocean_annual_z", "all", "mean", "none",2 # Cell measure for 3d data "ocean_model_z", "volcello", "volcello", "ocean_month_z", "all", "mean", "none",2 # Cell measure for 3d data + "ocean_model_rho2", "volcello", "volcello", "ocean_annual_rho2", "all", "mean", "none",2 # Cell measure for 3d data + "ocean_model_rho2", "volcello", "volcello", "ocean_month_rho2", "all", "mean", "none",2 # Cell measure for 3d data "ocean_model", "volcello", "volcello", "ocean_annual", "all", "mean", "none",2 # Cell measure for 3d data #"ocean_model", "volcello", "volcello", "ocean_month", "all", "mean", "none",2 # Cell measure for 3d data "ocean_model", "pbo", "pbo", "ocean_annual", "all", "mean", "none",2 @@ -82,6 +84,8 @@ "ocean_model", "masso", "masso", "ocean_scalar_month", "all", "mean", "none",2 # global sum masscello "ocean_model", "masso", "masso", "ocean_scalar_annual", "all", "mean", "none",2 # global sum masscello "ocean_model", "thkcello", "thkcello", "ocean_annual", "all", "mean", "none",2 # Only needed in native space a static field needs to be provided for CMIP6 + "ocean_model_rho2", "thkcello", "thkcello", "ocean_annual_rho2", "all", "mean", "none",2 # Only needed in native space a static field needs to be provided for CMIP6 + "ocean_model_rho2", "thkcello", "thkcello", "ocean_month_rho2", "all", "mean", "none",2 # Only needed in native space a static field needs to be provided for CMIP6 #"ocean_model", "thkcello", "thkcello", "ocean_month", "all", "mean", "none",2 "ocean_model", "volo", "volo", "ocean_scalar_month", "all", "mean", "none",2 # global sum thkcello "ocean_model", "volo", "volo", "ocean_scalar_annual", "all", "mean", "none",2 # global sum thkcello From ab64e2aa8828a95b8517e3129b9ebe0329931c1a Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 4 Oct 2017 15:16:24 -0400 Subject: [PATCH 56/89] Various fixes for mfo (straits) diagnostic - Added 'runpath' to filenames in strait_transport_timeseries.py - Added additional strlen2 dimension - Added netCDF attributes for mfo and wmo diagnostics - Cast mfo as np.array before posting (netCDF4 Python did not like 0-D mask attributes) --- tools/analysis/refineDiag_ocean_month_z.py | 49 +++++++++++-------- tools/analysis/strait_transport_timeseries.py | 12 ++--- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/tools/analysis/refineDiag_ocean_month_z.py b/tools/analysis/refineDiag_ocean_month_z.py index 4d2c0b279a..e4b5496aba 100755 --- a/tools/analysis/refineDiag_ocean_month_z.py +++ b/tools/analysis/refineDiag_ocean_month_z.py @@ -156,15 +156,15 @@ def main(args): wmo.standard_name = 'upward_ocean_mass_transport' #-- mfo - #_, mfo, straits = sum_transport_in_straits(args.straitdir, monthly_average = True) - #mfo[mfo].mask = nc_misval - #mfo = np.ma.array(mfo, fill_value=nc_misval) - #strait_names = np.array( [strait.cmor_name for strait in straits] ) - #mfo.long_name = 'Sea Water Transport' - #mfo.units = 'kg s-1' - #mfo.cell_methods = 'time:mean' - #mfo.time_avg_info = 'average_T1,average_T2,average_DT' - #mfo.standard_name = 'sea_water_transport_across_line' + _, mfo, straits = sum_transport_in_straits(args.straitdir, monthly_average = True) + #mfo[mfo.mask] = nc_misval + mfo = np.ma.array(mfo, fill_value=nc_misval) + strait_names = np.array( [strait.cmor_name for strait in straits] ) + mfo.long_name = 'Sea Water Transport' + mfo.units = 'kg s-1' + mfo.cell_methods = 'time:mean' + mfo.time_avg_info = 'average_T1,average_T2,average_DT' + mfo.standard_name = 'sea_water_transport_across_line' #-- Read time bounds nv = f_in.variables['nv'] @@ -202,8 +202,9 @@ def main(args): time_dim = f_out.createDimension('time', size=None) basin_dim = f_out.createDimension('basin', size=3) - #strait_dim = f_out.createDimension('strait', size=len(straits)) - strlen_dim = f_out.createDimension('strlen', size=21) + strait_dim = f_out.createDimension('strait', size=len(straits)) + strlen1_dim = f_out.createDimension('strlen1', size=21) + strlen2_dim = f_out.createDimension('strlen2', size=31) xh_dim = f_out.createDimension('xh', size=len(xh[:])) yh_dim = f_out.createDimension('yh', size=len(yh[:])) yq_dim = f_out.createDimension('yq', size=len(yq[:])) @@ -212,11 +213,11 @@ def main(args): nv_dim = f_out.createDimension('nv', size=len(nv[:])) time_out = f_out.createVariable('time', np.float64, ('time')) - #basin_out = f_out.createVariable('basin', np.int32, ('basin')) + xh_out = f_out.createVariable('xh', np.float64, ('xh')) yh_out = f_out.createVariable('yh', np.float64, ('yh')) yq_out = f_out.createVariable('yq', np.float64, ('yq')) - region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) - #strait_out = f_out.createVariable('strait', 'c', ('strait', 'strlen')) + region_out = f_out.createVariable('region', 'c', ('basin', 'strlen1')) + strait_out = f_out.createVariable('strait', 'c', ('strait', 'strlen2')) z_l_out = f_out.createVariable('z_l', np.float64, ('z_l')) z_i_out = f_out.createVariable('z_i', np.float64, ('z_i')) nv_out = f_out.createVariable('nv', np.float64, ('nv')) @@ -233,8 +234,8 @@ def main(args): wmo_out = f_out.createVariable('wmo', np.float32, ('time', 'z_i', 'yh', 'xh'), fill_value=nc_misval) wmo_out.missing_value = nc_misval - #mfo_out = f_out.createVariable('wmo', np.float32, ('time', 'strait'), fill_value=nc_misval) - #mfo_out.missing_value = nc_misval + mfo_out = f_out.createVariable('mfo', np.float32, ('time', 'strait'), fill_value=nc_misval) + mfo_out.missing_value = nc_misval average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) @@ -242,7 +243,7 @@ def main(args): time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) time_out.setncatts(tax.__dict__) - #xh_out.setncatts(xh.__dict__) + xh_out.setncatts(xh.__dict__) yh_out.setncatts(yh.__dict__) yq_out.setncatts(yq.__dict__) z_l_out.setncatts(z_l.__dict__) @@ -258,13 +259,19 @@ def main(args): for k in msftyzmpa.__dict__.keys(): if k[0] != '_': msftyzmpa_out.setncattr(k,msftyzmpa.__dict__[k]) + for k in mfo.__dict__.keys(): + if k[0] != '_': mfo_out.setncattr(k,mfo.__dict__[k]) + + for k in wmo.__dict__.keys(): + if k[0] != '_': wmo_out.setncattr(k,wmo.__dict__[k]) + average_T1_out.setncatts(average_T1.__dict__) average_T2_out.setncatts(average_T2.__dict__) average_DT_out.setncatts(average_DT.__dict__) time_bnds_out.setncatts(time_bnds.__dict__) time_out[:] = np.array(tax[:]) - #xh_out[:] = np.array(xh[:]) + xh_out[:] = np.array(xh[:]) yh_out[:] = np.array(yh[:]) yq_out[:] = np.array(yq[:]) z_l_out[:] = np.array(z_l[:]) @@ -275,15 +282,17 @@ def main(args): msftyzsmpa_out[:] = np.ma.array(msftyzsmpa[:]) msftyzmpa_out[:] = np.ma.array(msftyzmpa[:]) wmo_out[:] = np.ma.array(wmo[:]) - #mfo_out[:] = np.ma.array(mfo[:]) + mfo_out[:] = np.array(mfo[:]) average_T1_out[:] = average_T1[:] average_T2_out[:] = average_T2[:] average_DT_out[:] = average_DT[:] time_bnds_out[:] = time_bnds[:] + print(region.shape) + print(strait_names.shape) region_out[:] = nc.stringtochar(region) - #strait_out[:] = nc.stringtochar(strait_names) + strait_out[:] = nc.stringtochar(strait_names) f_out.close() exit(0) diff --git a/tools/analysis/strait_transport_timeseries.py b/tools/analysis/strait_transport_timeseries.py index 9117164f42..1fe65698c9 100644 --- a/tools/analysis/strait_transport_timeseries.py +++ b/tools/analysis/strait_transport_timeseries.py @@ -19,20 +19,20 @@ def sum_transport_in_straits(runpath, monthly_average = False): if (len(u_file)==0 and len(v_file)==0): print("Warning: File not found for %s" % strait[sidx].mom6_name) continue - u_vargroup = Dataset(u_file[0]).variables - v_vargroup = Dataset(v_file[0]).variables + u_vargroup = Dataset(runpath+'/'+u_file[0]).variables + v_vargroup = Dataset(runpath+'/'+v_file[0]).variables elif strait[sidx].is_zonal: v_file = fn_filter(listdir(runpath), '*' + strait[sidx].mom6_name + '*.nc') if (len(v_file)==0): print("Warning: File not found for %s" % strait[sidx].mom6_name) continue - v_vargroup = Dataset(v_file[0]).variables + v_vargroup = Dataset(runpath+'/'+v_file[0]).variables elif strait[sidx].is_meridional: u_file = fn_filter(listdir(runpath), '*' + strait[sidx].mom6_name + '*.nc') if (len(u_file)==0): print("Warning: File not found for %s" % strait[sidx].mom6_name) continue - u_vargroup = Dataset(u_file[0]).variables + u_vargroup = Dataset(runpath+'/'+u_file[0]).variables # Need to find the first interface deeper than or equal to the requested z-limit. If deeper, then we'll need to scale the # bottommost part of the column @@ -47,7 +47,7 @@ def sum_transport_in_straits(runpath, monthly_average = False): else: vmo = v_vargroup['vmo'][:,:,:,:] strait[sidx].transport += vmo.sum(axis=(1,2,3)) - Dataset(v_file[0]).close() + Dataset(runpath+'/'+v_file[0]).close() if strait[sidx].is_meridional: strait[sidx].time = u_vargroup['time'][:] @@ -60,7 +60,7 @@ def sum_transport_in_straits(runpath, monthly_average = False): else: umo = u_vargroup['umo'][:,:,:,:] strait[sidx].transport += umo.sum(axis=(1,2,3)) - Dataset(u_file[0]).close() + Dataset(runpath+'/'+u_file[0]).close() if monthly_average: strait[sidx].transport = make_monthly_averages(strait[sidx].transport) strait[sidx].time = make_monthly_averages(strait[sidx].time) From 29c2b13c52c174d6301fb567244f33d3aa5e8b02 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 4 Oct 2017 19:06:31 -0400 Subject: [PATCH 57/89] Flexible mask tiling based on time dimension --- tools/analysis/refineDiag_ocean_month.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/analysis/refineDiag_ocean_month.py b/tools/analysis/refineDiag_ocean_month.py index 4c5db85bb4..9824a0bb06 100755 --- a/tools/analysis/refineDiag_ocean_month.py +++ b/tools/analysis/refineDiag_ocean_month.py @@ -51,7 +51,8 @@ def heat_trans_by_basin(x,mask=None,lat=None,minlat=None): result.mask = varmask if (minlat is not None) and (lat is not None): if len(lat.shape) == 1: - lat = np.expand_dims(lat,0) + lat = np.tile(lat,0) + lat = np.tile(lat,(len(x),1)) result = np.ma.masked_where(np.less(lat,minlat),result) return result From 8fad2c95d149dff7a1bad02d84f273827b92c73e Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 4 Oct 2017 19:07:22 -0400 Subject: [PATCH 58/89] Miscellaneous clean-ups from testing - removed print statements used in debugging - added '-s' option to MOM6_refineDiag.csh - collpased back to single strlen dimension in refineDiag_ocean_month_z.py --- tools/analysis/MOM6_refineDiag.csh | 2 +- tools/analysis/calc_variance.py | 1 - tools/analysis/refineDiag_ocean_month_z.py | 11 ++++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/analysis/MOM6_refineDiag.csh b/tools/analysis/MOM6_refineDiag.csh index d1fe08d6c4..2a712825b1 100755 --- a/tools/analysis/MOM6_refineDiag.csh +++ b/tools/analysis/MOM6_refineDiag.csh @@ -104,7 +104,7 @@ $script_dir/EddyKineticEnergy.py -g $ocean_static_file -o $out_dir/refineDiag_o echo '==== Offline Diagnostics ====' $script_dir/refineDiag_ocean_month.py -b $basin_codes_file -r refineDiagDir $yr1.ocean_month.nc -$script_dir/refineDiag_ocean_month_z.py -b $basin_codes_file -r refineDiagDir -s $straitdir $yr1.ocean_month_z.nc +$script_dir/refineDiag_ocean_month_z.py -b $basin_codes_file -r refineDiagDir -s ./ $yr1.ocean_month_z.nc $script_dir/refineDiag_ocean_month_rho2.py -b $basin_codes_file -r refineDiagDir $yr1.ocean_month_rho2.nc $script_dir/calc_variance.py zos $yr1.ocean_daily.nc $refineDiagDir/$yr1.ocean_month_refined.nc diff --git a/tools/analysis/calc_variance.py b/tools/analysis/calc_variance.py index 378fb6f890..5f8084c8d4 100755 --- a/tools/analysis/calc_variance.py +++ b/tools/analysis/calc_variance.py @@ -75,7 +75,6 @@ if v in variable.dimensions: if not nc_in.dimensions[v].isunlimited(): hv[:] = nc_in.variables[v][:] - print(str(v)) if v in variable.dimensions: if nc_in.dimensions[v].isunlimited(): intime = nc_in.variables[v] diff --git a/tools/analysis/refineDiag_ocean_month_z.py b/tools/analysis/refineDiag_ocean_month_z.py index e4b5496aba..ab481ff9c0 100755 --- a/tools/analysis/refineDiag_ocean_month_z.py +++ b/tools/analysis/refineDiag_ocean_month_z.py @@ -68,7 +68,7 @@ def main(args): # Note: The Atlantic should include other smaller bays/seas that are # included in the definition used in meridional_overturning.py - region = np.array(['atlantic_arctic_ocean','indian_pacific_ocean','global_ocean']) + region = np.array(['atlantic_arctic_ocean ','indian_pacific_ocean','global_ocean']) #-- Read basin masks f_basin = nc.Dataset(args.basinfile) @@ -203,8 +203,7 @@ def main(args): time_dim = f_out.createDimension('time', size=None) basin_dim = f_out.createDimension('basin', size=3) strait_dim = f_out.createDimension('strait', size=len(straits)) - strlen1_dim = f_out.createDimension('strlen1', size=21) - strlen2_dim = f_out.createDimension('strlen2', size=31) + strlen_dim = f_out.createDimension('strlen', size=31) xh_dim = f_out.createDimension('xh', size=len(xh[:])) yh_dim = f_out.createDimension('yh', size=len(yh[:])) yq_dim = f_out.createDimension('yq', size=len(yq[:])) @@ -216,8 +215,8 @@ def main(args): xh_out = f_out.createVariable('xh', np.float64, ('xh')) yh_out = f_out.createVariable('yh', np.float64, ('yh')) yq_out = f_out.createVariable('yq', np.float64, ('yq')) - region_out = f_out.createVariable('region', 'c', ('basin', 'strlen1')) - strait_out = f_out.createVariable('strait', 'c', ('strait', 'strlen2')) + region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) + strait_out = f_out.createVariable('strait', 'c', ('strait', 'strlen')) z_l_out = f_out.createVariable('z_l', np.float64, ('z_l')) z_i_out = f_out.createVariable('z_i', np.float64, ('z_i')) nv_out = f_out.createVariable('nv', np.float64, ('nv')) @@ -289,8 +288,6 @@ def main(args): average_DT_out[:] = average_DT[:] time_bnds_out[:] = time_bnds[:] - print(region.shape) - print(strait_names.shape) region_out[:] = nc.stringtochar(region) strait_out[:] = nc.stringtochar(strait_names) f_out.close() From b1c65de249675e6f261154d2d0ee0516781dd669 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Thu, 5 Oct 2017 12:09:31 -0400 Subject: [PATCH 59/89] Updated umo in diag_table - Now in both the monthly and annual streams --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index f2600e12f6..bc14e146c2 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -166,8 +166,8 @@ "ocean_model_z","vo", "vo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vo", "vo", "ocean_month", "all", "mean", "none",2 #"ocean_model", "umo", "umo", "ocean_annual", "all", "mean", "none",2 - "ocean_model_z","umo", "umo", "ocean_month_z", "all", "mean", "none",2 -#"ocean_model_z","umo", "umo", "ocean_month_z", "all", "mean", "none",2 + "ocean_model_z","umo", "umo", "ocean_annual_z", "all", "mean", "none",2 + "ocean_model_z","umo", "umo", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vmo", "vmo", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","vmo", "vmo", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","vmo", "vmo", "ocean_month_z", "all", "mean", "none",2 From 9d4536ae48bd14cb5ca3cc9ebc0e8ef8d7470b12 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Thu, 5 Oct 2017 13:10:11 -0400 Subject: [PATCH 60/89] Updated cell_methods attrs. for refined diags --- tools/analysis/refineDiag_ocean_month.py | 2 +- tools/analysis/refineDiag_ocean_month_rho2.py | 4 ++-- tools/analysis/refineDiag_ocean_month_z.py | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/analysis/refineDiag_ocean_month.py b/tools/analysis/refineDiag_ocean_month.py index 9824a0bb06..257bbf3a8d 100755 --- a/tools/analysis/refineDiag_ocean_month.py +++ b/tools/analysis/refineDiag_ocean_month.py @@ -119,7 +119,7 @@ def main(args): hfbasin = np.ma.array(hfbasin,fill_value=nc_misval) hfbasin.long_name = 'Northward Ocean Heat Transport' hfbasin.units = 'W' - hfbasin.cell_methods = 'xh:sum yq:sum basin:mean time:mean' + hfbasin.cell_methods = 'yq:sum time:mean' hfbasin.comment = 'Indo-Pacific heat transport begins at 34 S' hfbasin.time_avg_info = 'average_T1,average_T2,average_DT' hfbasin.standard_name = 'northward_ocean_heat_transport' diff --git a/tools/analysis/refineDiag_ocean_month_rho2.py b/tools/analysis/refineDiag_ocean_month_rho2.py index f9a0122483..23800f70cf 100755 --- a/tools/analysis/refineDiag_ocean_month_rho2.py +++ b/tools/analysis/refineDiag_ocean_month_rho2.py @@ -64,7 +64,7 @@ def main(args): msftyrho = np.ma.array(msftyrho,fill_value=1.e20) msftyrho.long_name = 'Ocean Y Overturning Mass Streamfunction' msftyrho.units = 'kg s-1' - msftyrho.cell_methods = 'rho2_i:sum yq:sum basin:mean time:mean' + msftyrho.cell_methods = 'rho2_i:sum yq:sum time:mean' msftyrho.time_avg_info = 'average_T1,average_T2,average_DT' msftyrho.standard_name = 'ocean_y_overturning_mass_streamfunction' @@ -78,7 +78,7 @@ def main(args): msftyrhompa = np.ma.array(msftyrhompa,fill_value=1.e20) msftyrhompa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' msftyrhompa.units = 'kg s-1' - msftyrhompa.cell_methods = 'rho2_i:sum yq:sum basin:mean time:mean' + msftyrhompa.cell_methods = 'rho2_i:sum yq:sum time:mean' msftyrhompa.time_avg_info = 'average_T1,average_T2,average_DT' msftyrhompa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ 'mesoscale_advection' diff --git a/tools/analysis/refineDiag_ocean_month_z.py b/tools/analysis/refineDiag_ocean_month_z.py index ab481ff9c0..217fdc5583 100755 --- a/tools/analysis/refineDiag_ocean_month_z.py +++ b/tools/analysis/refineDiag_ocean_month_z.py @@ -110,7 +110,7 @@ def main(args): msftyyz = np.ma.array(msftyyz,fill_value=nc_misval) msftyyz.long_name = 'Ocean Y Overturning Mass Streamfunction' msftyyz.units = 'kg s-1' - msftyyz.cell_methods = 'z_i:sum yq:sum basin:mean time:mean' + msftyyz.cell_methods = 'z_i:sum yq:sum time:mean' msftyyz.time_avg_info = 'average_T1,average_T2,average_DT' msftyyz.standard_name = 'ocean_y_overturning_mass_streamfunction' @@ -124,7 +124,7 @@ def main(args): msftyzmpa = np.ma.array(msftyzmpa,fill_value=nc_misval) msftyzmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' msftyzmpa.units = 'kg s-1' - msftyzmpa.cell_methods = 'z_i:sum yq:sum basin:mean time:mean' + msftyzmpa.cell_methods = 'z_i:sum yq:sum time:mean' msftyzmpa.time_avg_info = 'average_T1,average_T2,average_DT' msftyzmpa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ 'mesoscale_advection' @@ -139,7 +139,7 @@ def main(args): msftyzsmpa = np.ma.array(msftyzsmpa,fill_value=nc_misval) msftyzsmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized submesoscale advection' msftyzsmpa.units = 'kg s-1' - msftyzsmpa.cell_methods = 'z_i:sum yq:sum basin:mean time:mean' + msftyzsmpa.cell_methods = 'z_i:sum yq:sum time:mean' msftyzsmpa.time_avg_info = 'average_T1,average_T2,average_DT' msftyzsmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ 'submesoscale_advection' From 1ebf336b6ea55d43ebd6710aee34d37150057f90 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Thu, 5 Oct 2017 13:11:07 -0400 Subject: [PATCH 61/89] Removed call to calc_varaince.py - Removed call to calc_variance.py from MOM6_refineDiag.csh - 'zos' and 'zos_squared' ('zossq') are now in the diag_table. --- tools/analysis/MOM6_refineDiag.csh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/analysis/MOM6_refineDiag.csh b/tools/analysis/MOM6_refineDiag.csh index 2a712825b1..5b2fa068b5 100755 --- a/tools/analysis/MOM6_refineDiag.csh +++ b/tools/analysis/MOM6_refineDiag.csh @@ -95,7 +95,6 @@ set ocean_static_file = $yr1.ocean_static.nc if ( -e $yr1.ocean_static_no_mask_table.nc ) set ocean_static_file = $yr1.ocean_static_no_mask_table.nc set basin_codes_file = $yr1.basin_codes.nc -set strait_dir = "./" echo '====annual mean Eddy Kinetic Energy======' mkdir -p $out_dir/refineDiag_ocean_annual/EddyKineticEnergy @@ -103,13 +102,15 @@ $script_dir/EddyKineticEnergy.py -g $ocean_static_file -o $out_dir/refineDiag_o echo '==== Offline Diagnostics ====' -$script_dir/refineDiag_ocean_month.py -b $basin_codes_file -r refineDiagDir $yr1.ocean_month.nc -$script_dir/refineDiag_ocean_month_z.py -b $basin_codes_file -r refineDiagDir -s ./ $yr1.ocean_month_z.nc -$script_dir/refineDiag_ocean_month_rho2.py -b $basin_codes_file -r refineDiagDir $yr1.ocean_month_rho2.nc -$script_dir/calc_variance.py zos $yr1.ocean_daily.nc $refineDiagDir/$yr1.ocean_month_refined.nc +$script_dir/refineDiag_ocean_month.py -b $basin_codes_file -r $refineDiagDir $yr1.ocean_month.nc +$script_dir/refineDiag_ocean_month_z.py -b $basin_codes_file -r $refineDiagDir -s ./ $yr1.ocean_month_z.nc +$script_dir/refineDiag_ocean_month_rho2.py -b $basin_codes_file -r $refineDiagDir $yr1.ocean_month_rho2.nc +#$script_dir/calc_variance.py zos $yr1.ocean_daily.nc $refineDiagDir/$yr1.ocean_month_refined.nc -#-- Note: the calc_variance script should be called LAST, since it appends to the ocean_month_refined.nc file -# that is created first by the other scripts. +#-- Note: The calc_variance script pre-dated refineDiag efforts just prior to the start of the GFDL-CM4 DECK runs. +# Based on the diag_table, it looks like the calc_variance script is no longer needed and is now commented out. +# If it is reactivated, it should be called LAST, since it appends to the ocean_month_refined.nc file that is +# created first by the other scripts. echo " ---------- end yearly analysis ---------- " From 96477439980aa4a9d183399d4b94f154d8687522 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Thu, 5 Oct 2017 13:22:44 -0400 Subject: [PATCH 62/89] Added 'coordinates' attribute to basin/strait vars. --- tools/analysis/refineDiag_ocean_month.py | 3 +++ tools/analysis/refineDiag_ocean_month_rho2.py | 4 ++++ tools/analysis/refineDiag_ocean_month_z.py | 7 +++++++ 3 files changed, 14 insertions(+) diff --git a/tools/analysis/refineDiag_ocean_month.py b/tools/analysis/refineDiag_ocean_month.py index 257bbf3a8d..de7eabffa1 100755 --- a/tools/analysis/refineDiag_ocean_month.py +++ b/tools/analysis/refineDiag_ocean_month.py @@ -119,6 +119,7 @@ def main(args): hfbasin = np.ma.array(hfbasin,fill_value=nc_misval) hfbasin.long_name = 'Northward Ocean Heat Transport' hfbasin.units = 'W' + hfbasin.coordinates = 'region' hfbasin.cell_methods = 'yq:sum time:mean' hfbasin.comment = 'Indo-Pacific heat transport begins at 34 S' hfbasin.time_avg_info = 'average_T1,average_T2,average_DT' @@ -199,6 +200,8 @@ def main(args): for k in hfbasin.__dict__.keys(): if k[0] != '_': hfbasin_out.setncattr(k,hfbasin.__dict__[k]) + region_out.setncattr('standard_name','region') + average_T1_out.setncatts(average_T1.__dict__) average_T2_out.setncatts(average_T2.__dict__) average_DT_out.setncatts(average_DT.__dict__) diff --git a/tools/analysis/refineDiag_ocean_month_rho2.py b/tools/analysis/refineDiag_ocean_month_rho2.py index 23800f70cf..ec715b332c 100755 --- a/tools/analysis/refineDiag_ocean_month_rho2.py +++ b/tools/analysis/refineDiag_ocean_month_rho2.py @@ -64,6 +64,7 @@ def main(args): msftyrho = np.ma.array(msftyrho,fill_value=1.e20) msftyrho.long_name = 'Ocean Y Overturning Mass Streamfunction' msftyrho.units = 'kg s-1' + msftyrho.coordinates = 'region' msftyrho.cell_methods = 'rho2_i:sum yq:sum time:mean' msftyrho.time_avg_info = 'average_T1,average_T2,average_DT' msftyrho.standard_name = 'ocean_y_overturning_mass_streamfunction' @@ -78,6 +79,7 @@ def main(args): msftyrhompa = np.ma.array(msftyrhompa,fill_value=1.e20) msftyrhompa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' msftyrhompa.units = 'kg s-1' + msftyrhompa.coordinates = 'region' msftyrhompa.cell_methods = 'rho2_i:sum yq:sum time:mean' msftyrhompa.time_avg_info = 'average_T1,average_T2,average_DT' msftyrhompa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ @@ -138,6 +140,8 @@ def main(args): msftyrhompa_out = f_out.createVariable('msftyrhompa', np.float32, ('time', 'basin', 'rho2_i', 'yq'), fill_value=1.e20) msftyrhompa_out.missing_value = 1.e20 + + region_out.setncattr('standard_name','region') average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) diff --git a/tools/analysis/refineDiag_ocean_month_z.py b/tools/analysis/refineDiag_ocean_month_z.py index 217fdc5583..94fc119237 100755 --- a/tools/analysis/refineDiag_ocean_month_z.py +++ b/tools/analysis/refineDiag_ocean_month_z.py @@ -110,6 +110,7 @@ def main(args): msftyyz = np.ma.array(msftyyz,fill_value=nc_misval) msftyyz.long_name = 'Ocean Y Overturning Mass Streamfunction' msftyyz.units = 'kg s-1' + msftyyz.coordinates = 'region' msftyyz.cell_methods = 'z_i:sum yq:sum time:mean' msftyyz.time_avg_info = 'average_T1,average_T2,average_DT' msftyyz.standard_name = 'ocean_y_overturning_mass_streamfunction' @@ -124,6 +125,7 @@ def main(args): msftyzmpa = np.ma.array(msftyzmpa,fill_value=nc_misval) msftyzmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' msftyzmpa.units = 'kg s-1' + msftyzmpa.coordinates = 'region' msftyzmpa.cell_methods = 'z_i:sum yq:sum time:mean' msftyzmpa.time_avg_info = 'average_T1,average_T2,average_DT' msftyzmpa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ @@ -139,6 +141,7 @@ def main(args): msftyzsmpa = np.ma.array(msftyzsmpa,fill_value=nc_misval) msftyzsmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized submesoscale advection' msftyzsmpa.units = 'kg s-1' + msftyzsmpa.coordinates = 'region' msftyzsmpa.cell_methods = 'z_i:sum yq:sum time:mean' msftyzsmpa.time_avg_info = 'average_T1,average_T2,average_DT' msftyzsmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ @@ -162,6 +165,7 @@ def main(args): strait_names = np.array( [strait.cmor_name for strait in straits] ) mfo.long_name = 'Sea Water Transport' mfo.units = 'kg s-1' + mfo.coordinates = 'strait' mfo.cell_methods = 'time:mean' mfo.time_avg_info = 'average_T1,average_T2,average_DT' mfo.standard_name = 'sea_water_transport_across_line' @@ -264,6 +268,9 @@ def main(args): for k in wmo.__dict__.keys(): if k[0] != '_': wmo_out.setncattr(k,wmo.__dict__[k]) + region_out.setncattr('standard_name','region') + strait_out.setncattr('standard_name','region') + average_T1_out.setncatts(average_T1.__dict__) average_T2_out.setncatts(average_T2.__dict__) average_DT_out.setncatts(average_DT.__dict__) From bcd2b908b3677b63566e01ea623e18ec485bf6e6 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Thu, 5 Oct 2017 14:54:09 -0400 Subject: [PATCH 63/89] Tidy-up odds and ends after QC - corrected cell_methods - cleaned up global attributes --- tools/analysis/refineDiag_ocean_month.py | 7 ++++--- tools/analysis/refineDiag_ocean_month_rho2.py | 9 +++++---- tools/analysis/refineDiag_ocean_month_z.py | 11 ++++++----- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tools/analysis/refineDiag_ocean_month.py b/tools/analysis/refineDiag_ocean_month.py index de7eabffa1..741e2b9924 100755 --- a/tools/analysis/refineDiag_ocean_month.py +++ b/tools/analysis/refineDiag_ocean_month.py @@ -120,7 +120,7 @@ def main(args): hfbasin.long_name = 'Northward Ocean Heat Transport' hfbasin.units = 'W' hfbasin.coordinates = 'region' - hfbasin.cell_methods = 'yq:sum time:mean' + hfbasin.cell_methods = 'yq:point time:mean' hfbasin.comment = 'Indo-Pacific heat transport begins at 34 S' hfbasin.time_avg_info = 'average_T1,average_T2,average_DT' hfbasin.standard_name = 'northward_ocean_heat_transport' @@ -157,8 +157,9 @@ def main(args): f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') f_out.setncatts(f_in.__dict__) - f_out.filename = args.outfile - + f_out.filename = os.path.basename(args.outfile) + f_out.delncattr('associated_files') # not needed for these fields + time_dim = f_out.createDimension('time', size=None) basin_dim = f_out.createDimension('basin', size=3) strlen_dim = f_out.createDimension('strlen', size=21) diff --git a/tools/analysis/refineDiag_ocean_month_rho2.py b/tools/analysis/refineDiag_ocean_month_rho2.py index ec715b332c..84002ec12b 100755 --- a/tools/analysis/refineDiag_ocean_month_rho2.py +++ b/tools/analysis/refineDiag_ocean_month_rho2.py @@ -65,7 +65,7 @@ def main(args): msftyrho.long_name = 'Ocean Y Overturning Mass Streamfunction' msftyrho.units = 'kg s-1' msftyrho.coordinates = 'region' - msftyrho.cell_methods = 'rho2_i:sum yq:sum time:mean' + msftyrho.cell_methods = 'rho2_i:point yq:point time:mean' msftyrho.time_avg_info = 'average_T1,average_T2,average_DT' msftyrho.standard_name = 'ocean_y_overturning_mass_streamfunction' @@ -80,7 +80,7 @@ def main(args): msftyrhompa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' msftyrhompa.units = 'kg s-1' msftyrhompa.coordinates = 'region' - msftyrhompa.cell_methods = 'rho2_i:sum yq:sum time:mean' + msftyrhompa.cell_methods = 'rho2_i:point yq:point time:mean' msftyrhompa.time_avg_info = 'average_T1,average_T2,average_DT' msftyrhompa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ 'mesoscale_advection' @@ -118,8 +118,9 @@ def main(args): f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') f_out.setncatts(f_in.__dict__) - f_out.filename = args.outfile - + f_out.filename = os.path.basename(args.outfile) + f_out.delncattr('associated_files') # not needed for these fields + time_dim = f_out.createDimension('time', size=None) basin_dim = f_out.createDimension('basin', size=3) strlen_dim = f_out.createDimension('strlen', size=21) diff --git a/tools/analysis/refineDiag_ocean_month_z.py b/tools/analysis/refineDiag_ocean_month_z.py index 94fc119237..609c7a9b4e 100755 --- a/tools/analysis/refineDiag_ocean_month_z.py +++ b/tools/analysis/refineDiag_ocean_month_z.py @@ -111,7 +111,7 @@ def main(args): msftyyz.long_name = 'Ocean Y Overturning Mass Streamfunction' msftyyz.units = 'kg s-1' msftyyz.coordinates = 'region' - msftyyz.cell_methods = 'z_i:sum yq:sum time:mean' + msftyyz.cell_methods = 'z_i:point yq:point time:mean' msftyyz.time_avg_info = 'average_T1,average_T2,average_DT' msftyyz.standard_name = 'ocean_y_overturning_mass_streamfunction' @@ -126,7 +126,7 @@ def main(args): msftyzmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' msftyzmpa.units = 'kg s-1' msftyzmpa.coordinates = 'region' - msftyzmpa.cell_methods = 'z_i:sum yq:sum time:mean' + msftyzmpa.cell_methods = 'z_i:point yq:point time:mean' msftyzmpa.time_avg_info = 'average_T1,average_T2,average_DT' msftyzmpa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ 'mesoscale_advection' @@ -142,7 +142,7 @@ def main(args): msftyzsmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized submesoscale advection' msftyzsmpa.units = 'kg s-1' msftyzsmpa.coordinates = 'region' - msftyzsmpa.cell_methods = 'z_i:sum yq:sum time:mean' + msftyzsmpa.cell_methods = 'z_i:point yq:point time:mean' msftyzsmpa.time_avg_info = 'average_T1,average_T2,average_DT' msftyzsmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ 'submesoscale_advection' @@ -154,9 +154,10 @@ def main(args): wmo = np.ma.array(wmo,fill_value=nc_misval) wmo.long_name = 'Upward mass transport from resolved and parameterized advective transport' wmo.units = 'kg s-1' - wmo.cell_methods = 'z_i:sum xh:sum yh:sum time:mean' + wmo.cell_methods = 'z_i:point xh:sum yh:sum time:mean' wmo.time_avg_info = 'average_T1,average_T2,average_DT' wmo.standard_name = 'upward_ocean_mass_transport' + wmo.cell_measures = 'area:areacello' #-- mfo _, mfo, straits = sum_transport_in_straits(args.straitdir, monthly_average = True) @@ -202,7 +203,7 @@ def main(args): f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') f_out.setncatts(f_in.__dict__) - f_out.filename = args.outfile + f_out.filename = os.path.basename(args.outfile) time_dim = f_out.createDimension('time', size=None) basin_dim = f_out.createDimension('basin', size=3) From 78fadfae038180e208e9d6092befa8e952d29724 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Tue, 10 Oct 2017 15:25:05 -0400 Subject: [PATCH 64/89] Updated cmocean module import - If running in a webapp, keys off of environment to determine whether or not to print error message. (If error message thrown before "Content-type" header is declared, most servers will display a page error.) --- tools/analysis/m6plot.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/analysis/m6plot.py b/tools/analysis/m6plot.py index 9b2231023c..905fb8ffca 100644 --- a/tools/analysis/m6plot.py +++ b/tools/analysis/m6plot.py @@ -18,8 +18,14 @@ try: from mpl_toolkits.basemap import Basemap except: print('Basemap module not found. Some regional plots may not function properly') -try: import cmocean -except: print('cmocean module not found. Some color maps may not render properly') + +try: + import cmocean +except: + if "HTTP_USER_AGENT" in os.environ.keys(): + pass + else: + print('cmocean module not found. Some color maps may not render properly') from sys import modules From 4cbea5bda0b410d184333a51f4d8b09113dc47f3 Mon Sep 17 00:00:00 2001 From: Andrew Shao Date: Wed, 11 Oct 2017 12:07:58 -0400 Subject: [PATCH 65/89] Reorder indices of straits according to CMIP6/OMIP The previous ordering of the straits was not quite in the order listed in Table J1 of the Griffies et al. [2016] paper detailing the protocols for CMIP6/OMIP. The order in which strait_transport_timeseries.py was changed to append the Indonesian Throughflow after Iceland Faroe and before Mozambique --- tools/analysis/strait_transport_timeseries.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/analysis/strait_transport_timeseries.py b/tools/analysis/strait_transport_timeseries.py index 1fe65698c9..a382bf496b 100644 --- a/tools/analysis/strait_transport_timeseries.py +++ b/tools/analysis/strait_transport_timeseries.py @@ -103,11 +103,11 @@ def set_strait_info(): strait.append(strait_type("fram_strait", "Fram_Strait", is_zonal = True)) strait.append(strait_type("gibraltar_strait", "Gibraltar_Strait", is_meridional = True)) strait.append(strait_type("iceland_faroe_channel", "Iceland_Faroe", is_meridional = True, is_zonal = True)) + strait.append(strait_type("indonesian_throughflow", "Indonesian_Throughflow", is_zonal = True)) strait.append(strait_type("mozambique_channel", "Mozambique_Channel", is_zonal = True)) strait.append(strait_type("pacific_equatorial_undercurrent", "Pacific_undercurrent", is_meridional = True, zlim = 350)) strait.append(strait_type("taiwan_and_luzon_straits", "Taiwan_Luzon", is_meridional = True)) strait.append(strait_type("agulhas_section", "Agulhas_section", is_meridional = True)) - strait.append(strait_type("indonesian_throughflow", "Indonesian_Throughflow", is_zonal = True)) return strait From 01f14a370e85e1b3efb1804884bf513dd851905a Mon Sep 17 00:00:00 2001 From: Niki Zadeh Date: Thu, 12 Oct 2017 15:06:38 -0400 Subject: [PATCH 66/89] Reset exec permissions of python scripts - gcp does not preserve the executbale permissions of the files hence the python scripts cannot be called directly after transfer from gaea to gfdl and hence analysis fails. This commit tries to reset the missing x permission. --- tools/analysis/MOM6_refineDiag.csh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/analysis/MOM6_refineDiag.csh b/tools/analysis/MOM6_refineDiag.csh index 5b2fa068b5..5e5a15f513 100755 --- a/tools/analysis/MOM6_refineDiag.csh +++ b/tools/analysis/MOM6_refineDiag.csh @@ -90,6 +90,8 @@ pwd ls -l set script_dir=${out_dir}/mom6/tools/analysis +#gcp does not preserve executable bit, re-set it in order to work after transfer +chmod +x $script_dir/*.py set ocean_static_file = $yr1.ocean_static.nc if ( -e $yr1.ocean_static_no_mask_table.nc ) set ocean_static_file = $yr1.ocean_static_no_mask_table.nc From c36036e83f0d734f5d13f44316ba2c9bb997fd21 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 18 Oct 2017 14:08:19 -0400 Subject: [PATCH 67/89] Added append_basin_mask.py script - Since the field 'basin' is now in the static file, that file can be read instead of a separate dependence on another file in MOM6_refineDiag.csh - Included Persian Gulf in Indian Ocean basin mask --- tools/analysis/MOM6_refineDiag.csh | 8 ++- tools/analysis/append_basin_mask.py | 76 +++++++++++++++++++++++++++++ tools/analysis/m6toolbox.py | 3 ++ 3 files changed, 82 insertions(+), 5 deletions(-) create mode 100755 tools/analysis/append_basin_mask.py diff --git a/tools/analysis/MOM6_refineDiag.csh b/tools/analysis/MOM6_refineDiag.csh index 5b2fa068b5..fa8899fbe7 100755 --- a/tools/analysis/MOM6_refineDiag.csh +++ b/tools/analysis/MOM6_refineDiag.csh @@ -94,17 +94,15 @@ set script_dir=${out_dir}/mom6/tools/analysis set ocean_static_file = $yr1.ocean_static.nc if ( -e $yr1.ocean_static_no_mask_table.nc ) set ocean_static_file = $yr1.ocean_static_no_mask_table.nc -set basin_codes_file = $yr1.basin_codes.nc - echo '====annual mean Eddy Kinetic Energy======' mkdir -p $out_dir/refineDiag_ocean_annual/EddyKineticEnergy $script_dir/EddyKineticEnergy.py -g $ocean_static_file -o $out_dir/refineDiag_ocean_annual/EddyKineticEnergy/EKE_mean_${yr1}.png -l ${yr1} $yr1.ocean_daily.nc echo '==== Offline Diagnostics ====' -$script_dir/refineDiag_ocean_month.py -b $basin_codes_file -r $refineDiagDir $yr1.ocean_month.nc -$script_dir/refineDiag_ocean_month_z.py -b $basin_codes_file -r $refineDiagDir -s ./ $yr1.ocean_month_z.nc -$script_dir/refineDiag_ocean_month_rho2.py -b $basin_codes_file -r $refineDiagDir $yr1.ocean_month_rho2.nc +$script_dir/refineDiag_ocean_month.py -b $ocean_static_file -r $refineDiagDir $yr1.ocean_month.nc +$script_dir/refineDiag_ocean_month_z.py -b $ocean_static_file -r $refineDiagDir -s ./ $yr1.ocean_month_z.nc +$script_dir/refineDiag_ocean_month_rho2.py -b $ocean_static_file -r $refineDiagDir $yr1.ocean_month_rho2.nc #$script_dir/calc_variance.py zos $yr1.ocean_daily.nc $refineDiagDir/$yr1.ocean_month_refined.nc #-- Note: The calc_variance script pre-dated refineDiag efforts just prior to the start of the GFDL-CM4 DECK runs. diff --git a/tools/analysis/append_basin_mask.py b/tools/analysis/append_basin_mask.py new file mode 100755 index 0000000000..71e7b3af46 --- /dev/null +++ b/tools/analysis/append_basin_mask.py @@ -0,0 +1,76 @@ +#!/usr/bin/env python + +import argparse +import m6toolbox +import netCDF4 as nc +import numpy as np +import os +import shutil +import sys + +''' +Script to add the CF varaible 'basin' to an existing ocean_static.nc file +''' + +def run(): + parser = argparse.ArgumentParser(description='''Script to append basin mask to static file''') + parser.add_argument('infile', type=str, help='''Input file''') + parser.add_argument('-o','--outfile', type=str, default=None, help='''Output file name''') + parser.add_argument('-v',dest='verbose', action='store_true', default=False, help='''Verbose output''') + args = parser.parse_args() + main(args) + + +def main(args): + f = nc.Dataset(args.infile) + + if 'basin' in f.variables.keys(): + sys.stdout.write('The basin field already appears to be in the static file. Exiting.') + exit(1) + + if args.outfile is None: + outfile = os.path.basename(args.infile) + outfile = outfile.split('.') + outfile.insert(-1,'basins') + outfile = str('.').join(outfile) + else: + outfile = args.outfile + + if os.path.exists(outfile): + sys.stdout.write('File already exists ... would you like to overwrite? (y/n): ') + choice = raw_input().lower() + if choice == 'y': + if args.verbose: + sys.stdout.write('Overwriting file: '+outfile+'\n') + elif choice == 'n': + exit(1) + else: + sys.stdout.write('Please respond with \'y\' or \'n\'') + + geolon = np.array(f.variables['geolon'][:]) + geolat = np.array(f.variables['geolat'][:]) + deptho = np.array(f.variables['deptho'][:].filled(0)) + basin_code = m6toolbox.genBasinMasks(geolon, geolat, deptho, args.verbose) + + shutil.copyfile(args.infile,outfile) + + nc_out = nc.Dataset(outfile,'r+',format='NETCDF3_CLASSIC') + basin_out = nc_out.createVariable('basin', np.int32, ('yh', 'xh')) + + basin_out.setncattr('long_name','Region Selection Index') + basin_out.setncattr('standard_name','region') + basin_out.setncattr('units','1.0') + basin_out.setncattr('interp_method','none') + basin_out.setncattr('flag_values','0 1 2 3 4 5 6 7 8 9 10') + basin_out.setncattr('flag_meanings','global_land southern_ocean atlantic_ocean pacific_ocean '+\ + 'arctic_ocean indian_ocean mediterranean_sea black_sea hudson_bay baltic_sea red_sea') + + basin_out[:] = basin_code[:] + + nc_out.close() + + exit(0) + + +if __name__ == '__main__': + run() diff --git a/tools/analysis/m6toolbox.py b/tools/analysis/m6toolbox.py index eab1f7d5ea..47a2944fbe 100644 --- a/tools/analysis/m6toolbox.py +++ b/tools/analysis/m6toolbox.py @@ -320,6 +320,9 @@ def genBasinMasks(x,y,depth,verbose=False): code[tmp>0] = 1 wet = wet - tmp # Removed named points + if verbose: print('Remapping Persian Gulf points to the Indian Ocean for OMIP/CMIP6 ...') + code[code==11] = 5 + code[wet>0] = -9 (j,i) = np.unravel_index( wet.argmax(), x.shape) if j: From 6f87aeb58abf2a0fae87f44018ec4499496eadc7 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 19 Oct 2017 13:01:42 -0400 Subject: [PATCH 68/89] icebergs: Merge pull request #57 from adcroft/berg_diffusion - Fixes apparent sea-level loss due to icebergs getting stuck in single-point channels/inlets. - NOAA-GFDL/icebergs@0571552 Merge pull request #57 from adcroft/berg_diffusion - NOAA-GFDL/icebergs@b913118 Adds a stochastic parameterization of unresolved/tidal currents - NOAA-GFDL/icebergs@6fd6f11 Adds an incentive to move away from coasts --- src/icebergs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/icebergs b/src/icebergs index 6595cdd817..0571552b8b 160000 --- a/src/icebergs +++ b/src/icebergs @@ -1 +1 @@ -Subproject commit 6595cdd81789a67449873350ea9b69b87f44ff70 +Subproject commit 0571552b8b95266b9d971333b7345d5133abd6a9 From 5d867c19904ff8a179e83a28d548781d477ea605 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Fri, 20 Oct 2017 09:24:51 -0400 Subject: [PATCH 69/89] MOM6: Merge branch 'MJHarrison-GFDL-SfcRestoringMask' into dev/gfdl - Last commit updated MOM_parameter_doc.all for coupled ice-ocean experiments. - NOAA-GFDL/MOM6@433f7ed Merge branch 'MJHarrison-GFDL-SfcRestoringMask' into dev/gfdl - NOAA-GFDL/MOM6@46ae157 Merge branch 'SfcRestoringMask' of https://github.com/MJHarrison-GFDL/MOM6 into MJHarrison-GFDL-SfcRestoringMask - NOAA-GFDL/MOM6@8370c44 Merge branch 'MJHarrison-GFDL-OBC_tracer_patch' into dev/gfdl - NOAA-GFDL/MOM6@d5b6c96 Merge branch 'OBC_tracer_patch' of https://github.com/MJHarrison-GFDL/MOM6 into MJHarrison-GFDL-OBC_tracer_patch - NOAA-GFDL/MOM6@3143935 Merge branch 'ESMG-OBC_tracers' into dev/gfdl - NOAA-GFDL/MOM6@72a2d51 Clean out MOM6-examples in travis - NOAA-GFDL/MOM6@954d831 Optional 2-d Mask for SST/SSS restoring - NOAA-GFDL/MOM6@26a755c fix comment - NOAA-GFDL/MOM6@92dfd74 fixes for OBC tracers - NOAA-GFDL/MOM6@b52dd98 Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6@e524bd5 Merge branch 'mask_outside' into user/ksh/open_bc - NOAA-GFDL/MOM6@4611092 Modifying Area_h for OBCs. - NOAA-GFDL/MOM6@9fe7859 Merge branch 'OBC_tracers' into mask_outside - NOAA-GFDL/MOM6@c6d5a6e Doxygen of generic tracer - NOAA-GFDL/MOM6@d3763d8 Merge branch 'OBC_tracers' into user/ksh/open_bc - NOAA-GFDL/MOM6@6b142a7 Merge remote-tracking branch 'gfdl/dev/gfdl' into OBC_tracers - NOAA-GFDL/MOM6@8d33a65 *Fix tracer upstream OBC - NOAA-GFDL/MOM6@6c05467 Mask out those outside h points again. - NOAA-GFDL/MOM6@e8edc15 *Mask out the land outside of open boundaries. - NOAA-GFDL/MOM6@a02220e Setting h outside is needed for ALE regridding... - NOAA-GFDL/MOM6@c2ecca5 Turning off the OBC tracer advection for now. - NOAA-GFDL/MOM6@f1c8328 Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc --- ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 3 +++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 3 +++ src/MOM6 | 2 +- 7 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 33387ec844..bbba17a5e6 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1783,6 +1783,9 @@ MASK_SRESTORE_MARGINAL_SEAS = False ! [Boolean] default = False ! RESTORE_SALINITY is True. BASIN_FILE = "basin.nc" ! default = "basin.nc" ! A file in which to find the basin masks, in variable 'basin'. +MASK_SRESTORE = False ! [Boolean] default = False + ! If true, read a file (salt_restore_mask) containing + ! a mask for SSS restoring. CD_TIDES = 0.0025 ! [nondim] default = 1.0E-04 ! The drag coefficient that applies to the tides. READ_GUST_2D = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 6dfa9303bd..0b9d839c6f 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -2095,6 +2095,9 @@ MASK_SRESTORE_MARGINAL_SEAS = False ! [Boolean] default = False ! RESTORE_SALINITY is True. BASIN_FILE = "basin.nc" ! default = "basin.nc" ! A file in which to find the basin masks, in variable 'basin'. +MASK_SRESTORE = False ! [Boolean] default = False + ! If true, read a file (salt_restore_mask) containing + ! a mask for SSS restoring. CD_TIDES = 0.0018 ! [nondim] default = 1.0E-04 ! The drag coefficient that applies to the tides. READ_GUST_2D = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 797b1f0c05..f27b8e55a1 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -2118,6 +2118,9 @@ MASK_SRESTORE_MARGINAL_SEAS = False ! [Boolean] default = False ! RESTORE_SALINITY is True. BASIN_FILE = "basin.nc" ! default = "basin.nc" ! A file in which to find the basin masks, in variable 'basin'. +MASK_SRESTORE = False ! [Boolean] default = False + ! If true, read a file (salt_restore_mask) containing + ! a mask for SSS restoring. CD_TIDES = 0.0018 ! [nondim] default = 1.0E-04 ! The drag coefficient that applies to the tides. READ_GUST_2D = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 9a34a6f056..69b4815f73 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1797,6 +1797,9 @@ MASK_SRESTORE_MARGINAL_SEAS = False ! [Boolean] default = False ! RESTORE_SALINITY is True. BASIN_FILE = "basin.nc" ! default = "basin.nc" ! A file in which to find the basin masks, in variable 'basin'. +MASK_SRESTORE = False ! [Boolean] default = False + ! If true, read a file (salt_restore_mask) containing + ! a mask for SSS restoring. CD_TIDES = 0.0025 ! [nondim] default = 1.0E-04 ! The drag coefficient that applies to the tides. READ_GUST_2D = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index d5a9a9641d..6bf75bb87b 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1797,6 +1797,9 @@ MASK_SRESTORE_MARGINAL_SEAS = False ! [Boolean] default = False ! RESTORE_SALINITY is True. BASIN_FILE = "basin.nc" ! default = "basin.nc" ! A file in which to find the basin masks, in variable 'basin'. +MASK_SRESTORE = False ! [Boolean] default = False + ! If true, read a file (salt_restore_mask) containing + ! a mask for SSS restoring. CD_TIDES = 0.0025 ! [nondim] default = 1.0E-04 ! The drag coefficient that applies to the tides. READ_GUST_2D = True ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index d5a9a9641d..6bf75bb87b 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1797,6 +1797,9 @@ MASK_SRESTORE_MARGINAL_SEAS = False ! [Boolean] default = False ! RESTORE_SALINITY is True. BASIN_FILE = "basin.nc" ! default = "basin.nc" ! A file in which to find the basin masks, in variable 'basin'. +MASK_SRESTORE = False ! [Boolean] default = False + ! If true, read a file (salt_restore_mask) containing + ! a mask for SSS restoring. CD_TIDES = 0.0025 ! [nondim] default = 1.0E-04 ! The drag coefficient that applies to the tides. READ_GUST_2D = True ! [Boolean] default = False diff --git a/src/MOM6 b/src/MOM6 index 0822a17489..433f7ed83e 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 0822a17489575981756a0555611a6da43ad23877 +Subproject commit 433f7ed83e34622ce1c36c49c77d9f43f051bcc0 From d9dd61dfc5be75c43b0208ec89ff737ba3ca9f9f Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 23 Oct 2017 10:46:00 -0400 Subject: [PATCH 70/89] MOM6: Merge branch 'MJHarrison-GFDL-HVisc_masking' into dev/gfdl - Last commit updates MOM_parameter_doc.all files with new parameter. - NOAA-GFDL/MOM6@46a3326 Merge branch 'MJHarrison-GFDL-HVisc_masking' into dev/gfdl - NOAA-GFDL/MOM6@496f928 Merge branch 'HVisc_masking' of https://github.com/MJHarrison-GFDL/MOM6 into MJHarrison-GFDL-HVisc_masking - NOAA-GFDL/MOM6@82ba959 Merge branch 'MJHarrison-GFDL-ALE_sponge_patch' into dev/gfdl - NOAA-GFDL/MOM6@19643be Merge branch 'ALE_sponge_patch' of https://github.com/MJHarrison-GFDL/MOM6 into MJHarrison-GFDL-ALE_sponge_patch - NOAA-GFDL/MOM6@2a561e3 Added a parameter "USE_LAND_MASK_FOR_HVISC" which introduces a land mask for the computation of thickness at velocity points. Default is False to maintain legacy answers but should be switched to True for newer runs. - NOAA-GFDL/MOM6@aaabe79 Added initialization call to time_interp_external for ALE_sponges - NOAA-GFDL/MOM6@bb5e2e8 *Masking h-point thicknesses for computation of C-grid values --- coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all | 6 ++++++ .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 6 ++++++ .../Concurrent_ice_1deg/MOM_parameter_doc.all | 6 ++++++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 6 ++++++ .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 6 ++++++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 6 ++++++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 6 ++++++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 6 ++++++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 6 ++++++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 6 ++++++ .../OM_360x320_C180/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all | 6 ++++++ .../skin_warming_wind/BML/MOM_parameter_doc.all | 6 ++++++ .../skin_warming_wind/EPBL/MOM_parameter_doc.all | 6 ++++++ .../skin_warming_wind/KPP/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all | 6 ++++++ .../CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all | 6 ++++++ ocean_only/DOME/MOM_parameter_doc.all | 6 ++++++ ocean_only/Phillips_2layer/MOM_parameter_doc.all | 6 ++++++ ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all | 6 ++++++ ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 6 ++++++ ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 6 ++++++ ocean_only/adjustment2d/z/MOM_parameter_doc.all | 6 ++++++ ocean_only/benchmark/MOM_parameter_doc.all | 6 ++++++ ocean_only/circle_obcs/MOM_parameter_doc.all | 6 ++++++ ocean_only/double_gyre/MOM_parameter_doc.all | 6 ++++++ ocean_only/external_gwave/MOM_parameter_doc.all | 6 ++++++ ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 6 ++++++ ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 6 ++++++ ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 6 ++++++ ocean_only/flow_downslope/z/MOM_parameter_doc.all | 6 ++++++ ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 6 ++++++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 6 ++++++ ocean_only/global_ALE/z/MOM_parameter_doc.all | 6 ++++++ ocean_only/lock_exchange/MOM_parameter_doc.all | 6 ++++++ ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 6 ++++++ ocean_only/nonBous_global/MOM_parameter_doc.all | 6 ++++++ ocean_only/resting/layer/MOM_parameter_doc.all | 6 ++++++ ocean_only/resting/z/MOM_parameter_doc.all | 6 ++++++ ocean_only/seamount/layer/MOM_parameter_doc.all | 6 ++++++ ocean_only/seamount/rho/MOM_parameter_doc.all | 6 ++++++ ocean_only/seamount/sigma/MOM_parameter_doc.all | 6 ++++++ ocean_only/seamount/z/MOM_parameter_doc.all | 6 ++++++ ocean_only/single_column/BML/MOM_parameter_doc.all | 6 ++++++ ocean_only/single_column/EPBL/MOM_parameter_doc.all | 6 ++++++ ocean_only/single_column/KPP/MOM_parameter_doc.all | 6 ++++++ ocean_only/sloshing/layer/MOM_parameter_doc.all | 6 ++++++ ocean_only/sloshing/rho/MOM_parameter_doc.all | 6 ++++++ ocean_only/sloshing/z/MOM_parameter_doc.all | 6 ++++++ ocean_only/torus_advection_test/MOM_parameter_doc.all | 6 ++++++ ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 6 ++++++ ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 6 ++++++ ocean_only/unit_tests/MOM_parameter_doc.all | 6 ++++++ src/MOM6 | 2 +- 60 files changed, 355 insertions(+), 1 deletion(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index 8e28dea87b..18e7c1b4fc 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -928,6 +928,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 42be133e60..0aa8a6dd91 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -928,6 +928,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 42be133e60..0aa8a6dd91 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -928,6 +928,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index bbba17a5e6..caf8fa8d64 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -928,6 +928,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for 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 22bff31517..75caa5bb53 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 @@ -1132,6 +1132,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 0b9d839c6f..521a2728c4 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1135,6 +1135,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index f27b8e55a1..6fcf0ab77d 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1138,6 +1138,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 69b4815f73..b42b40eb5d 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -942,6 +942,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 6bf75bb87b..1cb31244ba 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -942,6 +942,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 6bf75bb87b..1cb31244ba 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -942,6 +942,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index 805c1b8704..49f0c0a12b 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -1061,6 +1061,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for 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 8bee92b3d3..aaa1a379f2 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 @@ -733,6 +733,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 1f9597102d..5b3cfea140 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 @@ -829,6 +829,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 db50fe12ff..a12dd76dd4 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 @@ -829,6 +829,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 f2533e78a4..53b254ad20 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 @@ -733,6 +733,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 ed1d2ac866..5f280edce1 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 @@ -829,6 +829,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 0de5b700e4..2ef389c77e 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 @@ -829,6 +829,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 84bb67ae83..d4f151039f 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 @@ -733,6 +733,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 40ee430009..1687212f22 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 @@ -829,6 +829,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 a349836ec2..d938b1ce4f 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 @@ -829,6 +829,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 c605518822..67b0d2ad83 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 @@ -733,6 +733,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 8b282de75b..939367f127 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 @@ -829,6 +829,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 37eaee64e4..1bf78a69c5 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 @@ -829,6 +829,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index dc712ed5da..82e0bb67bd 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -762,6 +762,12 @@ BOUND_CORIOLIS_VEL = 10.0 ! [m s-1] default = 10.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 7ceeaa120b..ee7b343019 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -762,6 +762,12 @@ BOUND_CORIOLIS_VEL = 10.0 ! [m s-1] default = 10.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 7fcf92ba04..f21bbabc73 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -829,6 +829,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index a91331e2df..497016c315 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -804,6 +804,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index 51c84f9f70..d104812ece 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -947,6 +947,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 0f2c987531..c4112b6d31 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -901,6 +901,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 2a3ecae72a..2136b4d051 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -883,6 +883,12 @@ BOUND_CORIOLIS_VEL = 10.0 ! [m s-1] default = 10.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 2b09e99e36..91550a932b 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -803,6 +803,12 @@ BOUND_CORIOLIS_VEL = 10.0 ! [m s-1] default = 10.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index c48807dbba..6b5bbfcef2 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -687,6 +687,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 97d05d1729..5e60ce6d00 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -788,6 +788,12 @@ BETTER_BOUND_KH = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 260887de7f..5b1401cd1c 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -796,6 +796,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index c9d7d8aed1..f1ce1f4ff4 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -941,6 +941,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index e32ff27ba5..57671a8c61 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -895,6 +895,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 136f9e219c..33701de2d3 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -895,6 +895,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index c1b4cd8477..54d1c21648 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1164,6 +1164,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 3f66521ee7..c045b58bea 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1021,6 +1021,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 6f9a64b3c1..d5fb01bd26 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1116,6 +1116,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 6871760372..2b79601623 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -791,6 +791,12 @@ BETTER_BOUND_KH = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. 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 aa2aa130d6..65ec93aa2a 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -884,6 +884,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 5393cb65c0..d9e6fa8c2e 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -948,6 +948,12 @@ BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes ! the biharmonic drag to have comparable magnitude to the ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 6a4fc7ced4..6e2984d833 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -785,6 +785,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index d5130f422a..95f4ee47a2 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -884,6 +884,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index d59c2560bf..dc77e6b45d 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -816,6 +816,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index fafcd4f184..2761e7fa3b 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -959,6 +959,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 20466af270..42f7889f4b 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -913,6 +913,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index f5d4f9c067..2af581890d 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -913,6 +913,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index b6214099bc..5614c4c098 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -714,6 +714,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 546cf13444..4988cc700b 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -801,6 +801,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index b6e2bd5a3f..2a535e0ffc 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -801,6 +801,12 @@ LAPLACIAN = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 958abe9344..a264fb92df 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -791,6 +791,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 924c843710..8232f05525 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -936,6 +936,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 8734df3a85..418516fc79 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -890,6 +890,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index e13c928954..b330e45e31 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -791,6 +791,12 @@ BETTER_BOUND_KH = False ! [Boolean] default = False BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. USE_KH_BG_2D = False ! [Boolean] default = False ! If true, read a file containing 2-d background harmonic ! viscosities. The final viscosity is the maximum of the other terms and this background value. diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 557c64b7ec..015b74cd89 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -948,6 +948,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index dcaa70bdf6..26f6ad72da 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -902,6 +902,12 @@ BETTER_BOUND_KH = True ! [Boolean] default = True BIHARMONIC = False ! [Boolean] default = True ! If true, use a biharmonic horizontal viscosity. ! BIHARMONIC may be used with LAPLACIAN. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 4df409e174..00a3a771e8 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -640,6 +640,12 @@ BOUND_AH = True ! [Boolean] default = True BETTER_BOUND_AH = True ! [Boolean] default = True ! If true, the biharmonic coefficient is locally limited ! to be stable with a better bounding than just BOUND_AH. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 ! The nondimensional coefficient of the ratio of the ! viscosity bounds to the theoretical maximum for diff --git a/src/MOM6 b/src/MOM6 index 433f7ed83e..46a332642f 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 433f7ed83e34622ce1c36c49c77d9f43f051bcc0 +Subproject commit 46a332642f2e03f6bb74608665c9e894572b16d3 From c95392e2f203e5e545f6f3ce954b281d6e2e8235 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 23 Oct 2017 23:36:41 -0400 Subject: [PATCH 71/89] Use only 2 cores for multi-core Travis-CI tests - We have been suffering from time-outs within Travis-CI tests, particularly for the double_gyre experiment. - NOAA-GFDL/MOM6#620 in not finished once after repeated retries. - This commit reduces the core count to 2 where it was previously 4 and reduces the overall job duration to ~15 minutes, which is what it used to be when we first started using Travis-CI. Something seems to have changed since the jobs have been taking >20 minutes recently. - On Travis-CI the timings (nearest second) for 1-core non-symmetric executable are: - unit_tests: 0s - double_gyre: 20s - flow_downslope/layer: 11s - flow_downslope/rho: 16s - flow_downslope/sigma: 14s - flow_downslope/z: 14s - benchmark: 12s - circle_obcs: 4s - The real clock to the nearest second for 4-core symmetric executable are: - double_gyre: 7m - benchmark: 35s - circle_obcs: 1m30s - The above timings explain the timeouts; the 7 minute result was for a job that actually finished within the 10 minute window. Other jobs took longer. - The real clock to the nearest second for 2-core symmetric executable are: - double_gyre: 11s - flow_downslope/layer: 7s - flow_downslope/rho: 10s - flow_downslope/sigma: 9s - flow_downslope/z: 9s - benchmark: 8s - circle_obcs: 4s --- tools/tests/Travis-MOM6/run_tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/tests/Travis-MOM6/run_tests.sh b/tools/tests/Travis-MOM6/run_tests.sh index ae8775f228..b68e32fc0f 100755 --- a/tools/tests/Travis-MOM6/run_tests.sh +++ b/tools/tests/Travis-MOM6/run_tests.sh @@ -32,13 +32,13 @@ cat stats.md5 # Multi-core tests with symmetric executable run_test symocn 1 unit_tests -run_test symocn 4 double_gyre +run_test symocn 2 double_gyre run_test symocn 2 flow_downslope/layer run_test symocn 2 flow_downslope/rho run_test symocn 2 flow_downslope/sigma run_test symocn 2 flow_downslope/z -run_test symocn 4 benchmark -run_test symocn 4 circle_obcs +run_test symocn 2 benchmark +run_test symocn 2 circle_obcs # Check that checksums match md5sum -c stats.md5 From 60a055c7e4f45c6879c75f6a30db26c8af759d96 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 25 Oct 2017 10:35:02 -0400 Subject: [PATCH 72/89] MOM6: Removed masking of areas in ocean_static.nc - NOAA-GFDL/MOM6@5991c83 Removed masking of areas in ocean_static.nc --- src/MOM6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MOM6 b/src/MOM6 index 0822a17489..5991c83d18 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 0822a17489575981756a0555611a6da43ad23877 +Subproject commit 5991c83d18b8b886ce0f7333c3b32d587e70563c From 21b3db339c9c62ce989e85e998674b0f9915dcc8 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 1 Nov 2017 14:23:58 -0400 Subject: [PATCH 73/89] Removed LT_Enhancement from diag_table - Diagnostic was empty because it is out of date with configuration. --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index bc14e146c2..05dc18fd0f 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -555,9 +555,9 @@ "ocean_model", "uml_restrat", "uml_restrat", "ocean_month", "all", "mean", "none",2 "ocean_model", "vml_restrat", "vml_restrat", "ocean_month", "all", "mean", "none",2 - "ocean_model", "LT_Enhancement", "LT_Enhancement", "ocean_annual", "all", "mean", "none",2 +#"ocean_model", "LT_Enhancement", "LT_Enhancement", "ocean_annual", "all", "mean", "none",2 "ocean_model", "MSTAR", "MSTAR", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "LT_Enhancement", "LT_Enhancement", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "LT_Enhancement", "LT_Enhancement", "ocean_month", "all", "mean", "none",2 "ocean_model", "MSTAR", "MSTAR", "ocean_month", "all", "mean", "none",2 From e57d90d06cd7101b31e1b0e02ac26c5519ef6291 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 1 Nov 2017 15:04:17 -0400 Subject: [PATCH 74/89] OM4: Turned off empty diagnostics in OM4_025 - We had several diagnostics in OM4_025 that were empty because the associated parameterizations are not in use. I'm turning them off to reduce data volume for the production runs. --- ice_ocean_SIS2/OM4_025/diag_table.MOM6 | 34 ++++++++++++++------------ 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 index 05dc18fd0f..9218bc43ed 100644 --- a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 +++ b/ice_ocean_SIS2/OM4_025/diag_table.MOM6 @@ -171,8 +171,8 @@ #"ocean_model", "vmo", "vmo", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","vmo", "vmo", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","vmo", "vmo", "ocean_month_z", "all", "mean", "none",2 -#"ocean_model", "wmo", "wmo", "ocean_annual", "all", "mean", "none",2 # needs to be coded -#"ocean_model", "wmo", "wmo", "ocean_month", "all", "mean", "none",2 # needs to be coded +#"ocean_model", "wmo", "wmo", "ocean_annual", "all", "mean", "none",2 # calculated offline +#"ocean_model", "wmo", "wmo", "ocean_month", "all", "mean", "none",2 # calculated offline #"ocean_model", "uhml", "uhml", "ocean_annual", "all", "mean", "none",2 "ocean_model_z","uhml", "uhml", "ocean_annual_z", "all", "mean", "none",2 #"ocean_model_z","uhml", "uhml", "ocean_month_z", "all", "mean", "none",2 @@ -180,11 +180,11 @@ "ocean_model_z","vhml", "vhml", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","vhml", "vhml", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "uhGM", "uhGM", "ocean_annual", "all", "mean", "none",2 - "ocean_model_z","uhGM", "uhGM", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","uhGM", "uhGM", "ocean_annual_z", "all", "mean", "none",2 #"ocean_model_z","uhGM", "uhGM", "ocean_month_z", "all", "mean", "none",2 #"ocean_model", "vhGM", "vhGM", "ocean_annual", "all", "mean", "none",2 - "ocean_model_z","vhGM", "vhGM", "ocean_annual_z", "all", "mean", "none",2 - "ocean_model_z","vhGM", "vhGM", "ocean_month_z", "all", "mean", "none",2 +#"ocean_model_z","vhGM", "vhGM", "ocean_annual_z", "all", "mean", "none",2 +#"ocean_model_z","vhGM", "vhGM", "ocean_month_z", "all", "mean", "none",2 "ocean_model_z","uh", "uh", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","vh", "vh", "ocean_annual_z", "all", "mean", "none",2 "ocean_model_z","T_adx", "T_adx", "ocean_annual_z", "all", "mean", "none",2 @@ -195,20 +195,20 @@ "ocean_model_z","S_ady", "S_ady", "ocean_annual_z", "all", "mean", "none",2 "ocean_model", "S_adx_2d", "S_adx_2d", "ocean_month", "all", "mean", "none",2 "ocean_model", "S_ady_2d", "S_ady_2d", "ocean_month", "all", "mean", "none",2 - "ocean_model", "ndiff_tracer_trans_x_2d_T","ndiff_tracer_trans_x_2d_T", "ocean_month", "all", "mean", "none",2 - "ocean_model", "ndiff_tracer_trans_y_2d_T","ndiff_tracer_trans_y_2d_T", "ocean_month", "all", "mean", "none",2 - "ocean_model", "ndiff_tracer_trans_x_2d_S","ndiff_tracer_trans_x_2d_S", "ocean_month", "all", "mean", "none",2 - "ocean_model", "ndiff_tracer_trans_y_2d_S","ndiff_tracer_trans_y_2d_S", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "ndiff_tracer_trans_x_2d_T","ndiff_tracer_trans_x_2d_T", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "ndiff_tracer_trans_y_2d_T","ndiff_tracer_trans_y_2d_T", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "ndiff_tracer_trans_x_2d_S","ndiff_tracer_trans_x_2d_S", "ocean_month", "all", "mean", "none",2 +#"ocean_model", "ndiff_tracer_trans_y_2d_S","ndiff_tracer_trans_y_2d_S", "ocean_month", "all", "mean", "none",2 # Density space diagnostics (not necessarily using CMIP names but needed to generate CMIP output in post-processing) "ocean_model_rho2","umo", "umo", "ocean_annual_rho2", "all", "mean", "none",2 - "ocean_model_rho2","uhGM", "uhGM", "ocean_annual_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","uhGM", "uhGM", "ocean_annual_rho2", "all", "mean", "none",2 "ocean_model_rho2","uhml", "uhml", "ocean_annual_rho2", "all", "mean", "none",2 "ocean_model_rho2","vmo", "vmo", "ocean_annual_rho2", "all", "mean", "none",2 - "ocean_model_rho2","vhGM", "vhGM", "ocean_annual_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","vhGM", "vhGM", "ocean_annual_rho2", "all", "mean", "none",2 "ocean_model_rho2","vhml", "vhml", "ocean_annual_rho2", "all", "mean", "none",2 "ocean_model_rho2","vmo", "vmo", "ocean_month_rho2", "all", "mean", "none",2 - "ocean_model_rho2","vhGM", "vhGM", "ocean_month_rho2", "all", "mean", "none",2 +#"ocean_model_rho2","vhGM", "vhGM", "ocean_month_rho2", "all", "mean", "none",2 "ocean_model_rho2","vhml", "vhml", "ocean_month_rho2", "all", "mean", "none",2 # ----------------------------------------------------------------------------------------- @@ -504,12 +504,14 @@ # ----------------------------------------------------------------------------------------- # CMIP6/OMIP Table N1: lateral viscosity and diffusivities and impact on kinetic energy - "ocean_model", "diftrblo", "diftrblo", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "diftrelo", "diftrelo", "ocean_annual", "all", "mean", "none",2 # when neutral tracer diffusion - "ocean_model", "difmxylo", "difmxylo", "ocean_annual", "all", "mean", "none",2 # save if use Laplacian visc +#"ocean_model", "diftrblo", "diftrblo", "ocean_annual", "all", "mean", "none",2 +#"ocean_model", "diftrelo", "diftrelo", "ocean_annual", "all", "mean", "none",2 # when neutral tracer diffusion +#"ocean_model", "difmxylo", "difmxylo", "ocean_annual", "all", "mean", "none",2 # save if use Laplacian visc "ocean_model", "difmxybo", "difmxybo", "ocean_annual", "all", "mean", "none",2 "ocean_model", "dispkexyfo", "dispkexyfo", "ocean_annual", "all", "mean", "none",2 - "ocean_model", "tnkebto", "tnkebto", "ocean_annual", "all", "mean", "none",2 +#"ocean_model", "tnkebto", "tnkebto", "ocean_annual", "all", "mean", "none",2 + "ocean_model_z","difmxybo", "difmxybo", "ocean_annual_z", "all", "mean", "none",2 + "ocean_model_z","dispkexyfo", "dispkexyfo", "ocean_annual_z", "all", "mean", "none",2 ############################################################################################# From 49795ebc0ba929112455c316bf5ffadfb62a16df Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Wed, 1 Nov 2017 15:11:55 -0400 Subject: [PATCH 75/89] MOM6: Two PRs for MOM6 to resolve diagnostics issues - Number of layers were wrong in rho-space - Bad values were appearing at depth in z-space - NOAA-GFDL/MOM6@a3acfed Merge pull request #642 from adcroft/fix-rho-coord-diagnostics - NOAA-GFDL/MOM6@abda61d Use correct number of layers in diagnostic rho coordinates - NOAA-GFDL/MOM6@6e11928 Adds a non-iterative form of build_rho_column() - NOAA-GFDL/MOM6@d2a2b8c Re-factored build_rho_column() - NOAA-GFDL/MOM6@5d8111a Set defaults in coord_rho.F90 - NOAA-GFDL/MOM6@2d7fc4c Merge pull request #640 from adcroft/fix-masked-diagnostics - NOAA-GFDL/MOM6@6a46f62 Turn off safety checks in MOM_diag_mediator.F90 - NOAA-GFDL/MOM6@ae47696 No longer set array values to missing_value - NOAA-GFDL/MOM6@6555ecc Removed masks from diag_type - NOAA-GFDL/MOM6@7c5219b Create and use masks in diagnostic axes groups - NOAA-GFDL/MOM6@2f2b6e4 Removed dummy missing_value from diag_masks_set() --- src/MOM6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MOM6 b/src/MOM6 index 5991c83d18..a3acfedf3c 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 5991c83d18b8b886ce0f7333c3b32d587e70563c +Subproject commit a3acfedf3c2a79e7552fff0baa07093acc1f3ea2 From 5a724dcf7d676aaa05ff04e0510b74090d7d29af Mon Sep 17 00:00:00 2001 From: John Krasting Date: Fri, 3 Nov 2017 09:36:37 -0400 Subject: [PATCH 76/89] More robust refineDiag scripts - introduced source variable checking - output file is only written if at least one refineDiag variable is generated - removed trailing whitespace --- tools/analysis/refineDiag_ocean_month.py | 303 +++++++------- tools/analysis/refineDiag_ocean_month_rho2.py | 269 ++++++------ tools/analysis/refineDiag_ocean_month_z.py | 393 ++++++++++-------- 3 files changed, 510 insertions(+), 455 deletions(-) diff --git a/tools/analysis/refineDiag_ocean_month.py b/tools/analysis/refineDiag_ocean_month.py index 741e2b9924..c7aba24518 100755 --- a/tools/analysis/refineDiag_ocean_month.py +++ b/tools/analysis/refineDiag_ocean_month.py @@ -18,13 +18,13 @@ ## diffusive term only in 0.5 resolution ## ## hfx -> same recipie as above, expect for x-dimension -## hfbasin -> summed line of hfy in each basin -## +## hfbasin -> summed line of hfy in each basin +## ## CMIP variables that will NOT be provided: ## ## hfbasinpmadv, hfbasinpsmadv, hfbasinpmdiff, hfbasinpadv ## (We advect the tracer with the residual mean velocity; individual terms cannot be diagnosed) -## +## ## htovgyre, htovovrt, sltovgyre, sltovovrt ## (Code for offline calculation not ready.) ## @@ -59,11 +59,11 @@ def heat_trans_by_basin(x,mask=None,lat=None,minlat=None): def main(args): nc_misval = 1.e20 #-- Define Regions and their associated masks - # Note: The Atlantic should include other smaller bays/seas that are + # Note: The Atlantic should include other smaller bays/seas that are # included in the definition used in meridional_overturning.py - + region = np.array(['atlantic_arctic_ocean','indian_pacific_ocean','global_ocean']) - + #-- Read basin masks f_basin = nc.Dataset(args.basinfile) basin_code = f_basin.variables['basin'][:] @@ -73,7 +73,7 @@ def main(args): indo_pacific_mask = basin_code * 0. indo_pacific_mask[(basin_code==3) | (basin_code==5)] = 1. - + #-- Read model data f_in = nc.Dataset(args.infile) @@ -81,152 +81,169 @@ def main(args): yq = f_in.variables['yq'] xh = f_in.variables['xh'] tax = f_in.variables['time'] - + #-- hfy - advective = f_in.variables['T_ady_2d'][:] - if 'ndiff_tracer_trans_y_2d_T' in f_in.variables.keys(): - diffusive = f_in.variables['ndiff_tracer_trans_y_2d_T'][:] + if 'T_ady_2d' in f_in.variables.keys(): + advective = f_in.variables['T_ady_2d'][:] + if 'ndiff_tracer_trans_y_2d_T' in f_in.variables.keys(): + diffusive = f_in.variables['ndiff_tracer_trans_y_2d_T'][:] + else: + print("Warning: diffusive term 'ndiff_tracer_trans_y_2d_T' not found. Check if this experiment is running with neutral diffusion.") + diffusive = advective * 0. + hfy = advective + diffusive + hfy.long_name = 'Ocean Heat Y Transport' + hfy.units = 'W' + hfy.cell_methods = 'yq:point xh:mean time:mean' + hfy.time_avg_info = 'average_T1,average_T2,average_DT' + hfy.standard_name = 'ocean_heat_y_transport' + do_hfy = True else: - print("Warning: diffusive term 'ndiff_tracer_trans_y_2d_T' not found. Check if this experiment is running with neutral diffusion.") - diffusive = advective * 0. - hfy = advective + diffusive - hfy.long_name = 'Ocean Heat Y Transport' - hfy.units = 'W' - hfy.cell_methods = 'yq:point xh:mean time:mean' - hfy.time_avg_info = 'average_T1,average_T2,average_DT' - hfy.standard_name = 'ocean_heat_y_transport' + do_hfy = False #-- hfx - advective = f_in.variables['T_adx_2d'][:] - if 'ndiff_tracer_trans_x_2d_T' in f_in.variables.keys(): - diffusive = f_in.variables['ndiff_tracer_trans_x_2d_T'][:] + if 'T_adx_2d' in f_in.variables.keys(): + advective = f_in.variables['T_adx_2d'][:] + if 'ndiff_tracer_trans_x_2d_T' in f_in.variables.keys(): + diffusive = f_in.variables['ndiff_tracer_trans_x_2d_T'][:] + else: + print("Warning: diffusive term 'ndiff_tracer_trans_x_2d_T' not found. Check if this experiment is running with neutral diffusion.") + diffusive = advective * 0. + hfx = advective + diffusive + hfx.long_name = 'Ocean Heat X Transport' + hfx.units = 'W' + hfx.cell_methods = 'yh:mean xq:point time:mean' + hfx.time_avg_info = 'average_T1,average_T2,average_DT' + hfx.standard_name = 'ocean_heat_x_transport' + do_hfx = True else: - print("Warning: diffusive term 'ndiff_tracer_trans_x_2d_T' not found. Check if this experiment is running with neutral diffusion.") - diffusive = advective * 0. - hfx = advective + diffusive - hfx.long_name = 'Ocean Heat X Transport' - hfx.units = 'W' - hfx.cell_methods = 'yh:mean xq:point time:mean' - hfx.time_avg_info = 'average_T1,average_T2,average_DT' - hfx.standard_name = 'ocean_heat_x_transport' - - #-- hfbasin - hfbasin = np.ma.ones((len(tax),3,len(yq)))*0. - hfbasin[:,0,:] = heat_trans_by_basin(hfy,mask=atlantic_arctic_mask) - hfbasin[:,1,:] = heat_trans_by_basin(hfy,mask=indo_pacific_mask,minlat=-34,lat=yq) - hfbasin[:,2,:] = heat_trans_by_basin(hfy) - hfbasin[hfbasin.mask] = nc_misval - hfbasin = np.ma.array(hfbasin,fill_value=nc_misval) - hfbasin.long_name = 'Northward Ocean Heat Transport' - hfbasin.units = 'W' - hfbasin.coordinates = 'region' - hfbasin.cell_methods = 'yq:point time:mean' - hfbasin.comment = 'Indo-Pacific heat transport begins at 34 S' - hfbasin.time_avg_info = 'average_T1,average_T2,average_DT' - hfbasin.standard_name = 'northward_ocean_heat_transport' - - #-- Read time bounds + do_hfx = False + + #-- hfbasin + if do_hfy: + hfbasin = np.ma.ones((len(tax),3,len(yq)))*0. + hfbasin[:,0,:] = heat_trans_by_basin(hfy,mask=atlantic_arctic_mask) + hfbasin[:,1,:] = heat_trans_by_basin(hfy,mask=indo_pacific_mask,minlat=-34,lat=yq) + hfbasin[:,2,:] = heat_trans_by_basin(hfy) + hfbasin[hfbasin.mask] = nc_misval + hfbasin = np.ma.array(hfbasin,fill_value=nc_misval) + hfbasin.long_name = 'Northward Ocean Heat Transport' + hfbasin.units = 'W' + hfbasin.coordinates = 'region' + hfbasin.cell_methods = 'yq:point time:mean' + hfbasin.comment = 'Indo-Pacific heat transport begins at 34 S' + hfbasin.time_avg_info = 'average_T1,average_T2,average_DT' + hfbasin.standard_name = 'northward_ocean_heat_transport' + do_hfbasin = True + else: + do_hfbasin = False + + #-- Read time bounds nv = f_in.variables['nv'] average_T1 = f_in.variables['average_T1'] average_T2 = f_in.variables['average_T2'] average_DT = f_in.variables['average_DT'] time_bnds = f_in.variables['time_bnds'] - - #-- Generate output filename - if args.outfile is None: - if hasattr(f_in,'filename'): - args.outfile = f_in.filename - else: - args.outfile = os.path.basename(args.infile) - args.outfile = args.outfile.split('.') - args.outfile[-2] = args.outfile[-2]+'_refined' - args.outfile = '.'.join(args.outfile) - - if args.refineDiagDir is not None: - args.outfile = args.refineDiagDir + '/' + args.outfile - - #-- Write output file - try: - os.remove(args.outfile) - except: - pass - - if os.path.exists(args.outfile): - raise IOError('Output netCDF file already exists.') - exit(1) - - f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') - f_out.setncatts(f_in.__dict__) - f_out.filename = os.path.basename(args.outfile) - f_out.delncattr('associated_files') # not needed for these fields - - time_dim = f_out.createDimension('time', size=None) - basin_dim = f_out.createDimension('basin', size=3) - strlen_dim = f_out.createDimension('strlen', size=21) - yq_dim = f_out.createDimension('yq', size=len(yq[:])) - xh_dim = f_out.createDimension('xh', size=len(xh[:])) - nv_dim = f_out.createDimension('nv', size=len(nv[:])) - - time_out = f_out.createVariable('time', np.float64, ('time')) - yq_out = f_out.createVariable('yq', np.float64, ('yq')) - region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) - xh_out = f_out.createVariable('xh', np.float64, ('xh')) - nv_out = f_out.createVariable('nv', np.float64, ('nv')) - - hfy_out = f_out.createVariable('hfy', np.float32, ('time', 'yq', 'xh'), fill_value=1.e20) - hfy_out.missing_value = 1.e20 - - hfx_out = f_out.createVariable('hfx', np.float32, ('time', 'yq', 'xh'), fill_value=1.e20) - hfx_out.missing_value = 1.e20 - - hfbasin_out = f_out.createVariable('hfbasin', np.float32, ('time', 'basin', 'yq'), fill_value=1.e20) - hfbasin_out.missing_value = 1.e20 - - average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) - average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) - average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) - time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) - - time_out.setncatts(tax.__dict__) - yq_out.setncatts(yq.__dict__) - xh_out.setncatts(xh.__dict__) - nv_out.setncatts(nv.__dict__) - - for k in hfy.__dict__.keys(): - if k[0] != '_': hfy_out.setncattr(k,hfy.__dict__[k]) - - for k in hfx.__dict__.keys(): - if k[0] != '_': hfx_out.setncattr(k,hfx.__dict__[k]) - - for k in hfbasin.__dict__.keys(): - if k[0] != '_': hfbasin_out.setncattr(k,hfbasin.__dict__[k]) - - region_out.setncattr('standard_name','region') - - average_T1_out.setncatts(average_T1.__dict__) - average_T2_out.setncatts(average_T2.__dict__) - average_DT_out.setncatts(average_DT.__dict__) - time_bnds_out.setncatts(time_bnds.__dict__) - - time_out[:] = np.array(tax[:]) - yq_out[:] = np.array(yq[:]) - xh_out[:] = np.array(xh[:]) - nv_out[:] = np.array(nv[:]) - - hfy_out[:] = np.ma.array(hfy[:]) - hfx_out[:] = np.ma.array(hfx[:]) - hfbasin_out[:] = np.ma.array(hfbasin[:]) - - average_T1_out[:] = average_T1[:] - average_T2_out[:] = average_T2[:] - average_DT_out[:] = average_DT[:] - time_bnds_out[:] = time_bnds[:] - - region_out[:] = nc.stringtochar(region) - - f_out.close() - - exit(0) + + if any([do_hfx,do_hfy,do_hfbasin]): + #-- Generate output filename + if args.outfile is None: + if hasattr(f_in,'filename'): + args.outfile = f_in.filename + else: + args.outfile = os.path.basename(args.infile) + args.outfile = args.outfile.split('.') + args.outfile[-2] = args.outfile[-2]+'_refined' + args.outfile = '.'.join(args.outfile) + + if args.refineDiagDir is not None: + args.outfile = args.refineDiagDir + '/' + args.outfile + + #-- Write output file + try: + os.remove(args.outfile) + except: + pass + + if os.path.exists(args.outfile): + raise IOError('Output netCDF file already exists.') + exit(1) + + f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') + f_out.setncatts(f_in.__dict__) + f_out.filename = os.path.basename(args.outfile) + f_out.delncattr('associated_files') # not needed for these fields + + time_dim = f_out.createDimension('time', size=None) + basin_dim = f_out.createDimension('basin', size=3) + strlen_dim = f_out.createDimension('strlen', size=21) + yq_dim = f_out.createDimension('yq', size=len(yq[:])) + xh_dim = f_out.createDimension('xh', size=len(xh[:])) + nv_dim = f_out.createDimension('nv', size=len(nv[:])) + + time_out = f_out.createVariable('time', np.float64, ('time')) + yq_out = f_out.createVariable('yq', np.float64, ('yq')) + region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) + xh_out = f_out.createVariable('xh', np.float64, ('xh')) + nv_out = f_out.createVariable('nv', np.float64, ('nv')) + + if do_hfy: + hfy_out = f_out.createVariable('hfy', np.float32, ('time', 'yq', 'xh'), fill_value=1.e20) + hfy_out.missing_value = 1.e20 + for k in hfy.__dict__.keys(): + if k[0] != '_': hfy_out.setncattr(k,hfy.__dict__[k]) + + if do_hfx: + hfx_out = f_out.createVariable('hfx', np.float32, ('time', 'yq', 'xh'), fill_value=1.e20) + hfx_out.missing_value = 1.e20 + for k in hfx.__dict__.keys(): + if k[0] != '_': hfx_out.setncattr(k,hfx.__dict__[k]) + + if do_hfbasin: + hfbasin_out = f_out.createVariable('hfbasin', np.float32, ('time', 'basin', 'yq'), fill_value=1.e20) + hfbasin_out.missing_value = 1.e20 + for k in hfbasin.__dict__.keys(): + if k[0] != '_': hfbasin_out.setncattr(k,hfbasin.__dict__[k]) + + average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) + average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) + average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) + time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) + + time_out.setncatts(tax.__dict__) + yq_out.setncatts(yq.__dict__) + xh_out.setncatts(xh.__dict__) + nv_out.setncatts(nv.__dict__) + + region_out.setncattr('standard_name','region') + + average_T1_out.setncatts(average_T1.__dict__) + average_T2_out.setncatts(average_T2.__dict__) + average_DT_out.setncatts(average_DT.__dict__) + time_bnds_out.setncatts(time_bnds.__dict__) + + time_out[:] = np.array(tax[:]) + yq_out[:] = np.array(yq[:]) + xh_out[:] = np.array(xh[:]) + nv_out[:] = np.array(nv[:]) + + if do_hfy: hfy_out[:] = np.ma.array(hfy[:]) + if do_hfx: hfx_out[:] = np.ma.array(hfx[:]) + if do_hfbasin: hfbasin_out[:] = np.ma.array(hfbasin[:]) + + average_T1_out[:] = average_T1[:] + average_T2_out[:] = average_T2[:] + average_DT_out[:] = average_DT[:] + time_bnds_out[:] = time_bnds[:] + + region_out[:] = nc.stringtochar(region) + + f_out.close() + exit(0) + + else: + print('RefineDiag for ocean_month yielded no output.') + exit(1) + if __name__ == '__main__': run() diff --git a/tools/analysis/refineDiag_ocean_month_rho2.py b/tools/analysis/refineDiag_ocean_month_rho2.py index 84002ec12b..6c7c8ef22d 100755 --- a/tools/analysis/refineDiag_ocean_month_rho2.py +++ b/tools/analysis/refineDiag_ocean_month_rho2.py @@ -14,7 +14,7 @@ ## Variables we intend to provide in rho-coordinates: ## (potenital density referenced to 2000 m) ## -## msftyrho -> vmo +## msftyrho -> vmo ## msftyrhompa -> vhGM * applies only to 0.5 resolution ## ##-- @@ -30,11 +30,11 @@ def run(): def main(args): #-- Define Regions and their associated masks - # Note: The Atlantic should include other smaller bays/seas that are + # Note: The Atlantic should include other smaller bays/seas that are # included in the definition used in meridional_overturning.py - + region = np.array(['atlantic_arctic_ocean','indian_pacific_ocean','global_ocean']) - + #-- Read basin masks f_basin = nc.Dataset(args.basinfile) basin_code = f_basin.variables['basin'][:] @@ -44,7 +44,7 @@ def main(args): indo_pacific_mask = basin_code * 0. indo_pacific_mask[(basin_code==3) | (basin_code==5)] = 1. - + #-- Read model data f_in = nc.Dataset(args.infile) @@ -53,138 +53,149 @@ def main(args): rho2_l = f_in.variables['rho2_l'] rho2_i = f_in.variables['rho2_i'] tax = f_in.variables['time'] - + #-- msftyrho - varname = 'vmo' - msftyrho = np.ma.ones((len(tax),3,len(rho2_i),len(yq)))*0. - msftyrho[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) - msftyrho[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) - msftyrho[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) - msftyrho[msftyrho.mask] = 1.e20 - msftyrho = np.ma.array(msftyrho,fill_value=1.e20) - msftyrho.long_name = 'Ocean Y Overturning Mass Streamfunction' - msftyrho.units = 'kg s-1' - msftyrho.coordinates = 'region' - msftyrho.cell_methods = 'rho2_i:point yq:point time:mean' - msftyrho.time_avg_info = 'average_T1,average_T2,average_DT' - msftyrho.standard_name = 'ocean_y_overturning_mass_streamfunction' + if 'vmo' in f_in.variables.keys(): + varname = 'vmo' + msftyrho = np.ma.ones((len(tax),3,len(rho2_i),len(yq)))*0. + msftyrho[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) + msftyrho[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) + msftyrho[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) + msftyrho[msftyrho.mask] = 1.e20 + msftyrho = np.ma.array(msftyrho,fill_value=1.e20) + msftyrho.long_name = 'Ocean Y Overturning Mass Streamfunction' + msftyrho.units = 'kg s-1' + msftyrho.coordinates = 'region' + msftyrho.cell_methods = 'rho2_i:point yq:point time:mean' + msftyrho.time_avg_info = 'average_T1,average_T2,average_DT' + msftyrho.standard_name = 'ocean_y_overturning_mass_streamfunction' + do_msftyrho = True + else: + do_msftyrho = False #-- msftyrhompa - varname = 'vhGM' - msftyrhompa = np.ma.ones((len(tax),3,len(rho2_i),len(yq)))*0. - msftyrhompa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) - msftyrhompa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) - msftyrhompa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) - msftyrhompa[msftyrhompa.mask] = 1.e20 - msftyrhompa = np.ma.array(msftyrhompa,fill_value=1.e20) - msftyrhompa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' - msftyrhompa.units = 'kg s-1' - msftyrhompa.coordinates = 'region' - msftyrhompa.cell_methods = 'rho2_i:point yq:point time:mean' - msftyrhompa.time_avg_info = 'average_T1,average_T2,average_DT' - msftyrhompa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ - 'mesoscale_advection' - - - #-- Read time bounds + if 'vhGM' in f_in.variables.keys(): + varname = 'vhGM' + msftyrhompa = np.ma.ones((len(tax),3,len(rho2_i),len(yq)))*0. + msftyrhompa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) + msftyrhompa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) + msftyrhompa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) + msftyrhompa[msftyrhompa.mask] = 1.e20 + msftyrhompa = np.ma.array(msftyrhompa,fill_value=1.e20) + msftyrhompa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' + msftyrhompa.units = 'kg s-1' + msftyrhompa.coordinates = 'region' + msftyrhompa.cell_methods = 'rho2_i:point yq:point time:mean' + msftyrhompa.time_avg_info = 'average_T1,average_T2,average_DT' + msftyrhompa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ + 'mesoscale_advection' + do_msftyrhompa = True + else: + do_msftyrhompa = False + + #-- Read time bounds nv = f_in.variables['nv'] average_T1 = f_in.variables['average_T1'] average_T2 = f_in.variables['average_T2'] average_DT = f_in.variables['average_DT'] time_bnds = f_in.variables['time_bnds'] - - #-- Generate output filename - if args.outfile is None: - if hasattr(f_in,'filename'): - args.outfile = f_in.filename - else: - args.outfile = os.path.basename(args.infile) - args.outfile = args.outfile.split('.') - args.outfile[-2] = args.outfile[-2]+'_refined' - args.outfile = '.'.join(args.outfile) - - if args.refineDiagDir is not None: - args.outfile = args.refineDiagDir + '/' + args.outfile - - #-- Write output file - try: - os.remove(args.outfile) - except: - pass - - if os.path.exists(args.outfile): - raise IOError('Output netCDF file already exists.') - exit(1) - - f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') - f_out.setncatts(f_in.__dict__) - f_out.filename = os.path.basename(args.outfile) - f_out.delncattr('associated_files') # not needed for these fields - - time_dim = f_out.createDimension('time', size=None) - basin_dim = f_out.createDimension('basin', size=3) - strlen_dim = f_out.createDimension('strlen', size=21) - yq_dim = f_out.createDimension('yq', size=len(yq[:])) - rho2_l_dim = f_out.createDimension('rho2_l', size=len(rho2_l[:])) - rho2_i_dim = f_out.createDimension('rho2_i', size=len(rho2_i[:])) - nv_dim = f_out.createDimension('nv', size=len(nv[:])) - - time_out = f_out.createVariable('time', np.float64, ('time')) - yq_out = f_out.createVariable('yq', np.float64, ('yq')) - region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) - rho2_l_out = f_out.createVariable('rho2_l', np.float64, ('rho2_l')) - rho2_i_out = f_out.createVariable('rho2_i', np.float64, ('rho2_i')) - nv_out = f_out.createVariable('nv', np.float64, ('nv')) - - msftyrho_out = f_out.createVariable('msftyrho', np.float32, ('time', 'basin', 'rho2_i', 'yq'), fill_value=1.e20) - msftyrho_out.missing_value = 1.e20 - - msftyrhompa_out = f_out.createVariable('msftyrhompa', np.float32, ('time', 'basin', 'rho2_i', 'yq'), fill_value=1.e20) - msftyrhompa_out.missing_value = 1.e20 - - region_out.setncattr('standard_name','region') - - average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) - average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) - average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) - time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) - - time_out.setncatts(tax.__dict__) - yq_out.setncatts(yq.__dict__) - rho2_l_out.setncatts(rho2_l.__dict__) - rho2_i_out.setncatts(rho2_i.__dict__) - nv_out.setncatts(nv.__dict__) - - for k in msftyrho.__dict__.keys(): - if k[0] != '_': msftyrho_out.setncattr(k,msftyrho.__dict__[k]) - - for k in msftyrhompa.__dict__.keys(): - if k[0] != '_': msftyrhompa_out.setncattr(k,msftyrhompa.__dict__[k]) - - average_T1_out.setncatts(average_T1.__dict__) - average_T2_out.setncatts(average_T2.__dict__) - average_DT_out.setncatts(average_DT.__dict__) - time_bnds_out.setncatts(time_bnds.__dict__) - - time_out[:] = np.array(tax[:]) - yq_out[:] = np.array(yq[:]) - rho2_l_out[:] = np.array(rho2_l[:]) - rho2_i_out[:] = np.array(rho2_i[:]) - nv_out[:] = np.array(nv[:]) - - msftyrho_out[:] = np.ma.array(msftyrho[:]) - msftyrhompa_out[:] = np.ma.array(msftyrhompa[:]) - - average_T1_out[:] = average_T1[:] - average_T2_out[:] = average_T2[:] - average_DT_out[:] = average_DT[:] - time_bnds_out[:] = time_bnds[:] - - region_out[:] = nc.stringtochar(region) - - f_out.close() - - exit(0) + + if any([do_msftyrho,do_msftyrhompa]): + #-- Generate output filename + if args.outfile is None: + if hasattr(f_in,'filename'): + args.outfile = f_in.filename + else: + args.outfile = os.path.basename(args.infile) + args.outfile = args.outfile.split('.') + args.outfile[-2] = args.outfile[-2]+'_refined' + args.outfile = '.'.join(args.outfile) + + if args.refineDiagDir is not None: + args.outfile = args.refineDiagDir + '/' + args.outfile + + #-- Write output file + try: + os.remove(args.outfile) + except: + pass + + if os.path.exists(args.outfile): + raise IOError('Output netCDF file already exists.') + exit(1) + + f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') + f_out.setncatts(f_in.__dict__) + f_out.filename = os.path.basename(args.outfile) + f_out.delncattr('associated_files') # not needed for these fields + + time_dim = f_out.createDimension('time', size=None) + basin_dim = f_out.createDimension('basin', size=3) + strlen_dim = f_out.createDimension('strlen', size=21) + yq_dim = f_out.createDimension('yq', size=len(yq[:])) + rho2_l_dim = f_out.createDimension('rho2_l', size=len(rho2_l[:])) + rho2_i_dim = f_out.createDimension('rho2_i', size=len(rho2_i[:])) + nv_dim = f_out.createDimension('nv', size=len(nv[:])) + + time_out = f_out.createVariable('time', np.float64, ('time')) + yq_out = f_out.createVariable('yq', np.float64, ('yq')) + region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) + rho2_l_out = f_out.createVariable('rho2_l', np.float64, ('rho2_l')) + rho2_i_out = f_out.createVariable('rho2_i', np.float64, ('rho2_i')) + nv_out = f_out.createVariable('nv', np.float64, ('nv')) + + if do_msftyrho_out: + msftyrho_out = f_out.createVariable('msftyrho', np.float32, ('time', 'basin', 'rho2_i', 'yq'), fill_value=1.e20) + msftyrho_out.missing_value = 1.e20 + for k in msftyrho.__dict__.keys(): + if k[0] != '_': msftyrho_out.setncattr(k,msftyrho.__dict__[k]) + + if do_msftyrhompa: + msftyrhompa_out = f_out.createVariable('msftyrhompa', np.float32, ('time', 'basin', 'rho2_i', 'yq'), fill_value=1.e20) + msftyrhompa_out.missing_value = 1.e20 + for k in msftyrhompa.__dict__.keys(): + if k[0] != '_': msftyrhompa_out.setncattr(k,msftyrhompa.__dict__[k]) + + region_out.setncattr('standard_name','region') + + average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) + average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) + average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) + time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) + + time_out.setncatts(tax.__dict__) + yq_out.setncatts(yq.__dict__) + rho2_l_out.setncatts(rho2_l.__dict__) + rho2_i_out.setncatts(rho2_i.__dict__) + nv_out.setncatts(nv.__dict__) + + average_T1_out.setncatts(average_T1.__dict__) + average_T2_out.setncatts(average_T2.__dict__) + average_DT_out.setncatts(average_DT.__dict__) + time_bnds_out.setncatts(time_bnds.__dict__) + + time_out[:] = np.array(tax[:]) + yq_out[:] = np.array(yq[:]) + rho2_l_out[:] = np.array(rho2_l[:]) + rho2_i_out[:] = np.array(rho2_i[:]) + nv_out[:] = np.array(nv[:]) + + if do_msftyrho: msftyrho_out[:] = np.ma.array(msftyrho[:]) + if do_msftyrhompa: msftyrhompa_out[:] = np.ma.array(msftyrhompa[:]) + + average_T1_out[:] = average_T1[:] + average_T2_out[:] = average_T2[:] + average_DT_out[:] = average_DT[:] + time_bnds_out[:] = time_bnds[:] + + region_out[:] = nc.stringtochar(region) + + f_out.close() + exit(0) + + else: + print('RefineDiag for ocean_month_rho2 yielded no output.') + exit(1) if __name__ == '__main__': run() diff --git a/tools/analysis/refineDiag_ocean_month_z.py b/tools/analysis/refineDiag_ocean_month_z.py index 609c7a9b4e..620549d278 100755 --- a/tools/analysis/refineDiag_ocean_month_z.py +++ b/tools/analysis/refineDiag_ocean_month_z.py @@ -92,7 +92,7 @@ def main(args): tax = f_in.variables['time'] #-- Note: based on conversations with @adcroft, the overturning should be reported on the interfaces, z_i. - # Also, the nominal latitude is insufficient for the basin-average fields. Based on the methods in + # Also, the nominal latitude is insufficient for the basin-average fields. Based on the methods in # meridional_overturning.py, the latitude dimension should be: # # y = netCDF4.Dataset(cmdLineArgs.gridspec+'/ocean_hgrid.nc').variables['y'][::2,::2] @@ -101,75 +101,95 @@ def main(args): # The quanity 'yy' above is numerically-equivalent to 'yq' #-- msftyyz - varname = 'vmo' - msftyyz = np.ma.ones((len(tax),3,len(z_i),len(yq)))*0. - msftyyz[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) - msftyyz[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) - msftyyz[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) - msftyyz[msftyyz.mask] = nc_misval - msftyyz = np.ma.array(msftyyz,fill_value=nc_misval) - msftyyz.long_name = 'Ocean Y Overturning Mass Streamfunction' - msftyyz.units = 'kg s-1' - msftyyz.coordinates = 'region' - msftyyz.cell_methods = 'z_i:point yq:point time:mean' - msftyyz.time_avg_info = 'average_T1,average_T2,average_DT' - msftyyz.standard_name = 'ocean_y_overturning_mass_streamfunction' + if 'vmo' in f_in.variables.keys(): + varname = 'vmo' + msftyyz = np.ma.ones((len(tax),3,len(z_i),len(yq)))*0. + msftyyz[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) + msftyyz[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) + msftyyz[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) + msftyyz[msftyyz.mask] = nc_misval + msftyyz = np.ma.array(msftyyz,fill_value=nc_misval) + msftyyz.long_name = 'Ocean Y Overturning Mass Streamfunction' + msftyyz.units = 'kg s-1' + msftyyz.coordinates = 'region' + msftyyz.cell_methods = 'z_i:point yq:point time:mean' + msftyyz.time_avg_info = 'average_T1,average_T2,average_DT' + msftyyz.standard_name = 'ocean_y_overturning_mass_streamfunction' + do_msftyyz = True + else: + do_msftyyz = False #-- msftyzmpa - varname = 'vhGM' - msftyzmpa = np.ma.ones((len(tax),3,len(z_i),len(yq)))*0. - msftyzmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) - msftyzmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) - msftyzmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) - msftyzmpa[msftyzmpa.mask] = nc_misval - msftyzmpa = np.ma.array(msftyzmpa,fill_value=nc_misval) - msftyzmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' - msftyzmpa.units = 'kg s-1' - msftyzmpa.coordinates = 'region' - msftyzmpa.cell_methods = 'z_i:point yq:point time:mean' - msftyzmpa.time_avg_info = 'average_T1,average_T2,average_DT' - msftyzmpa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ - 'mesoscale_advection' + if 'vhGM' in f_in.variables.keys(): + varname = 'vhGM' + msftyzmpa = np.ma.ones((len(tax),3,len(z_i),len(yq)))*0. + msftyzmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) + msftyzmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) + msftyzmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) + msftyzmpa[msftyzmpa.mask] = nc_misval + msftyzmpa = np.ma.array(msftyzmpa,fill_value=nc_misval) + msftyzmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized mesoscale advection' + msftyzmpa.units = 'kg s-1' + msftyzmpa.coordinates = 'region' + msftyzmpa.cell_methods = 'z_i:point yq:point time:mean' + msftyzmpa.time_avg_info = 'average_T1,average_T2,average_DT' + msftyzmpa.standard_name = 'ocean_y_overturning_mass_streamfunction_due_to_parameterized_'+\ + 'mesoscale_advection' + do_msftyzmpa = True + else: + do_msftyzmpa = False #-- msftyzsmpa - varname = 'vhml' - msftyzsmpa = np.ma.ones((len(tax),3,len(z_i),len(yq)))*0. - msftyzsmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) - msftyzsmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) - msftyzsmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) - msftyzsmpa[msftyzsmpa.mask] = nc_misval - msftyzsmpa = np.ma.array(msftyzsmpa,fill_value=nc_misval) - msftyzsmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized submesoscale advection' - msftyzsmpa.units = 'kg s-1' - msftyzsmpa.coordinates = 'region' - msftyzsmpa.cell_methods = 'z_i:point yq:point time:mean' - msftyzsmpa.time_avg_info = 'average_T1,average_T2,average_DT' - msftyzsmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ - 'submesoscale_advection' + if 'vhml' in f_in.variables.keys(): + varname = 'vhml' + msftyzsmpa = np.ma.ones((len(tax),3,len(z_i),len(yq)))*0. + msftyzsmpa[:,0,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=atlantic_arctic_mask) + msftyzsmpa[:,1,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:],mask=indo_pacific_mask) + msftyzsmpa[:,2,:,:] = m6toolbox.moc_maskedarray(f_in.variables[varname][:]) + msftyzsmpa[msftyzsmpa.mask] = nc_misval + msftyzsmpa = np.ma.array(msftyzsmpa,fill_value=nc_misval) + msftyzsmpa.long_name = 'ocean Y overturning mass streamfunction due to parameterized submesoscale advection' + msftyzsmpa.units = 'kg s-1' + msftyzsmpa.coordinates = 'region' + msftyzsmpa.cell_methods = 'z_i:point yq:point time:mean' + msftyzsmpa.time_avg_info = 'average_T1,average_T2,average_DT' + msftyzsmpa.standard_name = 'ocean_meridional_overturning_mass_streamfunction_due_to_parameterized_'+\ + 'submesoscale_advection' + do_msftyzsmpa = True + else: + do_msftyzsmpa = False #-- wmo - varname = 'wmo' - wmo = calc_w_from_convergence(f_in.variables['umo'], f_in.variables['vmo']) - wmo[wmo.mask] = nc_misval - wmo = np.ma.array(wmo,fill_value=nc_misval) - wmo.long_name = 'Upward mass transport from resolved and parameterized advective transport' - wmo.units = 'kg s-1' - wmo.cell_methods = 'z_i:point xh:sum yh:sum time:mean' - wmo.time_avg_info = 'average_T1,average_T2,average_DT' - wmo.standard_name = 'upward_ocean_mass_transport' - wmo.cell_measures = 'area:areacello' + if all(x in f_in.variables.keys() for x in ['umo', 'vmo']): + varname = 'wmo' + wmo = calc_w_from_convergence(f_in.variables['umo'], f_in.variables['vmo']) + wmo[wmo.mask] = nc_misval + wmo = np.ma.array(wmo,fill_value=nc_misval) + wmo.long_name = 'Upward mass transport from resolved and parameterized advective transport' + wmo.units = 'kg s-1' + wmo.cell_methods = 'z_i:point xh:sum yh:sum time:mean' + wmo.time_avg_info = 'average_T1,average_T2,average_DT' + wmo.standard_name = 'upward_ocean_mass_transport' + wmo.cell_measures = 'area:areacello' + do_wmo = True + else: + do_wmo = False #-- mfo - _, mfo, straits = sum_transport_in_straits(args.straitdir, monthly_average = True) - #mfo[mfo.mask] = nc_misval - mfo = np.ma.array(mfo, fill_value=nc_misval) - strait_names = np.array( [strait.cmor_name for strait in straits] ) - mfo.long_name = 'Sea Water Transport' - mfo.units = 'kg s-1' - mfo.coordinates = 'strait' - mfo.cell_methods = 'time:mean' - mfo.time_avg_info = 'average_T1,average_T2,average_DT' - mfo.standard_name = 'sea_water_transport_across_line' + try: + _, mfo, straits = sum_transport_in_straits(args.straitdir, monthly_average = True) + #mfo[mfo.mask] = nc_misval + mfo = np.ma.array(mfo, fill_value=nc_misval) + strait_names = np.array( [strait.cmor_name for strait in straits] ) + mfo.long_name = 'Sea Water Transport' + mfo.units = 'kg s-1' + mfo.coordinates = 'strait' + mfo.cell_methods = 'time:mean' + mfo.time_avg_info = 'average_T1,average_T2,average_DT' + mfo.standard_name = 'sea_water_transport_across_line' + do_mfo = True + except: + do_mfo = False #-- Read time bounds nv = f_in.variables['nv'] @@ -178,129 +198,136 @@ def main(args): average_DT = f_in.variables['average_DT'] time_bnds = f_in.variables['time_bnds'] - #-- Generate output filename - if args.outfile is None: - if hasattr(f_in,'filename'): - args.outfile = f_in.filename - else: - args.outfile = os.path.basename(args.infile) - args.outfile = args.outfile.split('.') - args.outfile[-2] = args.outfile[-2]+'_refined' - args.outfile = '.'.join(args.outfile) + if any([do_msftyyz, do_msftyzsmpa, do_msftyzmpa, do_wmo, do_mfo]): + #-- Generate output filename + if args.outfile is None: + if hasattr(f_in,'filename'): + args.outfile = f_in.filename + else: + args.outfile = os.path.basename(args.infile) + args.outfile = args.outfile.split('.') + args.outfile[-2] = args.outfile[-2]+'_refined' + args.outfile = '.'.join(args.outfile) + + if args.refineDiagDir is not None: + args.outfile = args.refineDiagDir + '/' + args.outfile + + #-- Write output file + try: + os.remove(args.outfile) + except: + pass + + if os.path.exists(args.outfile): + raise IOError('Output netCDF file already exists.') + exit(1) + + f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') + f_out.setncatts(f_in.__dict__) + f_out.filename = os.path.basename(args.outfile) + + time_dim = f_out.createDimension('time', size=None) + basin_dim = f_out.createDimension('basin', size=3) + strait_dim = f_out.createDimension('strait', size=len(straits)) + strlen_dim = f_out.createDimension('strlen', size=31) + xh_dim = f_out.createDimension('xh', size=len(xh[:])) + yh_dim = f_out.createDimension('yh', size=len(yh[:])) + yq_dim = f_out.createDimension('yq', size=len(yq[:])) + z_l_dim = f_out.createDimension('z_l', size=len(z_l[:])) + z_i_dim = f_out.createDimension('z_i', size=len(z_i[:])) + nv_dim = f_out.createDimension('nv', size=len(nv[:])) + + time_out = f_out.createVariable('time', np.float64, ('time')) + xh_out = f_out.createVariable('xh', np.float64, ('xh')) + yh_out = f_out.createVariable('yh', np.float64, ('yh')) + yq_out = f_out.createVariable('yq', np.float64, ('yq')) + region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) + strait_out = f_out.createVariable('strait', 'c', ('strait', 'strlen')) + z_l_out = f_out.createVariable('z_l', np.float64, ('z_l')) + z_i_out = f_out.createVariable('z_i', np.float64, ('z_i')) + nv_out = f_out.createVariable('nv', np.float64, ('nv')) + + if do_msftyyz: + msftyyz_out = f_out.createVariable('msftyyz', np.float32, ('time', 'basin', 'z_i', 'yq'), fill_value=nc_misval) + msftyyz_out.missing_value = nc_misval + for k in msftyyz.__dict__.keys(): + if k[0] != '_': msftyyz_out.setncattr(k,msftyyz.__dict__[k]) + + if do_msftyzsmpa: + msftyzsmpa_out = f_out.createVariable('msftyzsmpa', np.float32, ('time', 'basin', 'z_i', 'yq'), fill_value=nc_misval) + msftyzsmpa_out.missing_value = nc_misval + for k in msftyzsmpa.__dict__.keys(): + if k[0] != '_': msftyzsmpa_out.setncattr(k,msftyzsmpa.__dict__[k]) + + if do_msftyzmpa: + msftyzmpa_out = f_out.createVariable('msftyzmpa', np.float32, ('time', 'basin', 'z_i', 'yq'), fill_value=nc_misval) + msftyzmpa_out.missing_value = nc_misval + for k in msftyzmpa.__dict__.keys(): + if k[0] != '_': msftyzmpa_out.setncattr(k,msftyzmpa.__dict__[k]) + + if do_wmo: + wmo_out = f_out.createVariable('wmo', np.float32, ('time', 'z_i', 'yh', 'xh'), fill_value=nc_misval) + wmo_out.missing_value = nc_misval + for k in wmo.__dict__.keys(): + if k[0] != '_': wmo_out.setncattr(k,wmo.__dict__[k]) + + if do_mfo: + mfo_out = f_out.createVariable('mfo', np.float32, ('time', 'strait'), fill_value=nc_misval) + mfo_out.missing_value = nc_misval + for k in mfo.__dict__.keys(): + if k[0] != '_': mfo_out.setncattr(k,mfo.__dict__[k]) + + average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) + average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) + average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) + time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) + + time_out.setncatts(tax.__dict__) + xh_out.setncatts(xh.__dict__) + yh_out.setncatts(yh.__dict__) + yq_out.setncatts(yq.__dict__) + z_l_out.setncatts(z_l.__dict__) + z_i_out.setncatts(z_i.__dict__) + nv_out.setncatts(nv.__dict__) + + region_out.setncattr('standard_name','region') + strait_out.setncattr('standard_name','region') + + average_T1_out.setncatts(average_T1.__dict__) + average_T2_out.setncatts(average_T2.__dict__) + average_DT_out.setncatts(average_DT.__dict__) + time_bnds_out.setncatts(time_bnds.__dict__) + + time_out[:] = np.array(tax[:]) + xh_out[:] = np.array(xh[:]) + yh_out[:] = np.array(yh[:]) + yq_out[:] = np.array(yq[:]) + z_l_out[:] = np.array(z_l[:]) + z_i_out[:] = np.array(z_i[:]) + nv_out[:] = np.array(nv[:]) + + if do_msftyyz: msftyyz_out[:] = np.ma.array(msftyyz[:]) + if do_msftyzsmpa: msftyzsmpa_out[:] = np.ma.array(msftyzsmpa[:]) + if do_msftyzmpa: msftyzmpa_out[:] = np.ma.array(msftyzmpa[:]) + if do_wmo: wmo_out[:] = np.ma.array(wmo[:]) + if do_mfo: mfo_out[:] = np.array(mfo[:]) + + average_T1_out[:] = average_T1[:] + average_T2_out[:] = average_T2[:] + average_DT_out[:] = average_DT[:] + time_bnds_out[:] = time_bnds[:] + + region_out[:] = nc.stringtochar(region) + strait_out[:] = nc.stringtochar(strait_names) + + f_out.close() + exit(0) + + else: + print('RefineDiag for ocean_month_rho2 yielded no output.') + exit(1) - if args.refineDiagDir is not None: - args.outfile = args.refineDiagDir + '/' + args.outfile - #-- Write output file - try: - os.remove(args.outfile) - except: - pass - - if os.path.exists(args.outfile): - raise IOError('Output netCDF file already exists.') - exit(1) - - f_out = nc.Dataset(args.outfile, 'w', format='NETCDF3_CLASSIC') - f_out.setncatts(f_in.__dict__) - f_out.filename = os.path.basename(args.outfile) - - time_dim = f_out.createDimension('time', size=None) - basin_dim = f_out.createDimension('basin', size=3) - strait_dim = f_out.createDimension('strait', size=len(straits)) - strlen_dim = f_out.createDimension('strlen', size=31) - xh_dim = f_out.createDimension('xh', size=len(xh[:])) - yh_dim = f_out.createDimension('yh', size=len(yh[:])) - yq_dim = f_out.createDimension('yq', size=len(yq[:])) - z_l_dim = f_out.createDimension('z_l', size=len(z_l[:])) - z_i_dim = f_out.createDimension('z_i', size=len(z_i[:])) - nv_dim = f_out.createDimension('nv', size=len(nv[:])) - - time_out = f_out.createVariable('time', np.float64, ('time')) - xh_out = f_out.createVariable('xh', np.float64, ('xh')) - yh_out = f_out.createVariable('yh', np.float64, ('yh')) - yq_out = f_out.createVariable('yq', np.float64, ('yq')) - region_out = f_out.createVariable('region', 'c', ('basin', 'strlen')) - strait_out = f_out.createVariable('strait', 'c', ('strait', 'strlen')) - z_l_out = f_out.createVariable('z_l', np.float64, ('z_l')) - z_i_out = f_out.createVariable('z_i', np.float64, ('z_i')) - nv_out = f_out.createVariable('nv', np.float64, ('nv')) - - msftyyz_out = f_out.createVariable('msftyyz', np.float32, ('time', 'basin', 'z_i', 'yq'), fill_value=nc_misval) - msftyyz_out.missing_value = nc_misval - - msftyzsmpa_out = f_out.createVariable('msftyzsmpa', np.float32, ('time', 'basin', 'z_i', 'yq'), fill_value=nc_misval) - msftyzsmpa_out.missing_value = nc_misval - - msftyzmpa_out = f_out.createVariable('msftyzmpa', np.float32, ('time', 'basin', 'z_i', 'yq'), fill_value=nc_misval) - msftyzmpa_out.missing_value = nc_misval - - wmo_out = f_out.createVariable('wmo', np.float32, ('time', 'z_i', 'yh', 'xh'), fill_value=nc_misval) - wmo_out.missing_value = nc_misval - - mfo_out = f_out.createVariable('mfo', np.float32, ('time', 'strait'), fill_value=nc_misval) - mfo_out.missing_value = nc_misval - - average_T1_out = f_out.createVariable('average_T1', np.float64, ('time')) - average_T2_out = f_out.createVariable('average_T2', np.float64, ('time')) - average_DT_out = f_out.createVariable('average_DT', np.float64, ('time')) - time_bnds_out = f_out.createVariable('time_bnds', np.float64, ('time', 'nv')) - - time_out.setncatts(tax.__dict__) - xh_out.setncatts(xh.__dict__) - yh_out.setncatts(yh.__dict__) - yq_out.setncatts(yq.__dict__) - z_l_out.setncatts(z_l.__dict__) - z_i_out.setncatts(z_i.__dict__) - nv_out.setncatts(nv.__dict__) - - for k in msftyyz.__dict__.keys(): - if k[0] != '_': msftyyz_out.setncattr(k,msftyyz.__dict__[k]) - - for k in msftyzsmpa.__dict__.keys(): - if k[0] != '_': msftyzsmpa_out.setncattr(k,msftyzsmpa.__dict__[k]) - - for k in msftyzmpa.__dict__.keys(): - if k[0] != '_': msftyzmpa_out.setncattr(k,msftyzmpa.__dict__[k]) - - for k in mfo.__dict__.keys(): - if k[0] != '_': mfo_out.setncattr(k,mfo.__dict__[k]) - - for k in wmo.__dict__.keys(): - if k[0] != '_': wmo_out.setncattr(k,wmo.__dict__[k]) - - region_out.setncattr('standard_name','region') - strait_out.setncattr('standard_name','region') - - average_T1_out.setncatts(average_T1.__dict__) - average_T2_out.setncatts(average_T2.__dict__) - average_DT_out.setncatts(average_DT.__dict__) - time_bnds_out.setncatts(time_bnds.__dict__) - - time_out[:] = np.array(tax[:]) - xh_out[:] = np.array(xh[:]) - yh_out[:] = np.array(yh[:]) - yq_out[:] = np.array(yq[:]) - z_l_out[:] = np.array(z_l[:]) - z_i_out[:] = np.array(z_i[:]) - nv_out[:] = np.array(nv[:]) - - msftyyz_out[:] = np.ma.array(msftyyz[:]) - msftyzsmpa_out[:] = np.ma.array(msftyzsmpa[:]) - msftyzmpa_out[:] = np.ma.array(msftyzmpa[:]) - wmo_out[:] = np.ma.array(wmo[:]) - mfo_out[:] = np.array(mfo[:]) - - average_T1_out[:] = average_T1[:] - average_T2_out[:] = average_T2[:] - average_DT_out[:] = average_DT[:] - time_bnds_out[:] = time_bnds[:] - - region_out[:] = nc.stringtochar(region) - strait_out[:] = nc.stringtochar(strait_names) - f_out.close() - - exit(0) if __name__ == '__main__': run() From 96a8e5f74ea996c32657cfccc07249ecfb254076 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Fri, 3 Nov 2017 19:01:19 -0400 Subject: [PATCH 77/89] Fixed typo in refineDiag_ocean_month_rho2.py - replaced do_msftyrho_out with do_msftyrho --- tools/analysis/refineDiag_ocean_month_rho2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/analysis/refineDiag_ocean_month_rho2.py b/tools/analysis/refineDiag_ocean_month_rho2.py index 6c7c8ef22d..5f339435ec 100755 --- a/tools/analysis/refineDiag_ocean_month_rho2.py +++ b/tools/analysis/refineDiag_ocean_month_rho2.py @@ -144,7 +144,7 @@ def main(args): rho2_i_out = f_out.createVariable('rho2_i', np.float64, ('rho2_i')) nv_out = f_out.createVariable('nv', np.float64, ('nv')) - if do_msftyrho_out: + if do_msftyrho: msftyrho_out = f_out.createVariable('msftyrho', np.float32, ('time', 'basin', 'rho2_i', 'yq'), fill_value=1.e20) msftyrho_out.missing_value = 1.e20 for k in msftyrho.__dict__.keys(): From fad8ff2c719f067c7d55a1df59d053cbb66db8ef Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Thu, 9 Nov 2017 13:36:27 -0500 Subject: [PATCH 78/89] MOM6: +Corrected available_diags file frazil entries Updated the version of MOM6 to the latest in dev/gfdl, which includes some changes to the entries for frazil-related variables in several available_diags files. All answers are bitwise identical. --- ocean_only/global_ALE/layer/available_diags.000000 | 8 ++++---- ocean_only/global_ALE/z/available_diags.000000 | 8 ++++---- src/MOM6 | 2 +- src/SIS2 | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 6e3b5b5fdf..efb6534dac 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -2119,19 +2119,19 @@ "ocean_model", "frazil_heat_tendency" [Used] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean area:mean + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "frazil_heat_tendency" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean area:mean + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "frazil_heat_tendency_2d" [Used] ! long_name: Depth integrated heat tendency due to frazil formation ! units: W m-2 diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 123bf47185..121a24a02b 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -2369,19 +2369,19 @@ "ocean_model", "frazil_heat_tendency" [Used] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean zl:mean area:mean + ! cell_methods: xh:mean yh:mean zl:sum area:mean "ocean_model", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: zl:mean + ! cell_methods: zl:sum "ocean_model_z", "frazil_heat_tendency" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: xh:mean yh:mean z_l:mean area:mean + ! cell_methods: xh:mean yh:mean z_l:sum area:mean "ocean_model_z", "frazil_heat_tendency_xyave" [Unused] ! long_name: Heat tendency due to frazil formation ! units: W m-2 - ! cell_methods: z_l:mean + ! cell_methods: z_l:sum "ocean_model", "frazil_heat_tendency_2d" [Used] ! long_name: Depth integrated heat tendency due to frazil formation ! units: W m-2 diff --git a/src/MOM6 b/src/MOM6 index 46a332642f..7cc338d18d 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 46a332642f2e03f6bb74608665c9e894572b16d3 +Subproject commit 7cc338d18da58de8b3435319c7690010a3d0bac7 diff --git a/src/SIS2 b/src/SIS2 index d57d276233..17245e81b2 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit d57d2762339896233d0deee9f5bdbeb618f99fe5 +Subproject commit 17245e81b26c95eff4cc4d26ec6347f9cea3e96d From 1f1d57c269236702f89911a56fcdf531e921ea9d Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Thu, 9 Nov 2017 15:20:21 -0500 Subject: [PATCH 79/89] +Geometric progression for ENERGYSAVEDAYS Switched to the version of the MOM6 that offers a geometric progression of times to save the ocean model statistics, including the new run-time parameter ENERGYSAVEDAYS_GEOMETRIC, which is now logged in the MOM_parameter_doc.all files for the coupled configurations. All solutions are bitwise identical. MOM6 commit NOAA-GFDL/MOM6@b30cc485f9b5ca7425301bd7187d26e3d60905d8 --- coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all | 4 ++++ .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 4 ++++ .../Concurrent_ice_1deg/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 4 ++++ .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 4 ++++ land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all | 4 ++++ src/MOM6 | 2 +- 12 files changed, 45 insertions(+), 1 deletion(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index 18e7c1b4fc..e607bb3ce2 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -1710,6 +1710,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "B" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 0aa8a6dd91..64b61a67ec 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -1710,6 +1710,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "C" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 0aa8a6dd91..64b61a67ec 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -1710,6 +1710,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "C" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index caf8fa8d64..8407307220 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1710,6 +1710,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "C" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is 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 75caa5bb53..923e32ebf0 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 @@ -1999,6 +1999,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.5 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "C" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 521a2728c4..82462d7e11 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -2022,6 +2022,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "C" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 6fcf0ab77d..e9e64c5157 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -2045,6 +2045,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.5 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "C" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index b42b40eb5d..50807ee28c 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1724,6 +1724,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "B" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 1cb31244ba..c5034ff663 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1724,6 +1724,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "C" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 1cb31244ba..c5034ff663 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1724,6 +1724,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "C" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index 49f0c0a12b..3a9eba8559 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -1922,6 +1922,10 @@ TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0 ! The interval in units of TIMEUNIT between saves of the ! energies of the run and other globally summed diagnostics. +ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 + ! The starting interval in units of TIMEUNIT for the first call + ! to save the energies of the run and other globally summed diagnostics. + ! The interval increases by a factor of 2. after each call to write_energy. OCEAN_SURFACE_STAGGER = "C" ! default = "C" ! A case-insensitive character string to indicate the ! staggering of the surface velocity field that is diff --git a/src/MOM6 b/src/MOM6 index 7cc338d18d..b30cc485f9 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 7cc338d18da58de8b3435319c7690010a3d0bac7 +Subproject commit b30cc485f9b5ca7425301bd7187d26e3d60905d8 From 20b0aeb1a77d0df40b7b7627aa387cc22ab10622 Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Fri, 10 Nov 2017 09:45:04 -0500 Subject: [PATCH 80/89] +Added mean density and heat capacity diagnostics Added new diagnostics of the ocean heat capacity and reference density that can be output via the diag_manager. This changes the available_diags files, but all answers are bitwise identical. MOM6 commit NOAA-GFDL/MOM6@e30c9a0e7eb84f46f495fc405a6c4d1909283bba --- ocean_only/global_ALE/layer/available_diags.000000 | 14 ++++++++++++++ ocean_only/global_ALE/z/available_diags.000000 | 14 ++++++++++++++ src/MOM6 | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index efb6534dac..6ec82577a7 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -98,6 +98,20 @@ ! long_name: Sea Area Fraction ! units: % ! standard_name: SeaAreaFraction +"ocean_model", "Rho_0" [Unused] + ! long_name: mean ocean density used with the Boussinesq approximation + ! units: kg m-3 +"ocean_model", "rhozero" [Unused] + ! long_name: reference sea water density for boussinesq approximation + ! units: kg m-3 + ! standard_name: reference_sea_water_density_for_boussinesq_approximation +"ocean_model", "C_p" [Unused] + ! long_name: heat capacity of sea water + ! units: J kg-1 K-1 +"ocean_model", "cpocean" [Unused] + ! long_name: specific_heat_capacity_of_sea_water + ! units: J kg-1 K-1 + ! standard_name: specific_heat_capacity_of_sea_water "ocean_model", "volcello" [Unused] ! long_name: Ocean grid-cell volume ! units: m3 diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 121a24a02b..f140217e5e 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -98,6 +98,20 @@ ! long_name: Sea Area Fraction ! units: % ! standard_name: SeaAreaFraction +"ocean_model", "Rho_0" [Unused] + ! long_name: mean ocean density used with the Boussinesq approximation + ! units: kg m-3 +"ocean_model", "rhozero" [Unused] + ! long_name: reference sea water density for boussinesq approximation + ! units: kg m-3 + ! standard_name: reference_sea_water_density_for_boussinesq_approximation +"ocean_model", "C_p" [Unused] + ! long_name: heat capacity of sea water + ! units: J kg-1 K-1 +"ocean_model", "cpocean" [Unused] + ! long_name: specific_heat_capacity_of_sea_water + ! units: J kg-1 K-1 + ! standard_name: specific_heat_capacity_of_sea_water "ocean_model", "volcello" [Unused] ! long_name: Ocean grid-cell volume ! units: m3 diff --git a/src/MOM6 b/src/MOM6 index b30cc485f9..e30c9a0e7e 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit b30cc485f9b5ca7425301bd7187d26e3d60905d8 +Subproject commit e30c9a0e7eb84f46f495fc405a6c4d1909283bba From 22eb9a997e00af6555125be83f86eed2f047ca44 Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Mon, 13 Nov 2017 11:19:04 -0500 Subject: [PATCH 81/89] MOM6: +Made 4 commits to support barotropic tides Made a series of 4 commits to help support the use of MOM6 in idealized non-Boussinesq barotropic tide simulations. All answers in existing test cases are identical, but each of these 4 commits introduces changes to the MOM_parameter_doc files. MOM6 commit Hallberg-NOAA/MOM6@b5095611984a015865ffd03198e53d4338e54ea8 --- coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all | 4 ++++ .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 4 ++++ .../Concurrent_ice_1deg/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 4 ++++ .../Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 4 ++++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.short | 1 + ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short | 1 + ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all | 5 +++++ ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short | 1 + .../OM_360x320_C180/MOM_parameter_doc.all | 4 ++++ .../CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all | 1 + .../cooling_only/BML/MOM_parameter_doc.short | 1 + .../cooling_only/EPBL/MOM_parameter_doc.all | 1 + .../cooling_only/EPBL/MOM_parameter_doc.short | 1 + .../CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all | 1 + .../cooling_only/KPP/MOM_parameter_doc.short | 1 + .../CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all | 1 + .../CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short | 1 + .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all | 1 + .../CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short | 1 + .../CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all | 1 + .../CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short | 1 + .../skin_warming_wind/BML/MOM_parameter_doc.all | 1 + .../skin_warming_wind/BML/MOM_parameter_doc.short | 1 + .../skin_warming_wind/EPBL/MOM_parameter_doc.all | 1 + .../skin_warming_wind/EPBL/MOM_parameter_doc.short | 1 + .../skin_warming_wind/KPP/MOM_parameter_doc.all | 1 + .../skin_warming_wind/KPP/MOM_parameter_doc.short | 1 + .../CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all | 1 + .../CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.short | 1 + .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all | 1 + .../CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.short | 1 + .../CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all | 1 + .../CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.short | 1 + ocean_only/DOME/MOM_parameter_doc.all | 5 +++++ ocean_only/DOME/MOM_parameter_doc.short | 1 + ocean_only/Phillips_2layer/MOM_parameter_doc.all | 5 +++++ ocean_only/Phillips_2layer/MOM_parameter_doc.short | 1 + ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all | 1 + ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short | 1 + ocean_only/adjustment2d/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/adjustment2d/layer/MOM_parameter_doc.short | 1 + ocean_only/adjustment2d/rho/MOM_parameter_doc.all | 5 +++++ ocean_only/adjustment2d/rho/MOM_parameter_doc.short | 1 + ocean_only/adjustment2d/z/MOM_parameter_doc.all | 5 +++++ ocean_only/adjustment2d/z/MOM_parameter_doc.short | 1 + ocean_only/benchmark/MOM_parameter_doc.all | 5 +++++ ocean_only/benchmark/MOM_parameter_doc.short | 1 + ocean_only/circle_obcs/MOM_parameter_doc.all | 5 +++++ ocean_only/circle_obcs/MOM_parameter_doc.short | 1 + ocean_only/double_gyre/MOM_parameter_doc.all | 5 +++++ ocean_only/double_gyre/MOM_parameter_doc.short | 1 + ocean_only/external_gwave/MOM_parameter_doc.all | 5 +++++ ocean_only/external_gwave/MOM_parameter_doc.short | 1 + ocean_only/flow_downslope/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/flow_downslope/layer/MOM_parameter_doc.short | 1 + ocean_only/flow_downslope/rho/MOM_parameter_doc.all | 5 +++++ ocean_only/flow_downslope/rho/MOM_parameter_doc.short | 1 + ocean_only/flow_downslope/sigma/MOM_parameter_doc.all | 5 +++++ ocean_only/flow_downslope/sigma/MOM_parameter_doc.short | 1 + ocean_only/flow_downslope/z/MOM_parameter_doc.all | 5 +++++ ocean_only/flow_downslope/z/MOM_parameter_doc.short | 1 + ocean_only/global_ALE/hycom/MOM_parameter_doc.all | 4 ++++ ocean_only/global_ALE/layer/MOM_parameter_doc.all | 4 ++++ ocean_only/global_ALE/z/MOM_parameter_doc.all | 4 ++++ ocean_only/lock_exchange/MOM_parameter_doc.all | 5 +++++ ocean_only/lock_exchange/MOM_parameter_doc.short | 1 + ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all | 5 +++++ ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short | 1 + ocean_only/nonBous_global/MOM_parameter_doc.all | 7 ++++++- ocean_only/nonBous_global/MOM_parameter_doc.short | 6 +----- ocean_only/resting/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/resting/layer/MOM_parameter_doc.short | 1 + ocean_only/resting/z/MOM_parameter_doc.all | 5 +++++ ocean_only/resting/z/MOM_parameter_doc.short | 1 + ocean_only/seamount/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/seamount/layer/MOM_parameter_doc.short | 1 + ocean_only/seamount/rho/MOM_parameter_doc.all | 5 +++++ ocean_only/seamount/rho/MOM_parameter_doc.short | 1 + ocean_only/seamount/sigma/MOM_parameter_doc.all | 5 +++++ ocean_only/seamount/sigma/MOM_parameter_doc.short | 1 + ocean_only/seamount/z/MOM_parameter_doc.all | 5 +++++ ocean_only/seamount/z/MOM_parameter_doc.short | 1 + ocean_only/sloshing/layer/MOM_parameter_doc.all | 5 +++++ ocean_only/sloshing/layer/MOM_parameter_doc.short | 1 + ocean_only/sloshing/rho/MOM_parameter_doc.all | 5 +++++ ocean_only/sloshing/rho/MOM_parameter_doc.short | 1 + ocean_only/sloshing/z/MOM_parameter_doc.all | 5 +++++ ocean_only/sloshing/z/MOM_parameter_doc.short | 1 + ocean_only/torus_advection_test/MOM_parameter_doc.all | 5 +++++ ocean_only/torus_advection_test/MOM_parameter_doc.short | 1 + ocean_only/tracer_mixing/rho/MOM_parameter_doc.all | 5 +++++ ocean_only/tracer_mixing/rho/MOM_parameter_doc.short | 1 + ocean_only/tracer_mixing/z/MOM_parameter_doc.all | 5 +++++ ocean_only/tracer_mixing/z/MOM_parameter_doc.short | 1 + ocean_only/unit_tests/MOM_parameter_doc.all | 1 + ocean_only/unit_tests/MOM_parameter_doc.short | 1 + src/MOM6 | 2 +- 102 files changed, 260 insertions(+), 7 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index e607bb3ce2..d80bd69e12 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -1067,6 +1067,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 64b61a67ec..10002039a3 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -1063,6 +1063,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 64b61a67ec..10002039a3 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -1063,6 +1063,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 8407307220..1526e58775 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1063,6 +1063,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate 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 923e32ebf0..c1e19d7cae 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 @@ -1275,6 +1275,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 82462d7e11..b2d1157dac 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1290,6 +1290,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index e9e64c5157..d38c7e8f39 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1293,6 +1293,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 50807ee28c..89ff54d284 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -465,6 +465,7 @@ THICKNESS_CONFIG = "file" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1077,6 +1078,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short index 7dab5da967..9a986cae60 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.short @@ -188,6 +188,7 @@ THICKNESS_CONFIG = "file" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index c5034ff663..44f043202b 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -465,6 +465,7 @@ THICKNESS_CONFIG = "file" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1077,6 +1078,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short index d67e8ce4cc..b3aa35ceae 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.short @@ -188,6 +188,7 @@ THICKNESS_CONFIG = "file" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index c5034ff663..44f043202b 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -465,6 +465,7 @@ THICKNESS_CONFIG = "file" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1077,6 +1078,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short index d67e8ce4cc..b3aa35ceae 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.short @@ -188,6 +188,7 @@ THICKNESS_CONFIG = "file" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index 3a9eba8559..05372a28e0 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -1204,6 +1204,10 @@ BT_STRONG_DRAG = True ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate 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 aaa1a379f2..f9d2f7c0aa 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 @@ -403,6 +403,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short index b26295e97a..a633b9ea62 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short @@ -161,6 +161,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 5b3cfea140..865b652708 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 @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short index e16db304eb..352eafd77c 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 a12dd76dd4..5ebd7be049 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 @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short index 0edaada4c2..0264602f3d 100644 --- a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.short @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 53b254ad20..617718d123 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 @@ -403,6 +403,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short index 0c0fe4b5d0..588b46843c 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.short @@ -161,6 +161,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 5f280edce1..643a9f8924 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 @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short index 30d0978109..63831108b1 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.short @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 2ef389c77e..dce3191864 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 @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short index 311cfb4951..4b7fa2b517 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.short @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 d4f151039f..f9598c0c58 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 @@ -403,6 +403,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 06b6c49c26..2e0b1f3d13 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 @@ -161,6 +161,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 1687212f22..966f67a42e 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 @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 7a1d3e76f0..1108ece85e 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 @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 d938b1ce4f..b5cf5c260d 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 @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 ee7be697e2..f5351de611 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 @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 67b0d2ad83..511c86cdde 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 @@ -403,6 +403,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 1b9da4480c..0b20d10125 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 @@ -161,6 +161,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 939367f127..4500e0d263 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 @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 4f7538465c..bff518dc49 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 @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 1bf78a69c5..f427921d29 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 @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 e0a3ab6c5b..77606c88cd 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 @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "coord" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 82e0bb67bd..a4761d8feb 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -390,6 +390,7 @@ THICKNESS_CONFIG = "DOME" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -903,6 +904,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/DOME/MOM_parameter_doc.short b/ocean_only/DOME/MOM_parameter_doc.short index 1ee4ca6c95..08e80437b6 100644 --- a/ocean_only/DOME/MOM_parameter_doc.short +++ b/ocean_only/DOME/MOM_parameter_doc.short @@ -177,6 +177,7 @@ THICKNESS_CONFIG = "DOME" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index ee7b343019..85dc69942d 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -349,6 +349,7 @@ THICKNESS_CONFIG = "phillips" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -903,6 +904,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.short b/ocean_only/Phillips_2layer/MOM_parameter_doc.short index 9f8d9509b5..ee43683ebc 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.short +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.short @@ -167,6 +167,7 @@ THICKNESS_CONFIG = "phillips" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index f21bbabc73..3d76d6744d 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -495,6 +495,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short index a91b69a84a..743fede565 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.short @@ -185,6 +185,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 497016c315..83051d326d 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -411,6 +411,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -950,6 +951,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short index d29540c60b..4500ddfd49 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.short @@ -184,6 +184,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index d104812ece..c6a41b62d0 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -552,6 +552,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1093,6 +1094,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short index 2e908b7215..90227fa6e2 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.short @@ -234,6 +234,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index c4112b6d31..2fed6820ad 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -506,6 +506,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1047,6 +1048,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.short b/ocean_only/adjustment2d/z/MOM_parameter_doc.short index 4020444659..b7a64455ef 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.short +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.short @@ -210,6 +210,7 @@ THICKNESS_CONFIG = "adjustment2d" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 2136b4d051..65a05f5cb6 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -448,6 +448,7 @@ THICKNESS_CONFIG = "benchmark" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1022,6 +1023,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/benchmark/MOM_parameter_doc.short b/ocean_only/benchmark/MOM_parameter_doc.short index e0dc72ec23..825c24ca0c 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.short +++ b/ocean_only/benchmark/MOM_parameter_doc.short @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "benchmark" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 91550a932b..0afaf3dd12 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -410,6 +410,7 @@ THICKNESS_CONFIG = "circle_obcs" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -953,6 +954,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.short b/ocean_only/circle_obcs/MOM_parameter_doc.short index 58481feb4c..1b35e67124 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.short +++ b/ocean_only/circle_obcs/MOM_parameter_doc.short @@ -180,6 +180,7 @@ THICKNESS_CONFIG = "circle_obcs" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 6b5bbfcef2..4b9727a010 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -343,6 +343,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -828,6 +829,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/double_gyre/MOM_parameter_doc.short b/ocean_only/double_gyre/MOM_parameter_doc.short index 3f4cb96b7a..68b62f1114 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.short +++ b/ocean_only/double_gyre/MOM_parameter_doc.short @@ -145,6 +145,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 5e60ce6d00..8459a95bd0 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -409,6 +409,7 @@ THICKNESS_CONFIG = "external_gwave" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -931,6 +932,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/external_gwave/MOM_parameter_doc.short b/ocean_only/external_gwave/MOM_parameter_doc.short index 0e3749a5e6..11163a7bf2 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.short +++ b/ocean_only/external_gwave/MOM_parameter_doc.short @@ -178,6 +178,7 @@ THICKNESS_CONFIG = "external_gwave" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 5b1401cd1c..0811472fcb 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -422,6 +422,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -942,6 +943,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short index d4100300d1..bef6eed71a 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.short @@ -180,6 +180,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index f1ce1f4ff4..eb9eea7da5 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -563,6 +563,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1087,6 +1088,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short index 4e364b0bb9..8211b7b2f0 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.short @@ -230,6 +230,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 57671a8c61..604e8b4e2b 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -517,6 +517,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1041,6 +1042,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short index d13eb5fc11..22cf957248 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.short @@ -203,6 +203,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 33701de2d3..3e0cb53ac8 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -517,6 +517,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1041,6 +1042,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.short b/ocean_only/flow_downslope/z/MOM_parameter_doc.short index e24bee4c92..2fc589da64 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.short +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.short @@ -203,6 +203,7 @@ THICKNESS_CONFIG = "DOME2D" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 54d1c21648..f0fde57cae 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1307,6 +1307,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index c045b58bea..88aba68a62 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1156,6 +1156,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index d5fb01bd26..59a0f51552 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1259,6 +1259,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 2b79601623..ce1e16df03 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -409,6 +409,7 @@ THICKNESS_CONFIG = "lock_exchange" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -934,6 +935,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.short b/ocean_only/lock_exchange/MOM_parameter_doc.short index b1a6a4d699..0946de8c20 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.short +++ b/ocean_only/lock_exchange/MOM_parameter_doc.short @@ -171,6 +171,7 @@ THICKNESS_CONFIG = "lock_exchange" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the 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 65ec93aa2a..fe95389457 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -506,6 +506,7 @@ THICKNESS_CONFIG = "rossby_front" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1030,6 +1031,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short index dc794ab79f..80f316362e 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.short @@ -182,6 +182,7 @@ THICKNESS_CONFIG = "rossby_front" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index d9e6fa8c2e..385f1c2313 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -414,6 +414,7 @@ THICKNESS_CONFIG = "file" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -475,7 +476,7 @@ VELOCITY_CONFIG = "zero" ! default = "zero" ! rossby_front - a mixed layer front in thermal wind balance. ! soliton - Equatorial Rossby soliton. ! USER - call a user modified routine. -CONVERT_THICKNESS_UNITS = True ! [Boolean] default = False +CONVERT_THICKNESS_UNITS = True ! [Boolean] default = True ! If true, convert the thickness initial conditions from ! units of m to kg m-2 or vice versa, depending on whether ! BOUSSINESQ is defined. This does not apply if a restart @@ -1083,6 +1084,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.short b/ocean_only/nonBous_global/MOM_parameter_doc.short index 8ab3ab21af..3c5a039617 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.short +++ b/ocean_only/nonBous_global/MOM_parameter_doc.short @@ -186,6 +186,7 @@ THICKNESS_CONFIG = "file" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -230,11 +231,6 @@ TS_CONFIG = "file" ! ! USER - call a user modified routine. TS_FILE = "GOLD_IC.2010.11.15.nc" ! ! The initial condition file for temperature. -CONVERT_THICKNESS_UNITS = True ! [Boolean] default = False - ! If true, convert the thickness initial conditions from - ! units of m to kg m-2 or vice versa, depending on whether - ! BOUSSINESQ is defined. This does not apply if a restart - ! file is read. ! === module MOM_diag_mediator === diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 6e2984d833..4797bdf00e 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -411,6 +411,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -931,6 +932,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/resting/layer/MOM_parameter_doc.short b/ocean_only/resting/layer/MOM_parameter_doc.short index f632b96194..32c401d1c3 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.short +++ b/ocean_only/resting/layer/MOM_parameter_doc.short @@ -166,6 +166,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index 95f4ee47a2..4a1825672c 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -506,6 +506,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1030,6 +1031,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/resting/z/MOM_parameter_doc.short b/ocean_only/resting/z/MOM_parameter_doc.short index 575e16fe03..6731a20db2 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.short +++ b/ocean_only/resting/z/MOM_parameter_doc.short @@ -179,6 +179,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index dc77e6b45d..f1b6db7d97 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -437,6 +437,7 @@ THICKNESS_CONFIG = "seamount" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -962,6 +963,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.short b/ocean_only/seamount/layer/MOM_parameter_doc.short index 1eb078341b..e439f0b7ba 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.short +++ b/ocean_only/seamount/layer/MOM_parameter_doc.short @@ -176,6 +176,7 @@ THICKNESS_CONFIG = "seamount" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 2761e7fa3b..26ab28042d 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -578,6 +578,7 @@ THICKNESS_CONFIG = "seamount" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1105,6 +1106,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.short b/ocean_only/seamount/rho/MOM_parameter_doc.short index eaf32ed6bb..fa047fb326 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.short +++ b/ocean_only/seamount/rho/MOM_parameter_doc.short @@ -226,6 +226,7 @@ THICKNESS_CONFIG = "seamount" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index 42f7889f4b..b380a61b5e 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -532,6 +532,7 @@ THICKNESS_CONFIG = "seamount" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1059,6 +1060,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.short b/ocean_only/seamount/sigma/MOM_parameter_doc.short index 1704312fd3..358389af79 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.short +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.short @@ -202,6 +202,7 @@ THICKNESS_CONFIG = "seamount" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 2af581890d..659c164373 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -532,6 +532,7 @@ THICKNESS_CONFIG = "seamount" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1059,6 +1060,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/seamount/z/MOM_parameter_doc.short b/ocean_only/seamount/z/MOM_parameter_doc.short index c5cb14d98e..c5d01b26fb 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.short +++ b/ocean_only/seamount/z/MOM_parameter_doc.short @@ -202,6 +202,7 @@ THICKNESS_CONFIG = "seamount" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index a264fb92df..e8019fe580 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -414,6 +414,7 @@ THICKNESS_CONFIG = "sloshing" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -937,6 +938,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.short b/ocean_only/sloshing/layer/MOM_parameter_doc.short index 2121c880f6..685cd6cfed 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.short +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.short @@ -169,6 +169,7 @@ THICKNESS_CONFIG = "sloshing" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 8232f05525..8530767e44 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -555,6 +555,7 @@ THICKNESS_CONFIG = "sloshing" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1082,6 +1083,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.short b/ocean_only/sloshing/rho/MOM_parameter_doc.short index b72193827b..a9fe8e7f2f 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.short +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.short @@ -216,6 +216,7 @@ THICKNESS_CONFIG = "sloshing" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index 418516fc79..012b12b208 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -509,6 +509,7 @@ THICKNESS_CONFIG = "sloshing" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1036,6 +1037,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.short b/ocean_only/sloshing/z/MOM_parameter_doc.short index 144e91ba97..2da12fc92f 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.short +++ b/ocean_only/sloshing/z/MOM_parameter_doc.short @@ -192,6 +192,7 @@ THICKNESS_CONFIG = "sloshing" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index b330e45e31..2c6d11997a 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -436,6 +436,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -938,6 +939,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.short b/ocean_only/torus_advection_test/MOM_parameter_doc.short index 175d20bc69..f74257269e 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.short +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.short @@ -185,6 +185,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 015b74cd89..07619553db 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -552,6 +552,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1094,6 +1095,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short index 1f6f791b9b..6be721d93d 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.short @@ -230,6 +230,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index 26f6ad72da..2fe18660f8 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -506,6 +506,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the @@ -1048,6 +1049,10 @@ BT_STRONG_DRAG = False ! [Boolean] default = False ! with the barotropic time-step instead of implicit with ! the baroclinic time-step and dividing by the number of ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. CLIP_BT_VELOCITY = False ! [Boolean] default = False ! If true, limit any velocity components that exceed ! CFL_TRUNCATE. This should only be used as a desperate diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short index 592bd210b8..2312247495 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.short +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.short @@ -206,6 +206,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 00a3a771e8..383e1f7980 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -338,6 +338,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/ocean_only/unit_tests/MOM_parameter_doc.short b/ocean_only/unit_tests/MOM_parameter_doc.short index cd8dbb183d..3429e3a986 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.short +++ b/ocean_only/unit_tests/MOM_parameter_doc.short @@ -126,6 +126,7 @@ THICKNESS_CONFIG = "uniform" ! ! coord - determined by ALE coordinate. ! uniform - uniform thickness layers evenly distributed ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. ! DOME - use a slope and channel configuration for the ! DOME sill-overflow test case. ! ISOMIP - use a configuration for the diff --git a/src/MOM6 b/src/MOM6 index e30c9a0e7e..b509561198 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit e30c9a0e7eb84f46f495fc405a6c4d1909283bba +Subproject commit b5095611984a015865ffd03198e53d4338e54ea8 From ac583946917926cb1c436b0c70ca2445e578a5f7 Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Mon, 13 Nov 2017 11:28:28 -0500 Subject: [PATCH 82/89] MOM6: Made 4 commits to support barotropic tides Made a series of 4 commits to help support the use of MOM6 in idealized non-Boussinesq barotropic tide simulations, plus one follow up to correct trailing white space. All answers in existing test cases are identical, but each of these 4 commits introduces changes to the MOM_parameter_doc files. MOM6 commit Hallberg-NOAA/MOM6@87aeb27ef8490ae6caab357d2d8999eafdea2e4b --- src/MOM6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MOM6 b/src/MOM6 index b509561198..87aeb27ef8 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit b5095611984a015865ffd03198e53d4338e54ea8 +Subproject commit 87aeb27ef8490ae6caab357d2d8999eafdea2e4b From d6edb4d7f7507c6cf73e942725820d5f53972027 Mon Sep 17 00:00:00 2001 From: John Krasting Date: Wed, 15 Nov 2017 14:31:58 -0500 Subject: [PATCH 83/89] Transport analysis to work with monthly pp - Analysis script set to check for daily and now monthly pp output --- tools/analysis/section_transports.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/analysis/section_transports.py b/tools/analysis/section_transports.py index c6a8683ea0..ee75909385 100755 --- a/tools/analysis/section_transports.py +++ b/tools/analysis/section_transports.py @@ -43,6 +43,8 @@ def __init__(self, cmdLineArgs, section, var, label=None, ylim=None, zlim=None, rootGroup = netCDF4.MFDataset( cmdLineArgs.infile + section[k] + '/ts/120hr/5yr/*.'+var[k]+'.nc') elif os.path.isdir(cmdLineArgs.infile + section[k] + '/ts/daily/20yr'): rootGroup = netCDF4.MFDataset( cmdLineArgs.infile + section[k] + '/ts/daily/20yr/*.'+var[k]+'.nc') + elif os.path.isdir(cmdLineArgs.infile + section[k] + '/ts/monthly/5yr'): + rootGroup = netCDF4.MFDataset( cmdLineArgs.infile + section[k] + '/ts/monthly/5yr/*.'+var[k]+'.nc') else: print('Unable to find suitable trasport data in ts/120hr or ts/daily') if k == 0: total = numpy.ones(rootGroup.variables[var[k]][:].shape[0])*0.0 From 539a74d8d9bf25901749516d2c658468c192c65b Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Thu, 16 Nov 2017 13:42:36 -0500 Subject: [PATCH 84/89] MOM6: Converted outside land masker to use tiles. - Last merge updated MOM_parameter_doc.all for OBC experiments - NOAA-GFDL/MOM6@0c5347f Merge branch 'ESMG-user/ksh/open_bc' into dev/gfdl - NOAA-GFDL/MOM6@8100c20 Merge branch 'user/ksh/open_bc' of https://github.com/ESMG/MOM6 into ESMG-user/ksh/open_bc - NOAA-GFDL/MOM6@7e928b7 Setting stencil=2 causes trouble in ESMG seamount. - NOAA-GFDL/MOM6@3076ad2 Merge pull request #649 from NOAA-GFDL/OM4-maintenance - NOAA-GFDL/MOM6@03a7d4f Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6@276a372 Merge branch 'ashao-alt_T_S_for_remapping' into dev/gfdl - NOAA-GFDL/MOM6@f8a870d Merge branch 'alt_T_S_for_remapping' of https://github.com/ashao/MOM6 into ashao-alt_T_S_for_remapping - NOAA-GFDL/MOM6@dd72868 Converted outside land masker to use tiles. - NOAA-GFDL/MOM6@2e56f78 *Add stencil=2 to MOM_barotropic for Flather. - NOAA-GFDL/MOM6@8ea301c Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6@30ba8e2 Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6@8785a87 Failed Travis check with OOB because T/S may not be associated - NOAA-GFDL/MOM6@a0e6e30 Override T and S for remapped transport diagnostics - NOAA-GFDL/MOM6@a3acfed Merge pull request #642 from adcroft/fix-rho-coord-diagnostics - NOAA-GFDL/MOM6@abda61d Use correct number of layers in diagnostic rho coordinates - NOAA-GFDL/MOM6@6e11928 Adds a non-iterative form of build_rho_column() - NOAA-GFDL/MOM6@d2a2b8c Re-factored build_rho_column() - NOAA-GFDL/MOM6@5d8111a Set defaults in coord_rho.F90 - NOAA-GFDL/MOM6@2d7fc4c Merge pull request #640 from adcroft/fix-masked-diagnostics - NOAA-GFDL/MOM6@6a46f62 Turn off safety checks in MOM_diag_mediator.F90 - NOAA-GFDL/MOM6@ae47696 No longer set array values to missing_value - NOAA-GFDL/MOM6@6555ecc Removed masks from diag_type - NOAA-GFDL/MOM6@7c5219b Create and use masks in diagnostic axes groups - NOAA-GFDL/MOM6@2f2b6e4 Removed dummy missing_value from diag_masks_set() - NOAA-GFDL/MOM6@0a61469 Clean up weirdness that failed in static build. - NOAA-GFDL/MOM6@329c8bc *Masking of tangengial velocity outside OBCs. - NOAA-GFDL/MOM6@5991c83 Removed masking of areas in ocean_static.nc - NOAA-GFDL/MOM6@917dae6 Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6@f9f50d5 travis_wait has been deemed a fail. - NOAA-GFDL/MOM6@14f9a05 Can depend on outside land masking for Kelvin wave. - NOAA-GFDL/MOM6@842fffe Added a travis_wait to running tests. - NOAA-GFDL/MOM6@beb2e54 *Adding a MASK_OUTSIDE_OBCS option. --- ocean_only/DOME/MOM_parameter_doc.all | 2 ++ ocean_only/circle_obcs/MOM_parameter_doc.all | 2 ++ src/MOM6 | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index a4761d8feb..66c5104e45 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -257,6 +257,8 @@ OBC_FREESLIP_STRAIN = False ! [Boolean] default = False OBC_ZERO_BIHARMONIC = False ! [Boolean] default = False ! If true, zeros the Laplacian of flow on open boundaries in the biharmonic ! viscosity term. +MASK_OUTSIDE_OBCS = False ! [Boolean] default = False + ! If true, set the areas outside open boundaries to be land. OBC_SEGMENT_001 = "J=N,I=110:100,SIMPLE" ! ! Documentation needs to be dynamic????? MASKING_DEPTH = -9999.0 ! [m] default = -9999.0 diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index 0afaf3dd12..89b01dbfe4 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -255,6 +255,8 @@ OBC_FREESLIP_STRAIN = True ! [Boolean] default = False OBC_ZERO_BIHARMONIC = True ! [Boolean] default = False ! If true, zeros the Laplacian of flow on open boundaries in the biharmonic ! viscosity term. +MASK_OUTSIDE_OBCS = False ! [Boolean] default = False + ! If true, set the areas outside open boundaries to be land. OBC_SEGMENT_001 = "J=N,I=N:0,FLATHER,ORLANSKI" ! ! Documentation needs to be dynamic????? OBC_SEGMENT_002 = "J=0,I=0:N,FLATHER,ORLANSKI" ! diff --git a/src/MOM6 b/src/MOM6 index 91d7f9c620..0c5347f24f 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 91d7f9c62049f1891c0e243145c82704fee9f14e +Subproject commit 0c5347f24f0c87f087ea24f6a2a741b3742029d1 From 2bc46af5419a83bdf04e38e12c8e6a6db539a00f Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Thu, 16 Nov 2017 18:49:46 -0500 Subject: [PATCH 85/89] MOM6: Changes related to restructuring MOM.F90 Made several changes to MOM6 that change the MOM_parameter_doc.all files and the available_diags files, including obsoleting MASK_MASSLESS_TRACERS and relocating various predia and preale diagnostics into the respective subroutines which changes the order of entries in the available diags files. All answers are bitwise identical, but the MOM_parameter_doc.all and available_diags files have changed. MOM6 commit Hallberg-NOAA/MOM6@653f770695b7b707a125237723005803f7b31d85 --- .../CM2G63L/MOM_parameter_doc.all | 3 - .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 3 - .../Concurrent_ice_1deg/MOM_parameter_doc.all | 3 - ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 3 - .../MOM_parameter_doc.all | 5 - ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 3 - ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 3 - ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 3 - .../SIS2_bergs_cgrid/MOM_parameter_doc.all | 3 - .../SIS2_cgrid/MOM_parameter_doc.all | 3 - .../OM_360x320_C180/MOM_parameter_doc.all | 3 - ocean_only/benchmark/MOM_parameter_doc.all | 3 - .../global_ALE/hycom/MOM_parameter_doc.all | 3 - .../global_ALE/layer/MOM_parameter_doc.all | 3 - .../global_ALE/layer/available_diags.000000 | 288 +++++-------- ocean_only/global_ALE/z/MOM_parameter_doc.all | 3 - .../global_ALE/z/available_diags.000000 | 384 +++++++++--------- .../nonBous_global/MOM_parameter_doc.all | 3 - .../MOM_parameter_doc.all | 2 - src/MOM6 | 2 +- 20 files changed, 289 insertions(+), 437 deletions(-) diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index d80bd69e12..a11365c936 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -361,9 +361,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 10002039a3..a793aa2d8d 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -361,9 +361,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index 10002039a3..a793aa2d8d 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -361,9 +361,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 1526e58775..1acc766416 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -361,9 +361,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise 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 c1e19d7cae..6e355b1085 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 @@ -378,9 +378,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise @@ -404,8 +401,6 @@ SPONGE = False ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. ! The exact location and properties of those sponges are ! specified from MOM_initialization.F90. -MASK_TRACERS_IN_MASSLESS_LAYERS = False ! [Boolean] default = False - ! If true, tracers will be masked out in massless layers. ! === module MOM_coord_initialization === COORD_CONFIG = "file" ! diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index b2d1157dac..f3c4472fd9 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -383,9 +383,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index d38c7e8f39..e797d89315 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -383,9 +383,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 89ff54d284..bd4659fe0f 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -361,9 +361,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 44f043202b..074868d4f8 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -361,9 +361,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 44f043202b..074868d4f8 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -361,9 +361,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index 05372a28e0..eb573c92a7 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -371,9 +371,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 65a05f5cb6..662811c550 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -379,9 +379,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index f0fde57cae..d6f504b2f2 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -378,9 +378,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 88aba68a62..a6cdeb6450 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -376,9 +376,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 6ec82577a7..4614ce02f4 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -2026,6 +2026,102 @@ "ocean_model_zold", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salinity flux across interfaces, interpolated to z ! units: psu m s-1 +"ocean_model", "u_predia" [Unused] + ! long_name: Zonal velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: xq:point yh:mean zl:mean +"ocean_model", "u_predia_xyave" [Unused] + ! long_name: Zonal velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: zl:mean +"ocean_model_z", "u_predia" [Unused] + ! long_name: Zonal velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: xq:point yh:mean z_l:mean +"ocean_model_z", "u_predia_xyave" [Unused] + ! long_name: Zonal velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: z_l:mean +"ocean_model", "v_predia" [Unused] + ! long_name: Meridional velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: xh:mean yq:point zl:mean +"ocean_model", "v_predia_xyave" [Unused] + ! long_name: Meridional velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: zl:mean +"ocean_model_z", "v_predia" [Unused] + ! long_name: Meridional velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: xh:mean yq:point z_l:mean +"ocean_model_z", "v_predia_xyave" [Unused] + ! long_name: Meridional velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: z_l:mean +"ocean_model", "h_predia" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: m + ! cell_methods: xh:mean yh:mean zl:sum area:mean +"ocean_model", "h_predia_xyave" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: m + ! cell_methods: zl:sum +"ocean_model_z", "h_predia" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: m + ! cell_methods: xh:mean yh:mean z_l:sum area:mean +"ocean_model_z", "h_predia_xyave" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: m + ! cell_methods: z_l:sum +"ocean_model", "e_predia" [Unused] + ! long_name: Interface Heights before diabatic forcing + ! units: m + ! cell_methods: xh:mean yh:mean zi:point area:mean +"ocean_model", "e_predia_xyave" [Unused] + ! long_name: Interface Heights before diabatic forcing + ! units: m + ! cell_methods: zi:point +"ocean_model_z", "e_predia" [Unused] + ! long_name: Interface Heights before diabatic forcing + ! units: m + ! cell_methods: xh:mean yh:mean z_i:point area:mean +"ocean_model_z", "e_predia_xyave" [Unused] + ! long_name: Interface Heights before diabatic forcing + ! units: m + ! cell_methods: z_i:point +"ocean_model", "temp_predia" [Unused] + ! long_name: Potential Temperature + ! units: degC + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "temp_predia_xyave" [Unused] + ! long_name: Potential Temperature + ! units: degC + ! cell_methods: zl:mean +"ocean_model_z", "temp_predia" [Unused] + ! long_name: Potential Temperature + ! units: degC + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "temp_predia_xyave" [Unused] + ! long_name: Potential Temperature + ! units: degC + ! cell_methods: z_l:mean +"ocean_model", "salt_predia" [Unused] + ! long_name: Salinity + ! units: PSU + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "salt_predia_xyave" [Unused] + ! long_name: Salinity + ! units: PSU + ! cell_methods: zl:mean +"ocean_model_z", "salt_predia" [Unused] + ! long_name: Salinity + ! units: PSU + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "salt_predia_xyave" [Unused] + ! long_name: Salinity + ! units: PSU + ! cell_methods: z_l:mean "ocean_model", "Kd_interface" [Used] ! long_name: Total diapycnal diffusivity at interfaces ! units: m2 s-1 @@ -3053,198 +3149,6 @@ ! long_name: Vertically Integrated Diffusive Meridional Flux of Salinity ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point -"ocean_model", "u_predia" [Unused] - ! long_name: Zonal velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: xq:point yh:mean zl:mean -"ocean_model", "u_predia_xyave" [Unused] - ! long_name: Zonal velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: zl:mean -"ocean_model_z", "u_predia" [Unused] - ! long_name: Zonal velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: xq:point yh:mean z_l:mean -"ocean_model_z", "u_predia_xyave" [Unused] - ! long_name: Zonal velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: z_l:mean -"ocean_model", "v_predia" [Unused] - ! long_name: Meridional velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: xh:mean yq:point zl:mean -"ocean_model", "v_predia_xyave" [Unused] - ! long_name: Meridional velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: zl:mean -"ocean_model_z", "v_predia" [Unused] - ! long_name: Meridional velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: xh:mean yq:point z_l:mean -"ocean_model_z", "v_predia_xyave" [Unused] - ! long_name: Meridional velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: z_l:mean -"ocean_model", "h_predia" [Unused] - ! long_name: Layer Thickness before diabatic forcing - ! units: m - ! cell_methods: xh:mean yh:mean zl:sum area:mean -"ocean_model", "h_predia_xyave" [Unused] - ! long_name: Layer Thickness before diabatic forcing - ! units: m - ! cell_methods: zl:sum -"ocean_model_z", "h_predia" [Unused] - ! long_name: Layer Thickness before diabatic forcing - ! units: m - ! cell_methods: xh:mean yh:mean z_l:sum area:mean -"ocean_model_z", "h_predia_xyave" [Unused] - ! long_name: Layer Thickness before diabatic forcing - ! units: m - ! cell_methods: z_l:sum -"ocean_model", "e_predia" [Unused] - ! long_name: Interface Heights before diabatic forcing - ! units: m - ! cell_methods: xh:mean yh:mean zi:point area:mean -"ocean_model", "e_predia_xyave" [Unused] - ! long_name: Interface Heights before diabatic forcing - ! units: m - ! cell_methods: zi:point -"ocean_model_z", "e_predia" [Unused] - ! long_name: Interface Heights before diabatic forcing - ! units: m - ! cell_methods: xh:mean yh:mean z_i:point area:mean -"ocean_model_z", "e_predia_xyave" [Unused] - ! long_name: Interface Heights before diabatic forcing - ! units: m - ! cell_methods: z_i:point -"ocean_model", "u_preale" [Unused] - ! long_name: Zonal velocity before remapping - ! units: m s-1 - ! cell_methods: xq:point yh:mean zl:mean -"ocean_model", "u_preale_xyave" [Unused] - ! long_name: Zonal velocity before remapping - ! units: m s-1 - ! cell_methods: zl:mean -"ocean_model_z", "u_preale" [Unused] - ! long_name: Zonal velocity before remapping - ! units: m s-1 - ! cell_methods: xq:point yh:mean z_l:mean -"ocean_model_z", "u_preale_xyave" [Unused] - ! long_name: Zonal velocity before remapping - ! units: m s-1 - ! cell_methods: z_l:mean -"ocean_model", "v_preale" [Unused] - ! long_name: Meridional velocity before remapping - ! units: m s-1 - ! cell_methods: xh:mean yq:point zl:mean -"ocean_model", "v_preale_xyave" [Unused] - ! long_name: Meridional velocity before remapping - ! units: m s-1 - ! cell_methods: zl:mean -"ocean_model_z", "v_preale" [Unused] - ! long_name: Meridional velocity before remapping - ! units: m s-1 - ! cell_methods: xh:mean yq:point z_l:mean -"ocean_model_z", "v_preale_xyave" [Unused] - ! long_name: Meridional velocity before remapping - ! units: m s-1 - ! cell_methods: z_l:mean -"ocean_model", "h_preale" [Unused] - ! long_name: Layer Thickness before remapping - ! units: m - ! cell_methods: xh:mean yh:mean zl:sum area:mean -"ocean_model", "h_preale_xyave" [Unused] - ! long_name: Layer Thickness before remapping - ! units: m - ! cell_methods: zl:sum -"ocean_model_z", "h_preale" [Unused] - ! long_name: Layer Thickness before remapping - ! units: m - ! cell_methods: xh:mean yh:mean z_l:sum area:mean -"ocean_model_z", "h_preale_xyave" [Unused] - ! long_name: Layer Thickness before remapping - ! units: m - ! cell_methods: z_l:sum -"ocean_model", "T_preale" [Unused] - ! long_name: Temperature before remapping - ! units: degC - ! cell_methods: xh:mean yh:mean zl:mean area:mean -"ocean_model", "T_preale_xyave" [Unused] - ! long_name: Temperature before remapping - ! units: degC - ! cell_methods: zl:mean -"ocean_model_z", "T_preale" [Unused] - ! long_name: Temperature before remapping - ! units: degC - ! cell_methods: xh:mean yh:mean z_l:mean area:mean -"ocean_model_z", "T_preale_xyave" [Unused] - ! long_name: Temperature before remapping - ! units: degC - ! cell_methods: z_l:mean -"ocean_model", "S_preale" [Unused] - ! long_name: Salinity before remapping - ! units: psu - ! cell_methods: xh:mean yh:mean zl:mean area:mean -"ocean_model", "S_preale_xyave" [Unused] - ! long_name: Salinity before remapping - ! units: psu - ! cell_methods: zl:mean -"ocean_model_z", "S_preale" [Unused] - ! long_name: Salinity before remapping - ! units: psu - ! cell_methods: xh:mean yh:mean z_l:mean area:mean -"ocean_model_z", "S_preale_xyave" [Unused] - ! long_name: Salinity before remapping - ! units: psu - ! cell_methods: z_l:mean -"ocean_model", "e_preale" [Unused] - ! long_name: Interface Heights before remapping - ! units: m - ! cell_methods: xh:mean yh:mean zi:point area:mean -"ocean_model", "e_preale_xyave" [Unused] - ! long_name: Interface Heights before remapping - ! units: m - ! cell_methods: zi:point -"ocean_model_z", "e_preale" [Unused] - ! long_name: Interface Heights before remapping - ! units: m - ! cell_methods: xh:mean yh:mean z_i:point area:mean -"ocean_model_z", "e_preale_xyave" [Unused] - ! long_name: Interface Heights before remapping - ! units: m - ! cell_methods: z_i:point -"ocean_model", "temp_predia" [Unused] - ! long_name: Potential Temperature - ! units: degC - ! cell_methods: xh:mean yh:mean zl:mean area:mean -"ocean_model", "temp_predia_xyave" [Unused] - ! long_name: Potential Temperature - ! units: degC - ! cell_methods: zl:mean -"ocean_model_z", "temp_predia" [Unused] - ! long_name: Potential Temperature - ! units: degC - ! cell_methods: xh:mean yh:mean z_l:mean area:mean -"ocean_model_z", "temp_predia_xyave" [Unused] - ! long_name: Potential Temperature - ! units: degC - ! cell_methods: z_l:mean -"ocean_model", "salt_predia" [Unused] - ! long_name: Salinity - ! units: psu - ! cell_methods: xh:mean yh:mean zl:mean area:mean -"ocean_model", "salt_predia_xyave" [Unused] - ! long_name: Salinity - ! units: psu - ! cell_methods: zl:mean -"ocean_model_z", "salt_predia" [Unused] - ! long_name: Salinity - ! units: psu - ! cell_methods: xh:mean yh:mean z_l:mean area:mean -"ocean_model_z", "salt_predia_xyave" [Unused] - ! long_name: Salinity - ! units: psu - ! cell_methods: z_l:mean "ocean_model", "uhtr" [Unused] ! long_name: Accumulated zonal thickness fluxes to advect tracers ! units: kg diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 59a0f51552..ee09305b9f 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -378,9 +378,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index f140217e5e..a686a295f9 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -2066,6 +2066,102 @@ "ocean_model_zold", "Sflx_dia_adv" [Unused] ! long_name: Advective diapycnal salinity flux across interfaces, interpolated to z ! units: psu m s-1 +"ocean_model", "u_predia" [Unused] + ! long_name: Zonal velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: xq:point yh:mean zl:mean +"ocean_model", "u_predia_xyave" [Unused] + ! long_name: Zonal velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: zl:mean +"ocean_model_z", "u_predia" [Unused] + ! long_name: Zonal velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: xq:point yh:mean z_l:mean +"ocean_model_z", "u_predia_xyave" [Unused] + ! long_name: Zonal velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: z_l:mean +"ocean_model", "v_predia" [Unused] + ! long_name: Meridional velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: xh:mean yq:point zl:mean +"ocean_model", "v_predia_xyave" [Unused] + ! long_name: Meridional velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: zl:mean +"ocean_model_z", "v_predia" [Unused] + ! long_name: Meridional velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: xh:mean yq:point z_l:mean +"ocean_model_z", "v_predia_xyave" [Unused] + ! long_name: Meridional velocity before diabatic forcing + ! units: m s-1 + ! cell_methods: z_l:mean +"ocean_model", "h_predia" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: m + ! cell_methods: xh:mean yh:mean zl:sum area:mean +"ocean_model", "h_predia_xyave" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: m + ! cell_methods: zl:sum +"ocean_model_z", "h_predia" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: m + ! cell_methods: xh:mean yh:mean z_l:sum area:mean +"ocean_model_z", "h_predia_xyave" [Unused] + ! long_name: Layer Thickness before diabatic forcing + ! units: m + ! cell_methods: z_l:sum +"ocean_model", "e_predia" [Unused] + ! long_name: Interface Heights before diabatic forcing + ! units: m + ! cell_methods: xh:mean yh:mean zi:point area:mean +"ocean_model", "e_predia_xyave" [Unused] + ! long_name: Interface Heights before diabatic forcing + ! units: m + ! cell_methods: zi:point +"ocean_model_z", "e_predia" [Unused] + ! long_name: Interface Heights before diabatic forcing + ! units: m + ! cell_methods: xh:mean yh:mean z_i:point area:mean +"ocean_model_z", "e_predia_xyave" [Unused] + ! long_name: Interface Heights before diabatic forcing + ! units: m + ! cell_methods: z_i:point +"ocean_model", "temp_predia" [Unused] + ! long_name: Potential Temperature + ! units: degC + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "temp_predia_xyave" [Unused] + ! long_name: Potential Temperature + ! units: degC + ! cell_methods: zl:mean +"ocean_model_z", "temp_predia" [Unused] + ! long_name: Potential Temperature + ! units: degC + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "temp_predia_xyave" [Unused] + ! long_name: Potential Temperature + ! units: degC + ! cell_methods: z_l:mean +"ocean_model", "salt_predia" [Unused] + ! long_name: Salinity + ! units: PSU + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "salt_predia_xyave" [Unused] + ! long_name: Salinity + ! units: PSU + ! cell_methods: zl:mean +"ocean_model_z", "salt_predia" [Unused] + ! long_name: Salinity + ! units: PSU + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "salt_predia_xyave" [Unused] + ! long_name: Salinity + ! units: PSU + ! cell_methods: z_l:mean "ocean_model", "Kd_interface" [Used] ! long_name: Total diapycnal diffusivity at interfaces ! units: m2 s-1 @@ -3424,198 +3520,6 @@ ! long_name: Vertically Integrated Diffusive Meridional Flux of Salinity ! units: psu m3 s-1 ! cell_methods: xh:mean yq:point -"ocean_model", "u_predia" [Unused] - ! long_name: Zonal velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: xq:point yh:mean zl:mean -"ocean_model", "u_predia_xyave" [Unused] - ! long_name: Zonal velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: zl:mean -"ocean_model_z", "u_predia" [Unused] - ! long_name: Zonal velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: xq:point yh:mean z_l:mean -"ocean_model_z", "u_predia_xyave" [Unused] - ! long_name: Zonal velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: z_l:mean -"ocean_model", "v_predia" [Unused] - ! long_name: Meridional velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: xh:mean yq:point zl:mean -"ocean_model", "v_predia_xyave" [Unused] - ! long_name: Meridional velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: zl:mean -"ocean_model_z", "v_predia" [Unused] - ! long_name: Meridional velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: xh:mean yq:point z_l:mean -"ocean_model_z", "v_predia_xyave" [Unused] - ! long_name: Meridional velocity before diabatic forcing - ! units: m s-1 - ! cell_methods: z_l:mean -"ocean_model", "h_predia" [Unused] - ! long_name: Layer Thickness before diabatic forcing - ! units: m - ! cell_methods: xh:mean yh:mean zl:sum area:mean -"ocean_model", "h_predia_xyave" [Unused] - ! long_name: Layer Thickness before diabatic forcing - ! units: m - ! cell_methods: zl:sum -"ocean_model_z", "h_predia" [Unused] - ! long_name: Layer Thickness before diabatic forcing - ! units: m - ! cell_methods: xh:mean yh:mean z_l:sum area:mean -"ocean_model_z", "h_predia_xyave" [Unused] - ! long_name: Layer Thickness before diabatic forcing - ! units: m - ! cell_methods: z_l:sum -"ocean_model", "e_predia" [Unused] - ! long_name: Interface Heights before diabatic forcing - ! units: m - ! cell_methods: xh:mean yh:mean zi:point area:mean -"ocean_model", "e_predia_xyave" [Unused] - ! long_name: Interface Heights before diabatic forcing - ! units: m - ! cell_methods: zi:point -"ocean_model_z", "e_predia" [Unused] - ! long_name: Interface Heights before diabatic forcing - ! units: m - ! cell_methods: xh:mean yh:mean z_i:point area:mean -"ocean_model_z", "e_predia_xyave" [Unused] - ! long_name: Interface Heights before diabatic forcing - ! units: m - ! cell_methods: z_i:point -"ocean_model", "u_preale" [Unused] - ! long_name: Zonal velocity before remapping - ! units: m s-1 - ! cell_methods: xq:point yh:mean zl:mean -"ocean_model", "u_preale_xyave" [Unused] - ! long_name: Zonal velocity before remapping - ! units: m s-1 - ! cell_methods: zl:mean -"ocean_model_z", "u_preale" [Unused] - ! long_name: Zonal velocity before remapping - ! units: m s-1 - ! cell_methods: xq:point yh:mean z_l:mean -"ocean_model_z", "u_preale_xyave" [Unused] - ! long_name: Zonal velocity before remapping - ! units: m s-1 - ! cell_methods: z_l:mean -"ocean_model", "v_preale" [Unused] - ! long_name: Meridional velocity before remapping - ! units: m s-1 - ! cell_methods: xh:mean yq:point zl:mean -"ocean_model", "v_preale_xyave" [Unused] - ! long_name: Meridional velocity before remapping - ! units: m s-1 - ! cell_methods: zl:mean -"ocean_model_z", "v_preale" [Unused] - ! long_name: Meridional velocity before remapping - ! units: m s-1 - ! cell_methods: xh:mean yq:point z_l:mean -"ocean_model_z", "v_preale_xyave" [Unused] - ! long_name: Meridional velocity before remapping - ! units: m s-1 - ! cell_methods: z_l:mean -"ocean_model", "h_preale" [Unused] - ! long_name: Layer Thickness before remapping - ! units: m - ! cell_methods: xh:mean yh:mean zl:sum area:mean -"ocean_model", "h_preale_xyave" [Unused] - ! long_name: Layer Thickness before remapping - ! units: m - ! cell_methods: zl:sum -"ocean_model_z", "h_preale" [Unused] - ! long_name: Layer Thickness before remapping - ! units: m - ! cell_methods: xh:mean yh:mean z_l:sum area:mean -"ocean_model_z", "h_preale_xyave" [Unused] - ! long_name: Layer Thickness before remapping - ! units: m - ! cell_methods: z_l:sum -"ocean_model", "T_preale" [Unused] - ! long_name: Temperature before remapping - ! units: degC - ! cell_methods: xh:mean yh:mean zl:mean area:mean -"ocean_model", "T_preale_xyave" [Unused] - ! long_name: Temperature before remapping - ! units: degC - ! cell_methods: zl:mean -"ocean_model_z", "T_preale" [Unused] - ! long_name: Temperature before remapping - ! units: degC - ! cell_methods: xh:mean yh:mean z_l:mean area:mean -"ocean_model_z", "T_preale_xyave" [Unused] - ! long_name: Temperature before remapping - ! units: degC - ! cell_methods: z_l:mean -"ocean_model", "S_preale" [Unused] - ! long_name: Salinity before remapping - ! units: psu - ! cell_methods: xh:mean yh:mean zl:mean area:mean -"ocean_model", "S_preale_xyave" [Unused] - ! long_name: Salinity before remapping - ! units: psu - ! cell_methods: zl:mean -"ocean_model_z", "S_preale" [Unused] - ! long_name: Salinity before remapping - ! units: psu - ! cell_methods: xh:mean yh:mean z_l:mean area:mean -"ocean_model_z", "S_preale_xyave" [Unused] - ! long_name: Salinity before remapping - ! units: psu - ! cell_methods: z_l:mean -"ocean_model", "e_preale" [Unused] - ! long_name: Interface Heights before remapping - ! units: m - ! cell_methods: xh:mean yh:mean zi:point area:mean -"ocean_model", "e_preale_xyave" [Unused] - ! long_name: Interface Heights before remapping - ! units: m - ! cell_methods: zi:point -"ocean_model_z", "e_preale" [Unused] - ! long_name: Interface Heights before remapping - ! units: m - ! cell_methods: xh:mean yh:mean z_i:point area:mean -"ocean_model_z", "e_preale_xyave" [Unused] - ! long_name: Interface Heights before remapping - ! units: m - ! cell_methods: z_i:point -"ocean_model", "temp_predia" [Unused] - ! long_name: Potential Temperature - ! units: degC - ! cell_methods: xh:mean yh:mean zl:mean area:mean -"ocean_model", "temp_predia_xyave" [Unused] - ! long_name: Potential Temperature - ! units: degC - ! cell_methods: zl:mean -"ocean_model_z", "temp_predia" [Unused] - ! long_name: Potential Temperature - ! units: degC - ! cell_methods: xh:mean yh:mean z_l:mean area:mean -"ocean_model_z", "temp_predia_xyave" [Unused] - ! long_name: Potential Temperature - ! units: degC - ! cell_methods: z_l:mean -"ocean_model", "salt_predia" [Unused] - ! long_name: Salinity - ! units: psu - ! cell_methods: xh:mean yh:mean zl:mean area:mean -"ocean_model", "salt_predia_xyave" [Unused] - ! long_name: Salinity - ! units: psu - ! cell_methods: zl:mean -"ocean_model_z", "salt_predia" [Unused] - ! long_name: Salinity - ! units: psu - ! cell_methods: xh:mean yh:mean z_l:mean area:mean -"ocean_model_z", "salt_predia_xyave" [Unused] - ! long_name: Salinity - ! units: psu - ! cell_methods: z_l:mean "ocean_model", "uhtr" [Unused] ! long_name: Accumulated zonal thickness fluxes to advect tracers ! units: kg @@ -3860,6 +3764,102 @@ ! units: kg m-2 s-1 ! standard_name: tendency_of_sea_water_salinity_expressed_as_salt_content_vertical_sum ! cell_methods: xh:mean yh:mean area:mean +"ocean_model", "u_preale" [Unused] + ! long_name: Zonal velocity before remapping + ! units: m s-1 + ! cell_methods: xq:point yh:mean zl:mean +"ocean_model", "u_preale_xyave" [Unused] + ! long_name: Zonal velocity before remapping + ! units: m s-1 + ! cell_methods: zl:mean +"ocean_model_z", "u_preale" [Unused] + ! long_name: Zonal velocity before remapping + ! units: m s-1 + ! cell_methods: xq:point yh:mean z_l:mean +"ocean_model_z", "u_preale_xyave" [Unused] + ! long_name: Zonal velocity before remapping + ! units: m s-1 + ! cell_methods: z_l:mean +"ocean_model", "v_preale" [Unused] + ! long_name: Meridional velocity before remapping + ! units: m s-1 + ! cell_methods: xh:mean yq:point zl:mean +"ocean_model", "v_preale_xyave" [Unused] + ! long_name: Meridional velocity before remapping + ! units: m s-1 + ! cell_methods: zl:mean +"ocean_model_z", "v_preale" [Unused] + ! long_name: Meridional velocity before remapping + ! units: m s-1 + ! cell_methods: xh:mean yq:point z_l:mean +"ocean_model_z", "v_preale_xyave" [Unused] + ! long_name: Meridional velocity before remapping + ! units: m s-1 + ! cell_methods: z_l:mean +"ocean_model", "h_preale" [Unused] + ! long_name: Layer Thickness before remapping + ! units: m + ! cell_methods: xh:mean yh:mean zl:sum area:mean +"ocean_model", "h_preale_xyave" [Unused] + ! long_name: Layer Thickness before remapping + ! units: m + ! cell_methods: zl:sum +"ocean_model_z", "h_preale" [Unused] + ! long_name: Layer Thickness before remapping + ! units: m + ! cell_methods: xh:mean yh:mean z_l:sum area:mean +"ocean_model_z", "h_preale_xyave" [Unused] + ! long_name: Layer Thickness before remapping + ! units: m + ! cell_methods: z_l:sum +"ocean_model", "T_preale" [Unused] + ! long_name: Temperature before remapping + ! units: degC + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "T_preale_xyave" [Unused] + ! long_name: Temperature before remapping + ! units: degC + ! cell_methods: zl:mean +"ocean_model_z", "T_preale" [Unused] + ! long_name: Temperature before remapping + ! units: degC + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "T_preale_xyave" [Unused] + ! long_name: Temperature before remapping + ! units: degC + ! cell_methods: z_l:mean +"ocean_model", "S_preale" [Unused] + ! long_name: Salinity before remapping + ! units: PSU + ! cell_methods: xh:mean yh:mean zl:mean area:mean +"ocean_model", "S_preale_xyave" [Unused] + ! long_name: Salinity before remapping + ! units: PSU + ! cell_methods: zl:mean +"ocean_model_z", "S_preale" [Unused] + ! long_name: Salinity before remapping + ! units: PSU + ! cell_methods: xh:mean yh:mean z_l:mean area:mean +"ocean_model_z", "S_preale_xyave" [Unused] + ! long_name: Salinity before remapping + ! units: PSU + ! cell_methods: z_l:mean +"ocean_model", "e_preale" [Unused] + ! long_name: Interface Heights before remapping + ! units: m + ! cell_methods: xh:mean yh:mean zi:point area:mean +"ocean_model", "e_preale_xyave" [Unused] + ! long_name: Interface Heights before remapping + ! units: m + ! cell_methods: zi:point +"ocean_model_z", "e_preale" [Unused] + ! long_name: Interface Heights before remapping + ! units: m + ! cell_methods: xh:mean yh:mean z_i:point area:mean +"ocean_model_z", "e_preale_xyave" [Unused] + ! long_name: Interface Heights before remapping + ! units: m + ! cell_methods: z_i:point "ocean_model", "dzRegrid" [Unused] ! long_name: Change in interface height due to ALE regridding ! units: m diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 385f1c2313..ab757b471e 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -361,9 +361,6 @@ AGE_IC_FILE = "" ! default = "" ! found, or an empty string for internal initialization. AGE_IC_FILE_IS_Z = False ! [Boolean] default = False ! If true, AGE_IC_FILE is in depth space, not layer space -MASK_MASSLESS_TRACERS = False ! [Boolean] default = False - ! If true, the tracers are masked out in massless layer. - ! This can be a problem with time-averages. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 2c6d11997a..55c78bf6a8 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -383,8 +383,6 @@ SPONGE = False ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. ! The exact location and properties of those sponges are ! specified from MOM_initialization.F90. -MASK_TRACERS_IN_MASSLESS_LAYERS = False ! [Boolean] default = False - ! If true, tracers will be masked out in massless layers. TRACERS_MAY_REINIT = False ! [Boolean] default = False ! If true, tracers may go through the initialization code ! if they are not found in the restart files. Otherwise diff --git a/src/MOM6 b/src/MOM6 index 0c5347f24f..653f770695 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 0c5347f24f0c87f087ea24f6a2a741b3742029d1 +Subproject commit 653f770695b7b707a125237723005803f7b31d85 From 9452ed2c768838df5b77db411fcb07db13666bff Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Thu, 16 Nov 2017 19:00:14 -0500 Subject: [PATCH 86/89] Added ocean_only/tides_025 test case Added a new test case to do a global 1- or 2-layer ocean-only run with tides. --- .../tides_025/INPUT/MOM_channels_global_025 | 9 + .../tides_025/INPUT/interface_IC_2layer.cdl | 12 + ocean_only/tides_025/MOM_input | 448 ++++++ ocean_only/tides_025/MOM_override | 3 + ocean_only/tides_025/MOM_override_1layer | 3 + ocean_only/tides_025/MOM_override_2lay_1_12 | 21 + ocean_only/tides_025/MOM_override_2layer | 7 + ocean_only/tides_025/MOM_parameter_doc.all | 1242 +++++++++++++++++ ocean_only/tides_025/MOM_parameter_doc.layout | 73 + ocean_only/tides_025/MOM_parameter_doc.short | 439 ++++++ ocean_only/tides_025/diag_table | 54 + ocean_only/tides_025/input.nml | 16 + 12 files changed, 2327 insertions(+) create mode 100644 ocean_only/tides_025/INPUT/MOM_channels_global_025 create mode 100644 ocean_only/tides_025/INPUT/interface_IC_2layer.cdl create mode 100644 ocean_only/tides_025/MOM_input create mode 100644 ocean_only/tides_025/MOM_override create mode 100644 ocean_only/tides_025/MOM_override_1layer create mode 100644 ocean_only/tides_025/MOM_override_2lay_1_12 create mode 100644 ocean_only/tides_025/MOM_override_2layer create mode 100644 ocean_only/tides_025/MOM_parameter_doc.all create mode 100644 ocean_only/tides_025/MOM_parameter_doc.layout create mode 100644 ocean_only/tides_025/MOM_parameter_doc.short create mode 100644 ocean_only/tides_025/diag_table create mode 100644 ocean_only/tides_025/input.nml diff --git a/ocean_only/tides_025/INPUT/MOM_channels_global_025 b/ocean_only/tides_025/INPUT/MOM_channels_global_025 new file mode 100644 index 0000000000..b743c3029d --- /dev/null +++ b/ocean_only/tides_025/INPUT/MOM_channels_global_025 @@ -0,0 +1,9 @@ +! This file specifies restricted channel widths in MOM. The order is: +! [U|V]_width, min_longitude, max_longitude, min_latitude, max_latitude, width + +U_width, -5.9, -5.4, 35.8, 36.2, 12000.0 ! Gibraltar +U_width, 26.4, 26.8, 40.4, 40.6, 5000.0 ! Dardanelles + +V_width, 28.8, 29.4, 41.1, 41.2, 2500.0 ! Bosporus - should be 1km wide. +V_width, 43.25, 43.5, 12.6, 12.8, 10000.0 ! Red Sea, Bab-el-Mendeb +V_width, 141.5, 141.7, 52.0, 52.15, 2500.0 ! Between Sakhalin & Russia diff --git a/ocean_only/tides_025/INPUT/interface_IC_2layer.cdl b/ocean_only/tides_025/INPUT/interface_IC_2layer.cdl new file mode 100644 index 0000000000..4d8a41920b --- /dev/null +++ b/ocean_only/tides_025/INPUT/interface_IC_2layer.cdl @@ -0,0 +1,12 @@ +netcdf interface_IC_2layer { +dimensions: + nki = 3 ; // (47 currently) +variables: + double eta(nki) ; + eta:long_name = "Initial depth of interfaces" ; + eta:units = "meters" ; +data: + + eta = 0, -700., -12000. ; + +} diff --git a/ocean_only/tides_025/MOM_input b/ocean_only/tides_025/MOM_input new file mode 100644 index 0000000000..2b0611b8c8 --- /dev/null +++ b/ocean_only/tides_025/MOM_input @@ -0,0 +1,448 @@ +/* This input file provides the adjustable run-time parameters for version 6 of + the Modular Ocean Model (MOM6), a numerical ocean model developed at NOAA-GFDL. + Where appropriate, parameters use usually given in MKS units. + + This particular file is for the example in tides_025 + + This MOM_input file typically contains only the non-default values that are + needed to reproduce this example. A full list of parameters for this example + can be found in the corresponding MOM_parameter_doc.all file which is + generated by the model at run-time. */ + +! === module MOM === +ENABLE_THERMODYNAMICS = False ! [Boolean] default = True + ! If true, Temperature and salinity are used as state + ! variables. +ADIABATIC = True ! [Boolean] default = False + ! There are no diapycnal mass fluxes if ADIABATIC is + ! true. This assumes that KD = KDML = 0.0 and that + ! there is no buoyancy forcing, but makes the model + ! faster by eliminating subroutine calls. +DT = 900.0 ! [s] + ! The (baroclinic) dynamics time step. The time-step that + ! is actually used will be an integer fraction of the + ! forcing time-step (DT_FORCING in ocean-only mode or the + ! coupling timestep in coupled mode.) +DT_THERM = 3600.0 ! [s] default = 900.0 + ! The thermodynamic and tracer advection time step. + ! Ideally DT_THERM should be an integer multiple of DT + ! and less than the forcing or coupling time-step, unless + ! THERMO_SPANS_COUPLING is true, in which case DT_THERM + ! can be an integer multiple of the coupling timestep. By + ! default DT_THERM is set to DT. +DTBT_RESET_PERIOD = -1.0 ! [s] default = 3600.0 + ! The period between recalculations of DTBT (if DTBT <= 0). + ! If DTBT_RESET_PERIOD is negative, DTBT is set based + ! only on information available at initialization. If + ! dynamic, DTBT will be set at least every forcing time + ! step, and if 0, every dynamics time step. The default is + ! set by DT_THERM. This is only used if SPLIT is true. +CHECK_BAD_SURFACE_VALS = True ! [Boolean] default = False + ! If true, check the surface state for ridiculous values. +BAD_VAL_SSH_MAX = 50.0 ! [m] default = 20.0 + ! The value of SSH above which a bad value message is + ! triggered, if CHECK_BAD_SURFACE_VALS is true. +SAVE_INITIAL_CONDS = True ! [Boolean] default = False + ! If true, write the initial conditions to a file given + ! by IC_OUTPUT_FILE. + +! === module MOM_domains === +TRIPOLAR_N = True ! [Boolean] default = False + ! Use tripolar connectivity at the northern edge of the + ! domain. With TRIPOLAR_N, NIGLOBAL must be even. +NIGLOBAL = 1440 ! + ! The total number of thickness grid points in the + ! x-direction in the physical domain. With STATIC_MEMORY_ + ! this is set in MOM_memory.h at compile time. +NJGLOBAL = 1080 ! + ! The total number of thickness grid points in the + ! y-direction in the physical domain. With STATIC_MEMORY_ + ! this is set in MOM_memory.h at compile time. + +! === module MOM_hor_index === +! Sets the horizontal array index types. + +! === module MOM_verticalGrid === +! Parameters providing information about the vertical grid. +BOUSSINESQ = False ! [Boolean] default = True + ! If true, make the Boussinesq approximation. +NK = 2 ! [nondim] + ! The number of model layers. + +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "ocean_topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_EDITS_FILE = "All_edits.nc" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6500.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 9.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +MASKING_DEPTH = 0.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "list" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +CHANNEL_LIST_FILE = "MOM_channels_global_025" ! default = "MOM_channel_list" + ! The file from which the list of narrowed channels is read. + +! === module MOM_tracer_registry === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + +! === module MOM_coord_initialization === +COORD_CONFIG = "gprime" ! + ! This specifies how layers are to be defined: + ! ALE or none - used to avoid defining layers in ALE mode + ! file - read coordinate information from the file + ! specified by (COORD_FILE). + ! BFB - Custom coords for buoyancy-forced basin case + ! based on SST_S, T_BOT and DRHO_DT. + ! linear - linear based on interfaces not layers + ! layer_ref - linear based on layer densities + ! ts_ref - use reference temperature and salinity + ! ts_range - use range of temperature and salinity + ! (T_REF and S_REF) to determine surface density + ! and GINT calculate internal densities. + ! gprime - use reference density (RHO_0) for surface + ! density and GINT calculate internal densities. + ! ts_profile - use temperature and salinity profiles + ! (read from COORD_FILE) to set layer densities. + ! USER - call a user modified routine. +GINT = 0.0164 ! [m s-2] + ! The reduced gravity across internal interfaces. + +! === module MOM_grid === +! Parameters providing information about the lateral grid. + +! === module MOM_state_initialization === +THICKNESS_CONFIG = "list" ! + ! A string that determines how the initial layer + ! thicknesses are specified for a new run: + ! file - read interface heights from the file specified + ! thickness_file - read thicknesses from the file specified + ! by (THICKNESS_FILE). + ! coord - determined by ALE coordinate. + ! uniform - uniform thickness layers evenly distributed + ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a configuration for the + ! ISOMIP test case. + ! benchmark - use the benchmark test case thicknesses. + ! Neverland - use the Neverland test case thicknesses. + ! search - search a density profile for the interface + ! densities. This is not yet implemented. + ! circle_obcs - the circle_obcs test case is used. + ! DOME2D - 2D version of DOME initialization. + ! adjustment2d - TBD AJA. + ! sloshing - TBD AJA. + ! seamount - TBD AJA. + ! soliton - Equatorial Rossby soliton. + ! rossby_front - a mixed layer front in thermal wind balance. + ! USER - call a user modified routine. +INTERFACE_IC_FILE = "interface_IC_2layer.nc" ! + ! The file from which horizontal mean initial conditions + ! for interface depths can be read. + +! === module MOM_diag_mediator === + +! === module MOM_MEKE === + +! === module MOM_lateral_mixing_coeffs === +RESOLN_SCALED_KH = True ! [Boolean] default = False + ! If true, the Laplacian lateral viscosity is scaled away + ! when the first baroclinic deformation radius is well + ! resolved. +INTERPOLATE_RES_FN = False ! [Boolean] default = True + ! If true, interpolate the resolution function to the + ! velocity points from the thickness points; otherwise + ! interpolate the wave speed and calculate the resolution + ! function independently at each point. +GILL_EQUATORIAL_LD = True ! [Boolean] default = False + ! If true, uses Gill's definition of the baroclinic + ! equatorial deformation radius, otherwise, if false, use + ! Pedlosky's definition. These definitions differ by a factor + ! of 2 infront of the beta term in the denominator. Gill'sis the more appropriate definition. + +! === module MOM_set_visc === +CHANNEL_DRAG = True ! [Boolean] default = False + ! If true, the bottom drag is exerted directly on each + ! layer proportional to the fraction of the bottom it + ! overlies. +HBBL = 10.0 ! [m] + ! The thickness of a bottom boundary layer with a + ! viscosity of KVBBL if BOTTOMDRAGLAW is not defined, or + ! the thickness over which near-bottom velocities are + ! averaged for the drag law if BOTTOMDRAGLAW is defined + ! but LINEAR_DRAG is not. +DRAG_BG_VEL = 0.1 ! [m s-1] default = 0.0 + ! DRAG_BG_VEL is either the assumed bottom velocity (with + ! LINEAR_DRAG) or an unresolved velocity that is + ! combined with the resolved velocity to estimate the + ! velocity magnitude. DRAG_BG_VEL is only used when + ! BOTTOMDRAGLAW is defined. +BBL_THICK_MIN = 0.1 ! [m] default = 0.0 + ! The minimum bottom boundary layer thickness that can be + ! used with BOTTOMDRAGLAW. This might be + ! Kv / (cdrag * drag_bg_vel) to give Kv as the minimum + ! near-bottom viscosity. +KV = 1.0E-04 ! [m2 s-1] + ! The background kinematic viscosity in the interior. + ! The molecular value, ~1e-6 m2 s-1, may be used. +TIDES = True ! [Boolean] default = False + ! If true, apply tidal momentum forcing. + +! === module MOM_continuity === + +! === module MOM_continuity_PPM === +ETA_TOLERANCE = 1.0E-12 ! [m] default = 1.0E-10 + ! The tolerance for the differences between the + ! barotropic and baroclinic estimates of the sea surface + ! height due to the fluxes through each face. The total + ! tolerance for SSH is 4 times this value. The default + ! is 0.5*NK*ANGSTROM, and this should not be set less x + ! than about 10^-15*MAXIMUM_DEPTH. + +! === module MOM_CoriolisAdv === +BOUND_CORIOLIS = True ! [Boolean] default = False + ! If true, the Coriolis terms at u-points are bounded by + ! the four estimates of (f+rv)v from the four neighboring + ! v-points, and similarly at v-points. This option would + ! have no effect on the SADOURNY Coriolis scheme if it + ! were possible to use centered difference thickness fluxes. + +! === module MOM_tidal_forcing === +TIDE_M2 = True ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the M2 + ! frequency. This is only used if TIDES is true. +TIDE_SAL_SCALAR_VALUE = 0.094 ! [m m-1] + ! The constant of proportionality between sea surface + ! height (really it should be bottom pressure) anomalies + ! and bottom geopotential anomalies. This is only used if + ! TIDES and TIDE_USE_SAL_SCALAR are true. + +! === module MOM_PressureForce === + +! === module MOM_PressureForce_AFV === + +! === module MOM_hor_visc === +LAPLACIAN = True ! [Boolean] default = False + ! If true, use a Laplacian horizontal viscosity. +KH_VEL_SCALE = 0.003 ! [m s-1] default = 0.0 + ! The velocity scale which is multiplied by the grid + ! spacing to calculate the Laplacian viscosity. + ! The final viscosity is the largest of this scaled + ! viscosity, the Smagorinsky and Leith viscosities, and KH. +AH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 + ! The velocity scale which is multiplied by the cube of + ! the grid spacing to calculate the biharmonic viscosity. + ! The final viscosity is the largest of this scaled + ! viscosity, the Smagorinsky and Leith viscosities, and AH. +SMAGORINSKY_AH = True ! [Boolean] default = False + ! If true, use a biharmonic Smagorinsky nonlinear eddy + ! viscosity. +SMAG_BI_CONST = 0.06 ! [nondim] default = 0.0 + ! The nondimensional biharmonic Smagorinsky constant, + ! typically 0.015 - 0.06. + +! === module MOM_vert_friction === +DIRECT_STRESS = True ! [Boolean] default = False + ! If true, the wind stress is distributed over the + ! topmost HMIX_STRESS of fluid (like in HYCOM), and KVML + ! may be set to a very small value. +U_TRUNC_FILE = "U_velocity_truncations" ! default = "" + ! The absolute path to a file into which the accelerations + ! leading to zonal velocity truncations are written. + ! Undefine this for efficiency if this diagnostic is not + ! needed. +V_TRUNC_FILE = "V_velocity_truncations" ! default = "" + ! The absolute path to a file into which the accelerations + ! leading to meridional velocity truncations are written. + ! Undefine this for efficiency if this diagnostic is not + ! needed. +HMIX_FIXED = 20.0 ! [m] + ! The prescribed depth over which the near-surface + ! viscosity and diffusivity are elevated when the bulk + ! mixed layer is not used. +KVML = 0.01 ! [m2 s-1] default = 1.0E-04 + ! The kinematic viscosity in the mixed layer. A typical + ! value is ~1e-2 m2 s-1. KVML is not used if + ! BULKMIXEDLAYER is true. The default is set by KV. +MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 + ! The maximum velocity allowed before the velocity + ! components are truncated. + +! === module MOM_PointAccel === + +! === module MOM_barotropic === +BOUND_BT_CORRECTION = True ! [Boolean] default = False + ! If true, the corrective pseudo mass-fluxes into the + ! barotropic solver are limited to values that require + ! less than maxCFL_BT_cont to be accommodated. +BT_PROJECT_VELOCITY = True ! [Boolean] default = False + ! If true, step the barotropic velocity first and project + ! out the velocity tendancy by 1+BEBT when calculating the + ! transport. The default (false) is to use a predictor + ! continuity step to find the pressure field, and then + ! to do a corrector continuity step using a weighted + ! average of the old and new velocities, with weights + ! of (1-BEBT) and BEBT. +BEBT = 0.2 ! [nondim] default = 0.1 + ! BEBT determines whether the barotropic time stepping + ! uses the forward-backward time-stepping scheme or a + ! backward Euler scheme. BEBT is valid in the range from + ! 0 (for a forward-backward treatment of nonrotating + ! gravity waves) to 1 (for a backward Euler treatment). + ! In practice, BEBT must be greater than about 0.05. +DTBT = -0.9 ! [s or nondim] default = -0.98 + ! The barotropic time step, in s. DTBT is only used with + ! the split explicit time stepping. To set the time step + ! automatically based the maximum stable value use 0, or + ! a negative value gives the fraction of the stable value. + ! Setting DTBT to 0 is the same as setting it to -0.98. + ! The value of DTBT that will actually be used is an + ! integer fraction of DT, rounding down. + +! === module MOM_thickness_diffuse === + +! === module MOM_mixed_layer_restrat === + +! === module MOM_diag_to_Z === + +! === module MOM_diabatic_driver === +! The following parameters are used for diabatic processes. + +! === module MOM_tracer_advect === +TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM" + ! The horizontal transport scheme for tracers: + ! PLM - Piecewise Linear Method + ! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order) + ! PPM - Piecewise Parabolic Method (Colella-Woodward) + +! === module MOM_tracer_hor_diff === +CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False + ! If true, use enough iterations the diffusion to ensure + ! that the diffusive equivalent of the CFL limit is not + ! violated. If false, always use 1 iteration. + +! === module MOM_neutral_diffusion === +! This module implements neutral diffusion of tracers + +! === module MOM_surface_forcing === +VARIABLE_WINDS = False ! [Boolean] default = True + ! If true, the winds vary in time after the initialization. +VARIABLE_BUOYFORCE = False ! [Boolean] default = True + ! If true, the buoyancy forcing varies in time after the + ! initialization of the model. +BUOY_CONFIG = "zero" ! + ! The character string that indicates how buoyancy forcing + ! is specified. Valid options include (file), (zero), + ! (linear), (USER), (BFB) and (NONE). +WIND_CONFIG = "zero" ! + ! The character string that indicates how wind forcing + ! is specified. Valid options include (file), (2gyre), + ! (1gyre), (gyres), (zero), and (USER). + +! === module MOM_restart === + +! === module MOM_sum_output === +MAXTRUNC = 100000 ! [truncations save_interval-1] default = 0 + ! The run will be stopped, and the day set to a very + ! large value if the velocity is truncated more than + ! MAXTRUNC times between energy saves. Set MAXTRUNC to 0 + ! to stop if there is any truncation of velocities. +DATE_STAMPED_STDOUT = False ! [Boolean] default = True + ! If true, use dates (not times) in messages to stdout +READ_DEPTH_LIST = True ! [Boolean] default = False + ! Read the depth list from a file if it exists or + ! create that file otherwise. +DEPTH_LIST_MIN_INC = 1.0E-06 ! [m] default = 1.0E-10 + ! The minimum increment between the depths of the + ! entries in the depth-list file. + +! === module MOM_write_cputime === + +! === module MOM_main (MOM_driver) === +DT_FORCING = 3600.0 ! [s] default = 900.0 + ! The time step for changing forcing, coupling with other + ! components, or potentially writing certain diagnostics. + ! The default value is given by DT. +DAYMAX = 10.0 ! [days] + ! The final time of the whole simulation, in units of + ! TIMEUNIT seconds. This also sets the potential end + ! time of the present run segment if the end time is + ! not set via ocean_solo_nml in input.nml. +RESTART_CONTROL = 3 ! default = 1 + ! An integer whose bits encode which restart files are + ! written. Add 2 (bit 1) for a time-stamped file, and odd + ! (bit 0) for a non-time-stamped file. A non-time-stamped + ! restart file is saved at the end of the run segment + ! for any non-negative value. +RESTINT = 110.0 ! [days] default = 0.0 + ! The interval between saves of the restart file in units + ! of TIMEUNIT. Use 0 (the default) to not save + ! incremental restart files at all. +ENERGYSAVEDAYS = 0.25 ! [days] default = 0.0416666666666667 + ! The interval in units of TIMEUNIT between saves of the + ! energies of the run and other globally summed diagnostics. + +! === module MOM_file_parser === diff --git a/ocean_only/tides_025/MOM_override b/ocean_only/tides_025/MOM_override new file mode 100644 index 0000000000..2ebd92fb7c --- /dev/null +++ b/ocean_only/tides_025/MOM_override @@ -0,0 +1,3 @@ +! Blank file in which we can put "overrides" for parameters +!VERBOSITY = 9 +SAVE_INITIAL_CONDS = True diff --git a/ocean_only/tides_025/MOM_override_1layer b/ocean_only/tides_025/MOM_override_1layer new file mode 100644 index 0000000000..41b68f0d02 --- /dev/null +++ b/ocean_only/tides_025/MOM_override_1layer @@ -0,0 +1,3 @@ +! This is the override file to run a 1-layer 1/4 degree tide test case. +#override NK = 1 +#override THICKNESS_CONFIG = "uniform" diff --git a/ocean_only/tides_025/MOM_override_2lay_1_12 b/ocean_only/tides_025/MOM_override_2lay_1_12 new file mode 100644 index 0000000000..6fa46eb24a --- /dev/null +++ b/ocean_only/tides_025/MOM_override_2lay_1_12 @@ -0,0 +1,21 @@ +! This is the override file to run a 1/12 degree 2-layer tide test case with +! drag. Because of their size, the required grid, topography and drag files +! are not routinely distributed with the other MOM6 example datasets. +#override NK = 2 +#override THICKNESS_CONFIG = "list" +INTERFACE_IC_FILE = "interface_IC_2layer.nc" +INTERFACE_IC_VAR = "eta" + +#override GRID_FILE = "regional_0.08.mom6.nc" +#override TOPO_EDITS_FILE = "" +#override TOPO_FILE = "depth_GLBc0.08_14mom6.nc" +#override NIGLOBAL = 4500 +#override NJGLOBAL = 3527 + +#override DT = 300.0 +#override DT_THERM = 1800.0 + +BT_LINEAR_WAVE_DRAG = True +BT_WAVE_DRAG_FILE = "tidal.JSLH.14.lim24_mom6.nc" +BT_WAVE_DRAG_VAR = "rh" +BW_WAVE_DRAG_SCALE = 1.0 diff --git a/ocean_only/tides_025/MOM_override_2layer b/ocean_only/tides_025/MOM_override_2layer new file mode 100644 index 0000000000..4397a8ca58 --- /dev/null +++ b/ocean_only/tides_025/MOM_override_2layer @@ -0,0 +1,7 @@ +! This is the override file to run a 2-layer 1/4 degree tide test case, similar +! to that which was used by Simmons et al., 2004, Deep Sea Res., 51:3043-3068. +#override NK = 2 +#override THICKNESS_CONFIG = "list" +INTERFACE_IC_FILE = "interface_IC_2layer.nc" +INTERFACE_IC_VAR = "eta" +SAVE_INITIAL_CONDS = True diff --git a/ocean_only/tides_025/MOM_parameter_doc.all b/ocean_only/tides_025/MOM_parameter_doc.all new file mode 100644 index 0000000000..44411ca675 --- /dev/null +++ b/ocean_only/tides_025/MOM_parameter_doc.all @@ -0,0 +1,1242 @@ +! This file was written by the model and records all non-layout parameters used at run-time. + +! === module MOM === +VERBOSITY = 2 ! default = 2 + ! Integer controlling level of messaging + ! 0 = Only FATAL messages + ! 2 = Only FATAL, WARNING, NOTE [default] + ! 9 = All) +DO_UNIT_TESTS = False ! [Boolean] default = False + ! If True, exercises unit tests at model start up. +SPLIT = True ! [Boolean] default = True + ! Use the split time stepping if true. +CALC_RHO_FOR_SEA_LEVEL = False ! [Boolean] default = False + ! If true, the in-situ density is used to calculate the + ! effective sea level that is returned to the coupler. If false, + ! the Boussinesq parameter RHO_0 is used. +ENABLE_THERMODYNAMICS = False ! [Boolean] default = True + ! If true, Temperature and salinity are used as state + ! variables. +USE_EOS = False ! [Boolean] default = False + ! If true, density is calculated from temperature and + ! salinity with an equation of state. If USE_EOS is + ! true, ENABLE_THERMODYNAMICS must be true as well. +DIABATIC_FIRST = False ! [Boolean] default = False + ! If true, apply diabatic and thermodynamic processes, + ! including buoyancy forcing and mass gain or loss, + ! before stepping the dynamics forward. +USE_CONTEMP_ABSSAL = False ! [Boolean] default = False + ! If true, , the prognostics T&S are the conservative temperature + ! and absolute salinity. Care should be taken to convert them + ! to potential temperature and practical salinity before + ! exchanging them with the coupler and/or reporting T&S diagnostics. +ADIABATIC = True ! [Boolean] default = False + ! There are no diapycnal mass fluxes if ADIABATIC is + ! true. This assumes that KD = KDML = 0.0 and that + ! there is no buoyancy forcing, but makes the model + ! faster by eliminating subroutine calls. +OFFLINE_TRACER_MODE = False ! [Boolean] default = False + ! If true, barotropic and baroclinic dynamics, thermodynamics + ! are all bypassed with all the fields necessary to integrate + ! the tracer advection and diffusion equation are read in from + ! files stored from a previous integration of the prognostic model. + ! NOTE: This option only used in the ocean_solo_driver. +USE_REGRIDDING = False ! [Boolean] default = False + ! If True, use the ALE algorithm (regridding/remapping). + ! If False, use the layered isopycnal algorithm. +BULKMIXEDLAYER = False ! [Boolean] default = False + ! If true, use a Kraus-Turner-like bulk mixed layer + ! with transitional buffer layers. Layers 1 through + ! NKML+NKBL have variable densities. There must be at + ! least NKML+NKBL+1 layers if BULKMIXEDLAYER is true. + ! BULKMIXEDLAYER can not be used with USE_REGRIDDING. + ! The default is influenced by ENABLE_THERMODYNAMICS. +THICKNESSDIFFUSE = False ! [Boolean] default = False + ! If true, interface heights are diffused with a + ! coefficient of KHTH. +THICKNESSDIFFUSE_FIRST = False ! [Boolean] default = False + ! If true, do thickness diffusion before dynamics. + ! This is only used if THICKNESSDIFFUSE is true. +BATHYMETRY_AT_VEL = False ! [Boolean] default = False + ! If true, there are separate values for the basin depths + ! at velocity points. Otherwise the effects of topography + ! are entirely determined from thickness points. +DEBUG = False ! [Boolean] default = False + ! If true, write out verbose debugging data. +DEBUG_TRUNCATIONS = False ! [Boolean] default = False + ! If true, calculate all diagnostics that are useful for + ! debugging truncations. +DT = 900.0 ! [s] + ! The (baroclinic) dynamics time step. The time-step that + ! is actually used will be an integer fraction of the + ! forcing time-step (DT_FORCING in ocean-only mode or the + ! coupling timestep in coupled mode.) +DT_THERM = 3600.0 ! [s] default = 900.0 + ! The thermodynamic and tracer advection time step. + ! Ideally DT_THERM should be an integer multiple of DT + ! and less than the forcing or coupling time-step, unless + ! THERMO_SPANS_COUPLING is true, in which case DT_THERM + ! can be an integer multiple of the coupling timestep. By + ! default DT_THERM is set to DT. +THERMO_SPANS_COUPLING = False ! [Boolean] default = False + ! If true, the MOM will take thermodynamic and tracer + ! timesteps that can be longer than the coupling timestep. + ! The actual thermodynamic timestep that is used in this + ! case is the largest integer multiple of the coupling + ! timestep that is less than or equal to DT_THERM. +HMIX_SFC_PROP = 1.0 ! [m] default = 1.0 + ! If BULKMIXEDLAYER is false, HMIX_SFC_PROP is the depth + ! over which to average to find surface properties like + ! SST and SSS or density (but not surface velocities). +HMIX_UV_SFC_PROP = 0.0 ! [m] default = 0.0 + ! If BULKMIXEDLAYER is false, HMIX_UV_SFC_PROP is the depth + ! over which to average to find surface flow properties, + ! SSU, SSV. A non-positive value indicates no averaging. +MIN_Z_DIAG_INTERVAL = 0.0 ! [s] default = 0.0 + ! The minimum amount of time in seconds between + ! calculations of depth-space diagnostics. Making this + ! larger than DT_THERM reduces the performance penalty + ! of regridding to depth online. +INTERPOLATE_P_SURF = False ! [Boolean] default = False + ! If true, linearly interpolate the surface pressure + ! over the coupling time step, using the specified value + ! at the end of the step. +DTBT_RESET_PERIOD = -1.0 ! [s] default = 3600.0 + ! The period between recalculations of DTBT (if DTBT <= 0). + ! If DTBT_RESET_PERIOD is negative, DTBT is set based + ! only on information available at initialization. If + ! dynamic, DTBT will be set at least every forcing time + ! step, and if 0, every dynamics time step. The default is + ! set by DT_THERM. This is only used if SPLIT is true. +FIRST_DIRECTION = 0 ! default = 0 + ! An integer that indicates which direction goes first + ! in parts of the code that use directionally split + ! updates, with even numbers (or 0) used for x- first + ! and odd numbers used for y-first. +CHECK_BAD_SURFACE_VALS = True ! [Boolean] default = False + ! If true, check the surface state for ridiculous values. +BAD_VAL_SSH_MAX = 50.0 ! [m] default = 20.0 + ! The value of SSH above which a bad value message is + ! triggered, if CHECK_BAD_SURFACE_VALS is true. +BAD_VAL_SSS_MAX = 45.0 ! [PPT] default = 45.0 + ! The value of SSS above which a bad value message is + ! triggered, if CHECK_BAD_SURFACE_VALS is true. +BAD_VAL_SST_MAX = 45.0 ! [deg C] default = 45.0 + ! The value of SST above which a bad value message is + ! triggered, if CHECK_BAD_SURFACE_VALS is true. +BAD_VAL_SST_MIN = -2.1 ! [deg C] default = -2.1 + ! The value of SST below which a bad value message is + ! triggered, if CHECK_BAD_SURFACE_VALS is true. +BAD_VAL_COLUMN_THICKNESS = 0.0 ! [m] default = 0.0 + ! The value of column thickness below which a bad value message is + ! triggered, if CHECK_BAD_SURFACE_VALS is true. +SAVE_INITIAL_CONDS = True ! [Boolean] default = False + ! If true, write the initial conditions to a file given + ! by IC_OUTPUT_FILE. +IC_OUTPUT_FILE = "MOM_IC" ! default = "MOM_IC" + ! The file into which to write the initial conditions. +WRITE_GEOM = 1 ! default = 1 + ! If =0, never write the geometry and vertical grid files. + ! If =1, write the geometry and vertical grid files only for + ! a new simulation. If =2, always write the geometry and + ! vertical grid files. Other values are invalid. + +! === module MOM_domains === +REENTRANT_X = True ! [Boolean] default = True + ! If true, the domain is zonally reentrant. +REENTRANT_Y = False ! [Boolean] default = False + ! If true, the domain is meridionally reentrant. +TRIPOLAR_N = True ! [Boolean] default = False + ! Use tripolar connectivity at the northern edge of the + ! domain. With TRIPOLAR_N, NIGLOBAL must be even. +NIGLOBAL = 1440 ! + ! The total number of thickness grid points in the + ! x-direction in the physical domain. With STATIC_MEMORY_ + ! this is set in MOM_memory.h at compile time. +NJGLOBAL = 1080 ! + ! The total number of thickness grid points in the + ! y-direction in the physical domain. With STATIC_MEMORY_ + ! this is set in MOM_memory.h at compile time. +DEBUG_CHKSUMS = False ! [Boolean] default = False + ! If true, checksums are performed on arrays in the + ! various vec_chksum routines. +DEBUG_REDUNDANT = False ! [Boolean] default = False + ! If true, debug redundant data points during calls to + ! the various vec_chksum routines. + +! === module MOM_hor_index === +! Sets the horizontal array index types. + +! === module MOM_verticalGrid === +! Parameters providing information about the vertical grid. +G_EARTH = 9.8 ! [m s-2] default = 9.8 + ! The gravitational acceleration of the Earth. +RHO_0 = 1035.0 ! [kg m-3] default = 1035.0 + ! The mean ocean density used with BOUSSINESQ true to + ! calculate accelerations and the mass for conservation + ! properties, or with BOUSSINSEQ false to convert some + ! parameters from vertical units of m to kg m-2. +BOUSSINESQ = False ! [Boolean] default = True + ! If true, make the Boussinesq approximation. +ANGSTROM = 1.0E-10 ! [m] default = 1.0E-10 + ! The minumum layer thickness, usually one-Angstrom. +H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0 + ! A constant that translates thicknesses from the model's + ! internal units of thickness to kg m-2. +NK = 2 ! [nondim] + ! The number of model layers. + +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "ocean_topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_VARNAME = "depth" ! default = "depth" + ! The name of the bathymetry variable in TOPO_FILE. +TOPO_EDITS_FILE = "All_edits.nc" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6500.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 9.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 + ! The number of open boundary segments. +EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False + ! If true, extend OBC segments. This option is used to recover + ! legacy solutions dependent on an incomplete implementaion of OBCs. + ! This option will be obsoleted in the future. +MASKING_DEPTH = 0.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "list" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +CHANNEL_LIST_FILE = "MOM_channels_global_025" ! default = "MOM_channel_list" + ! The file from which the list of narrowed channels is read. +CHANNEL_LIST_360_LON_CHECK = True ! [Boolean] default = True + ! If true, the channel configuration list works for any + ! longitudes in the range of -360 to 360. +ROTATION = "2omegasinlat" ! default = "2omegasinlat" + ! This specifies how the Coriolis parameter is specified: + ! 2omegasinlat - Use twice the planetary rotation rate + ! times the sine of latitude. + ! betaplane - Use a beta-plane or f-plane. + ! USER - call a user modified routine. +OMEGA = 7.2921E-05 ! [s-1] default = 7.2921E-05 + ! The rotation rate of the earth. +PARALLEL_RESTARTFILES = False ! [Boolean] default = False + ! If true, each processor writes its own restart file, + ! otherwise a single restart file is generated + +! === module MOM_tracer_registry === + +! === module MOM_restart === +RESTARTFILE = "MOM.res" ! default = "MOM.res" + ! The name-root of the restart file. +LARGE_FILE_SUPPORT = True ! [Boolean] default = True + ! If true, use the file-size limits with NetCDF large + ! file support (4Gb), otherwise the limit is 2Gb. +MAX_FIELDS = 100 ! default = 100 + ! The maximum number of restart fields that can be used. + +! === module MOM_tracer_flow_control === +USE_USER_TRACER_EXAMPLE = False ! [Boolean] default = False + ! If true, use the USER_tracer_example tracer package. +USE_DOME_TRACER = False ! [Boolean] default = False + ! If true, use the DOME_tracer tracer package. +USE_ISOMIP_TRACER = False ! [Boolean] default = False + ! If true, use the ISOMIP_tracer tracer package. +USE_IDEAL_AGE_TRACER = False ! [Boolean] default = False + ! If true, use the ideal_age_example tracer package. +USE_REGIONAL_DYES = False ! [Boolean] default = False + ! If true, use the regional_dyes tracer package. +USE_OIL_TRACER = False ! [Boolean] default = False + ! If true, use the oil_tracer tracer package. +USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False + ! If true, use the advection_test_tracer tracer package. +USE_OCMIP2_CFC = False ! [Boolean] default = False + ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_generic_tracer = False ! [Boolean] default = False + ! If true and _USE_GENERIC_TRACER is defined as a + ! preprocessor macro, use the MOM_generic_tracer packages. +USE_PSEUDO_SALT_TRACER = False ! [Boolean] default = False + ! If true, use the pseudo salt tracer, typically run as a diagnostic. +USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False + ! If true, use the boundary impulse tracer. +USE_DYED_OBC_TRACER = False ! [Boolean] default = False + ! If true, use the dyed_obc_tracer tracer package. + +! === module MOM_coord_initialization === +COORD_CONFIG = "gprime" ! + ! This specifies how layers are to be defined: + ! ALE or none - used to avoid defining layers in ALE mode + ! file - read coordinate information from the file + ! specified by (COORD_FILE). + ! BFB - Custom coords for buoyancy-forced basin case + ! based on SST_S, T_BOT and DRHO_DT. + ! linear - linear based on interfaces not layers + ! layer_ref - linear based on layer densities + ! ts_ref - use reference temperature and salinity + ! ts_range - use range of temperature and salinity + ! (T_REF and S_REF) to determine surface density + ! and GINT calculate internal densities. + ! gprime - use reference density (RHO_0) for surface + ! density and GINT calculate internal densities. + ! ts_profile - use temperature and salinity profiles + ! (read from COORD_FILE) to set layer densities. + ! USER - call a user modified routine. +GFS = 9.8 ! [m s-2] default = 9.8 + ! The reduced gravity at the free surface. +GINT = 0.0164 ! [m s-2] + ! The reduced gravity across internal interfaces. + +! === module MOM_grid === +! Parameters providing information about the lateral grid. + +! === module MOM_state_initialization === +INIT_LAYERS_FROM_Z_FILE = False ! [Boolean] default = False + ! If true, intialize the layer thicknesses, temperatures, + ! and salnities from a Z-space file on a latitude- + ! longitude grid. +THICKNESS_CONFIG = "list" ! + ! A string that determines how the initial layer + ! thicknesses are specified for a new run: + ! file - read interface heights from the file specified + ! thickness_file - read thicknesses from the file specified + ! by (THICKNESS_FILE). + ! coord - determined by ALE coordinate. + ! uniform - uniform thickness layers evenly distributed + ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a configuration for the + ! ISOMIP test case. + ! benchmark - use the benchmark test case thicknesses. + ! Neverland - use the Neverland test case thicknesses. + ! search - search a density profile for the interface + ! densities. This is not yet implemented. + ! circle_obcs - the circle_obcs test case is used. + ! DOME2D - 2D version of DOME initialization. + ! adjustment2d - TBD AJA. + ! sloshing - TBD AJA. + ! seamount - TBD AJA. + ! soliton - Equatorial Rossby soliton. + ! rossby_front - a mixed layer front in thermal wind balance. + ! USER - call a user modified routine. +INTERFACE_IC_FILE = "interface_IC_2layer.nc" ! + ! The file from which horizontal mean initial conditions + ! for interface depths can be read. +INTERFACE_IC_VAR = "eta" ! default = "eta" + ! The variable name for horizontal mean initial conditions + ! for interface depths relative to mean sea level. +VELOCITY_CONFIG = "zero" ! default = "zero" + ! A string that determines how the initial velocities + ! are specified for a new run: + ! file - read velocities from the file specified + ! by (VELOCITY_FILE). + ! zero - the fluid is initially at rest. + ! uniform - the flow is uniform (determined by + ! parameters INITIAL_U_CONST and INITIAL_V_CONST). + ! rossby_front - a mixed layer front in thermal wind balance. + ! soliton - Equatorial Rossby soliton. + ! USER - call a user modified routine. +CONVERT_THICKNESS_UNITS = True ! [Boolean] default = True + ! If true, convert the thickness initial conditions from + ! units of m to kg m-2 or vice versa, depending on whether + ! BOUSSINESQ is defined. This does not apply if a restart + ! file is read. +DEPRESS_INITIAL_SURFACE = False ! [Boolean] default = False + ! If true, depress the initial surface to avoid huge + ! tsunamis when a large surface pressure is applied. +TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False + ! If true, cuts way the top of the column for initial conditions + ! at the depth where the hydrostatic presure matches the imposed + ! surface pressure which is read from file. +SPONGE = False ! [Boolean] default = False + ! If true, sponges may be applied anywhere in the domain. + ! The exact location and properties of those sponges are + ! specified via SPONGE_CONFIG. + +! === module MOM_diag_mediator === +NUM_DIAG_COORDS = 1 ! default = 1 + ! The number of diagnostic vertical coordinates to use. + ! For each coordinate, an entry in DIAG_COORDS must be provided. +DIAG_COORDS = "z Z ZSTAR" ! default = "z Z ZSTAR" + ! A list of string tuples associating diag_table modules to + ! a coordinate definition used for diagnostics. Each string + ! is of the form "MODULE_SUFFIX PARAMETER_SUFFIX COORDINATE_NAME". +DIAG_MISVAL = 1.0E+20 ! [not defined] default = 1.0E+20 + ! Set the default missing value to use for diagnostics. +AVAILABLE_DIAGS_FILE = "available_diags.000000" ! default = "available_diags.000000" + ! A file into which to write a list of all available + ! ocean diagnostics that can be included in a diag_table. +DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09" + ! Determines how to specify the coordinate + ! resolution. Valid options are: + ! PARAM - use the vector-parameter DIAG_COORD_RES_Z + ! UNIFORM[:N] - uniformly distributed + ! FILE:string - read from a file. The string specifies + ! the filename and variable name, separated + ! by a comma or space, e.g. FILE:lev.nc,dz + ! or FILE:lev.nc,interfaces=zw + ! WOA09[:N] - the WOA09 vertical grid (approximately) + ! FNC1:string - FNC1:dz_min,H_total,power,precision + ! HYBRID:string - read from a file. The string specifies + ! the filename and two variable names, separated + ! by a comma or space, for sigma-2 and dz. e.g. + ! HYBRID:vgrid.nc,sigma2,dz + +! === module MOM_MEKE === +USE_MEKE = False ! [Boolean] default = False + ! If true, turns on the MEKE scheme which calculates + ! a sub-grid mesoscale eddy kinetic energy budget. + +! === module MOM_lateral_mixing_coeffs === +USE_VARIABLE_MIXING = False ! [Boolean] default = False + ! If true, the variable mixing code will be called. This + ! allows diagnostics to be created even if the scheme is + ! not used. If KHTR_SLOPE_CFF>0 or KhTh_Slope_Cff>0, + ! this is set to true regardless of what is in the + ! parameter file. +RESOLN_SCALED_KH = True ! [Boolean] default = False + ! If true, the Laplacian lateral viscosity is scaled away + ! when the first baroclinic deformation radius is well + ! resolved. +RESOLN_SCALED_KHTH = False ! [Boolean] default = False + ! If true, the interface depth diffusivity is scaled away + ! when the first baroclinic deformation radius is well + ! resolved. +RESOLN_SCALED_KHTR = False ! [Boolean] default = False + ! If true, the epipycnal tracer diffusivity is scaled + ! away when the first baroclinic deformation radius is + ! well resolved. +RESOLN_USE_EBT = False ! [Boolean] default = False + ! If true, uses the equivalent barotropic wave speed instead + ! of first baroclinic wave for calculating the resolution fn. +KHTH_USE_EBT_STRUCT = False ! [Boolean] default = False + ! If true, uses the equivalent barotropic structure + ! as the vertical structure of thickness diffusivity. +KHTH_SLOPE_CFF = 0.0 ! [nondim] default = 0.0 + ! The nondimensional coefficient in the Visbeck formula + ! for the interface depth diffusivity +KHTR_SLOPE_CFF = 0.0 ! [nondim] default = 0.0 + ! The nondimensional coefficient in the Visbeck formula + ! for the epipycnal tracer diffusivity +USE_STORED_SLOPES = False ! [Boolean] default = False + ! If true, the isopycnal slopes are calculated once and + ! stored for re-use. This uses more memory but avoids calling + ! the equation of state more times than should be necessary. +KH_RES_SCALE_COEF = 1.0 ! [nondim] default = 1.0 + ! A coefficient that determines how KhTh is scaled away if + ! RESOLN_SCALED_... is true, as + ! F = 1 / (1 + (KH_RES_SCALE_COEF*Rd/dx)^KH_RES_FN_POWER). +KH_RES_FN_POWER = 2 ! [nondim] default = 2 + ! The power of dx/Ld in the Kh resolution function. Any + ! positive integer may be used, although even integers + ! are more efficient to calculate. Setting this greater + ! than 100 results in a step-function being used. +VISC_RES_SCALE_COEF = 1.0 ! [nondim] default = 1.0 + ! A coefficient that determines how Kh is scaled away if + ! RESOLN_SCALED_... is true, as + ! F = 1 / (1 + (KH_RES_SCALE_COEF*Rd/dx)^KH_RES_FN_POWER). + ! This function affects lateral viscosity, Kh, and not KhTh. +VISC_RES_FN_POWER = 2 ! [nondim] default = 2 + ! The power of dx/Ld in the Kh resolution function. Any + ! positive integer may be used, although even integers + ! are more efficient to calculate. Setting this greater + ! than 100 results in a step-function being used. + ! This function affects lateral viscosity, Kh, and not KhTh. +INTERPOLATE_RES_FN = False ! [Boolean] default = True + ! If true, interpolate the resolution function to the + ! velocity points from the thickness points; otherwise + ! interpolate the wave speed and calculate the resolution + ! function independently at each point. +USE_VISBECK_SLOPE_BUG = False ! [Boolean] default = False + ! If true, then retain a legacy bug in the calculation of weights + ! applied to isoneutral slopes. There was an erroneous k-indexing + ! for layer thicknesses. In addition, masking at coastlines was not + ! used which introduced potential restart issues. This flag will be + ! deprecated in a future release. +GILL_EQUATORIAL_LD = True ! [Boolean] default = False + ! If true, uses Gill's definition of the baroclinic + ! equatorial deformation radius, otherwise, if false, use + ! Pedlosky's definition. These definitions differ by a factor + ! of 2 infront of the beta term in the denominator. Gill'sis the more appropriate definition. + +! === module MOM_set_visc === +BOTTOMDRAGLAW = True ! [Boolean] default = True + ! If true, the bottom stress is calculated with a drag + ! law of the form c_drag*|u|*u. The velocity magnitude + ! may be an assumed value or it may be based on the + ! actual velocity in the bottommost HBBL, depending on + ! LINEAR_DRAG. +CHANNEL_DRAG = True ! [Boolean] default = False + ! If true, the bottom drag is exerted directly on each + ! layer proportional to the fraction of the bottom it + ! overlies. +LINEAR_DRAG = False ! [Boolean] default = False + ! If LINEAR_DRAG and BOTTOMDRAGLAW are defined the drag + ! law is cdrag*DRAG_BG_VEL*u. +PRANDTL_TURB = 1.0 ! [nondim] default = 1.0 + ! The turbulent Prandtl number applied to shear + ! instability. +DYNAMIC_VISCOUS_ML = False ! [Boolean] default = False + ! If true, use a bulk Richardson number criterion to + ! determine the mixed layer thickness for viscosity. +HBBL = 10.0 ! [m] + ! The thickness of a bottom boundary layer with a + ! viscosity of KVBBL if BOTTOMDRAGLAW is not defined, or + ! the thickness over which near-bottom velocities are + ! averaged for the drag law if BOTTOMDRAGLAW is defined + ! but LINEAR_DRAG is not. +CDRAG = 0.003 ! [nondim] default = 0.003 + ! CDRAG is the drag coefficient relating the magnitude of + ! the velocity field to the bottom stress. CDRAG is only + ! used if BOTTOMDRAGLAW is defined. +DRAG_BG_VEL = 0.1 ! [m s-1] default = 0.0 + ! DRAG_BG_VEL is either the assumed bottom velocity (with + ! LINEAR_DRAG) or an unresolved velocity that is + ! combined with the resolved velocity to estimate the + ! velocity magnitude. DRAG_BG_VEL is only used when + ! BOTTOMDRAGLAW is defined. +BBL_USE_EOS = False ! [Boolean] default = False + ! If true, use the equation of state in determining the + ! properties of the bottom boundary layer. Otherwise use + ! the layer target potential densities. +BBL_THICK_MIN = 0.1 ! [m] default = 0.0 + ! The minimum bottom boundary layer thickness that can be + ! used with BOTTOMDRAGLAW. This might be + ! Kv / (cdrag * drag_bg_vel) to give Kv as the minimum + ! near-bottom viscosity. +HTBL_SHELF_MIN = 0.1 ! [m] default = 0.1 + ! The minimum top boundary layer thickness that can be + ! used with BOTTOMDRAGLAW. This might be + ! Kv / (cdrag * drag_bg_vel) to give Kv as the minimum + ! near-top viscosity. +HTBL_SHELF = 10.0 ! [m] default = 10.0 + ! The thickness over which near-surface velocities are + ! averaged for the drag law under an ice shelf. By + ! default this is the same as HBBL +KV = 1.0E-04 ! [m2 s-1] + ! The background kinematic viscosity in the interior. + ! The molecular value, ~1e-6 m2 s-1, may be used. +KV_BBL_MIN = 1.0E-04 ! [m2 s-1] default = 1.0E-04 + ! The minimum viscosities in the bottom boundary layer. +KV_TBL_MIN = 1.0E-04 ! [m2 s-1] default = 1.0E-04 + ! The minimum viscosities in the top boundary layer. +SMAG_CONST_CHANNEL = 0.15 ! [nondim] default = 0.15 + ! The nondimensional Laplacian Smagorinsky constant used + ! in calculating the channel drag if it is enabled. The + ! default is to use the same value as SMAG_LAP_CONST if + ! it is defined, or 0.15 if it is not. The value used is + ! also 0.15 if the specified value is negative. +TIDES = True ! [Boolean] default = False + ! If true, apply tidal momentum forcing. +BE = 0.6 ! [nondim] default = 0.6 + ! If SPLIT is true, BE determines the relative weighting + ! of a 2nd-order Runga-Kutta baroclinic time stepping + ! scheme (0.5) and a backward Euler scheme (1) that is + ! used for the Coriolis and inertial terms. BE may be + ! from 0.5 to 1, but instability may occur near 0.5. + ! BE is also applicable if SPLIT is false and USE_RK2 + ! is true. +BEGW = 0.0 ! [nondim] default = 0.0 + ! If SPLIT is true, BEGW is a number from 0 to 1 that + ! controls the extent to which the treatment of gravity + ! waves is forward-backward (0) or simulated backward + ! Euler (1). 0 is almost always used. + ! If SPLIT is false and USE_RK2 is true, BEGW can be + ! between 0 and 0.5 to damp gravity waves. +SPLIT_BOTTOM_STRESS = False ! [Boolean] default = False + ! If true, provide the bottom stress calculated by the + ! vertical viscosity to the barotropic solver. +BT_USE_LAYER_FLUXES = True ! [Boolean] default = True + ! If true, use the summed layered fluxes plus an + ! adjustment due to the change in the barotropic velocity + ! in the barotropic continuity equation. + +! === module MOM_continuity === +CONTINUITY_SCHEME = "PPM" ! default = "PPM" + ! CONTINUITY_SCHEME selects the discretization for the + ! continuity solver. The only valid value currently is: + ! PPM - use a positive-definite (or monotonic) + ! piecewise parabolic reconstruction solver. + +! === module MOM_continuity_PPM === +MONOTONIC_CONTINUITY = False ! [Boolean] default = False + ! If true, CONTINUITY_PPM uses the Colella and Woodward + ! monotonic limiter. The default (false) is to use a + ! simple positive definite limiter. +SIMPLE_2ND_PPM_CONTINUITY = False ! [Boolean] default = False + ! If true, CONTINUITY_PPM uses a simple 2nd order + ! (arithmetic mean) interpolation of the edge values. + ! This may give better PV conservation propterties. While + ! it formally reduces the accuracy of the continuity + ! solver itself in the strongly advective limit, it does + ! not reduce the overall order of accuracy of the dynamic + ! core. +UPWIND_1ST_CONTINUITY = False ! [Boolean] default = False + ! If true, CONTINUITY_PPM becomes a 1st-order upwind + ! continuity solver. This scheme is highly diffusive + ! but may be useful for debugging or in single-column + ! mode where its minimal stencil is useful. +ETA_TOLERANCE = 1.0E-12 ! [m] default = 1.0E-10 + ! The tolerance for the differences between the + ! barotropic and baroclinic estimates of the sea surface + ! height due to the fluxes through each face. The total + ! tolerance for SSH is 4 times this value. The default + ! is 0.5*NK*ANGSTROM, and this should not be set less x + ! than about 10^-15*MAXIMUM_DEPTH. +ETA_TOLERANCE_AUX = 1.0E-12 ! [m] default = 1.0E-12 + ! The tolerance for free-surface height discrepancies + ! between the barotropic solution and the sum of the + ! layer thicknesses when calculating the auxiliary + ! corrected velocities. By default, this is the same as + ! ETA_TOLERANCE, but can be made larger for efficiency. +VELOCITY_TOLERANCE = 3.0E+08 ! [m s-1] default = 3.0E+08 + ! The tolerance for barotropic velocity discrepancies + ! between the barotropic solution and the sum of the + ! layer thicknesses. +CONT_PPM_AGGRESS_ADJUST = False ! [Boolean] default = False + ! If true, allow the adjusted velocities to have a + ! relative CFL change up to 0.5. +CONT_PPM_VOLUME_BASED_CFL = False ! [Boolean] default = False + ! If true, use the ratio of the open face lengths to the + ! tracer cell areas when estimating CFL numbers. The + ! default is set by CONT_PPM_AGGRESS_ADJUST. +CONTINUITY_CFL_LIMIT = 0.5 ! [nondim] default = 0.5 + ! The maximum CFL of the adjusted velocities. +CONT_PPM_BETTER_ITER = True ! [Boolean] default = True + ! If true, stop corrective iterations using a velocity + ! based criterion and only stop if the iteration is + ! better than all predecessors. +CONT_PPM_USE_VISC_REM_MAX = True ! [Boolean] default = True + ! If true, use more appropriate limiting bounds for + ! corrections in strongly viscous columns. +CONT_PPM_MARGINAL_FACE_AREAS = True ! [Boolean] default = True + ! If true, use the marginal face areas from the continuity + ! solver for use as the weights in the barotropic solver. + ! Otherwise use the transport averaged areas. + +! === module MOM_CoriolisAdv === +NOSLIP = False ! [Boolean] default = False + ! If true, no slip boundary conditions are used; otherwise + ! free slip boundary conditions are assumed. The + ! implementation of the free slip BCs on a C-grid is much + ! cleaner than the no slip BCs. The use of free slip BCs + ! is strongly encouraged, and no slip BCs are not used with + ! the biharmonic viscosity. +CORIOLIS_EN_DIS = False ! [Boolean] default = False + ! If true, two estimates of the thickness fluxes are used + ! to estimate the Coriolis term, and the one that + ! dissipates energy relative to the other one is used. +CORIOLIS_SCHEME = "SADOURNY75_ENERGY" ! default = "SADOURNY75_ENERGY" + ! CORIOLIS_SCHEME selects the discretization for the + ! Coriolis terms. Valid values are: + ! SADOURNY75_ENERGY - Sadourny, 1975; energy cons. + ! ARAKAWA_HSU90 - Arakawa & Hsu, 1990 + ! SADOURNY75_ENSTRO - Sadourny, 1975; enstrophy cons. + ! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst. + ! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with + ! Arakawa & Hsu and Sadourny energy +BOUND_CORIOLIS = True ! [Boolean] default = False + ! If true, the Coriolis terms at u-points are bounded by + ! the four estimates of (f+rv)v from the four neighboring + ! v-points, and similarly at v-points. This option would + ! have no effect on the SADOURNY Coriolis scheme if it + ! were possible to use centered difference thickness fluxes. +KE_SCHEME = "KE_ARAKAWA" ! default = "KE_ARAKAWA" + ! KE_SCHEME selects the discretization for acceleration + ! due to the kinetic energy gradient. Valid values are: + ! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV +PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED" + ! PV_ADV_SCHEME selects the discretization for PV + ! advection. Valid values are: + ! PV_ADV_CENTERED - centered (aka Sadourny, 75) + ! PV_ADV_UPWIND1 - upwind, first order + +! === module MOM_tidal_forcing === +TIDE_M2 = True ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the M2 + ! frequency. This is only used if TIDES is true. +TIDE_S2 = False ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the S2 + ! frequency. This is only used if TIDES is true. +TIDE_N2 = False ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the N2 + ! frequency. This is only used if TIDES is true. +TIDE_K2 = False ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the K2 + ! frequency. This is only used if TIDES is true. +TIDE_K1 = False ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the K1 + ! frequency. This is only used if TIDES is true. +TIDE_O1 = False ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the O1 + ! frequency. This is only used if TIDES is true. +TIDE_P1 = False ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the P1 + ! frequency. This is only used if TIDES is true. +TIDE_Q1 = False ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the Q1 + ! frequency. This is only used if TIDES is true. +TIDE_MF = False ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the MF + ! frequency. This is only used if TIDES is true. +TIDE_MM = False ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the MM + ! frequency. This is only used if TIDES is true. +TIDAL_SAL_FROM_FILE = False ! [Boolean] default = False + ! If true, read the tidal self-attraction and loading + ! from input files, specified by TIDAL_INPUT_FILE. + ! This is only used if TIDES is true. +USE_PREVIOUS_TIDES = False ! [Boolean] default = False + ! If true, use the SAL from the previous iteration of the + ! tides to facilitate convergent iteration. + ! This is only used if TIDES is true. +TIDE_USE_SAL_SCALAR = True ! [Boolean] default = True + ! If true and TIDES is true, use the scalar approximation + ! when calculating self-attraction and loading. +TIDE_SAL_SCALAR_VALUE = 0.094 ! [m m-1] + ! The constant of proportionality between sea surface + ! height (really it should be bottom pressure) anomalies + ! and bottom geopotential anomalies. This is only used if + ! TIDES and TIDE_USE_SAL_SCALAR are true. +TIDE_M2_FREQ = 1.405189E-04 ! [s-1] default = 1.405189E-04 + ! Frequency of the M2 tidal constituent. + ! This is only used if TIDES and TIDE_M2 are true. +TIDE_M2_AMP = 0.242334 ! [m] default = 0.242334 + ! Amplitude of the M2 tidal constituent. + ! This is only used if TIDES and TIDE_M2 are true. +TIDE_M2_PHASE_T0 = 0.0 ! [radians] default = 0.0 + ! Phase of the M2 tidal constituent at time 0. + ! This is only used if TIDES and TIDE_M2 are true. + +! === module MOM_PressureForce === +ANALYTIC_FV_PGF = True ! [Boolean] default = True + ! If true the pressure gradient forces are calculated + ! with a finite volume form that analytically integrates + ! the equations of state in pressure to avoid any + ! possibility of numerical thermobaric instability, as + ! described in Adcroft et al., O. Mod. (2008). + +! === module MOM_PressureForce_AFV === +MASS_WEIGHT_IN_PRESSURE_GRADIENT = False ! [Boolean] default = False + ! If true, use mass weighting when interpolation T/S for + ! top/bottom integrals in AFV pressure gradient calculation. + +! === module MOM_hor_visc === +LAPLACIAN = True ! [Boolean] default = False + ! If true, use a Laplacian horizontal viscosity. +KH = 0.0 ! [m2 s-1] default = 0.0 + ! The background Laplacian horizontal viscosity. +KH_BG_MIN = 0.0 ! [m2 s-1] default = 0.0 + ! The minimum value allowed for Laplacian horizontal viscosity, KH. +KH_VEL_SCALE = 0.003 ! [m s-1] default = 0.0 + ! The velocity scale which is multiplied by the grid + ! spacing to calculate the Laplacian viscosity. + ! The final viscosity is the largest of this scaled + ! viscosity, the Smagorinsky and Leith viscosities, and KH. +SMAGORINSKY_KH = False ! [Boolean] default = False + ! If true, use a Smagorinsky nonlinear eddy viscosity. +LEITH_KH = False ! [Boolean] default = False + ! If true, use a Leith nonlinear eddy viscosity. +MODIFIED_LEITH = False ! [Boolean] default = False + ! If true, add a term to Leith viscosity which is + ! proportional to the gradient of divergence. +BOUND_KH = True ! [Boolean] default = True + ! If true, the Laplacian coefficient is locally limited + ! to be stable. +BETTER_BOUND_KH = True ! [Boolean] default = True + ! If true, the Laplacian coefficient is locally limited + ! to be stable with a better bounding than just BOUND_KH. +BIHARMONIC = True ! [Boolean] default = True + ! If true, use a biharmonic horizontal viscosity. + ! BIHARMONIC may be used with LAPLACIAN. +AH = 0.0 ! [m4 s-1] default = 0.0 + ! The background biharmonic horizontal viscosity. +AH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 + ! The velocity scale which is multiplied by the cube of + ! the grid spacing to calculate the biharmonic viscosity. + ! The final viscosity is the largest of this scaled + ! viscosity, the Smagorinsky and Leith viscosities, and AH. +SMAGORINSKY_AH = True ! [Boolean] default = False + ! If true, use a biharmonic Smagorinsky nonlinear eddy + ! viscosity. +LEITH_AH = False ! [Boolean] default = False + ! If true, use a biharmonic Leith nonlinear eddy + ! viscosity. +BOUND_AH = True ! [Boolean] default = True + ! If true, the biharmonic coefficient is locally limited + ! to be stable. +BETTER_BOUND_AH = True ! [Boolean] default = True + ! If true, the biharmonic coefficient is locally limited + ! to be stable with a better bounding than just BOUND_AH. +SMAG_BI_CONST = 0.06 ! [nondim] default = 0.0 + ! The nondimensional biharmonic Smagorinsky constant, + ! typically 0.015 - 0.06. +BOUND_CORIOLIS_BIHARM = True ! [Boolean] default = True + ! If true use a viscosity that increases with the square + ! of the velocity shears, so that the resulting viscous + ! drag is of comparable magnitude to the Coriolis terms + ! when the velocity differences between adjacent grid + ! points is 0.5*BOUND_CORIOLIS_VEL. The default is the + ! value of BOUND_CORIOLIS (or false). +BOUND_CORIOLIS_VEL = 6.0 ! [m s-1] default = 6.0 + ! The velocity scale at which BOUND_CORIOLIS_BIHARM causes + ! the biharmonic drag to have comparable magnitude to the + ! Coriolis acceleration. The default is set by MAXVEL. +USE_LAND_MASK_FOR_HVISC = False ! [Boolean] default = False + ! If true, use Use the land mask for the computation of thicknesses + ! at velocity locations. This eliminates the dependence on arbitrary + ! values over land or outside of the domain. Default is False in order to + ! maintain answers with legacy experiments but should be changed to True + ! for new experiments. +HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 + ! The nondimensional coefficient of the ratio of the + ! viscosity bounds to the theoretical maximum for + ! stability without considering other terms. +USE_KH_BG_2D = False ! [Boolean] default = False + ! If true, read a file containing 2-d background harmonic + ! viscosities. The final viscosity is the maximum of the other terms and this background value. + +! === module MOM_vert_friction === +DIRECT_STRESS = True ! [Boolean] default = False + ! If true, the wind stress is distributed over the + ! topmost HMIX_STRESS of fluid (like in HYCOM), and KVML + ! may be set to a very small value. +U_TRUNC_FILE = "U_velocity_truncations" ! default = "" + ! The absolute path to a file into which the accelerations + ! leading to zonal velocity truncations are written. + ! Undefine this for efficiency if this diagnostic is not + ! needed. +V_TRUNC_FILE = "V_velocity_truncations" ! default = "" + ! The absolute path to a file into which the accelerations + ! leading to meridional velocity truncations are written. + ! Undefine this for efficiency if this diagnostic is not + ! needed. +HARMONIC_VISC = False ! [Boolean] default = False + ! If true, use the harmonic mean thicknesses for + ! calculating the vertical viscosity. +HARMONIC_BL_SCALE = 0.0 ! [nondim] default = 0.0 + ! A scale to determine when water is in the boundary + ! layers based solely on harmonic mean thicknesses for + ! the purpose of determining the extent to which the + ! thicknesses used in the viscosities are upwinded. +HMIX_FIXED = 20.0 ! [m] + ! The prescribed depth over which the near-surface + ! viscosity and diffusivity are elevated when the bulk + ! mixed layer is not used. +HMIX_STRESS = 20.0 ! [m] default = 20.0 + ! The depth over which the wind stress is applied if + ! DIRECT_STRESS is true. +KVML = 0.01 ! [m2 s-1] default = 1.0E-04 + ! The kinematic viscosity in the mixed layer. A typical + ! value is ~1e-2 m2 s-1. KVML is not used if + ! BULKMIXEDLAYER is true. The default is set by KV. +MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 + ! The maximum velocity allowed before the velocity + ! components are truncated. +CFL_BASED_TRUNCATIONS = True ! [Boolean] default = True + ! If true, base truncations on the CFL number, and not an + ! absolute speed. +CFL_TRUNCATE = 0.5 ! [nondim] default = 0.5 + ! The value of the CFL number that will cause velocity + ! components to be truncated; instability can occur past 0.5. +CFL_REPORT = 0.5 ! [nondim] default = 0.5 + ! The value of the CFL number that causes accelerations + ! to be reported; the default is CFL_TRUNCATE. +CFL_TRUNCATE_RAMP_TIME = 0.0 ! [s] default = 0.0 + ! The time over which the CFL trunction value is ramped + ! up at the beginning of the run. +CFL_TRUNCATE_START = 0.0 ! [nondim] default = 0.0 + ! The start value of the truncation CFL number used when + ! ramping up CFL_TRUNC. + +! === module MOM_PointAccel === +MAX_TRUNC_FILE_SIZE_PER_PE = 50 ! default = 50 + ! The maximum number of colums of truncations that any PE + ! will write out during a run. + +! === module MOM_barotropic === +BOUND_BT_CORRECTION = True ! [Boolean] default = False + ! If true, the corrective pseudo mass-fluxes into the + ! barotropic solver are limited to values that require + ! less than maxCFL_BT_cont to be accommodated. +BT_CONT_CORR_BOUNDS = True ! [Boolean] default = True + ! If true, and BOUND_BT_CORRECTION is true, use the + ! BT_cont_type variables to set limits determined by + ! MAXCFL_BT_CONT on the CFL number of the velocites + ! that are likely to be driven by the corrective mass fluxes. +ADJUST_BT_CONT = False ! [Boolean] default = False + ! If true, adjust the curve fit to the BT_cont type + ! that is used by the barotropic solver to match the + ! transport about which the flow is being linearized. +GRADUAL_BT_ICS = False ! [Boolean] default = False + ! If true, adjust the initial conditions for the + ! barotropic solver to the values from the layered + ! solution over a whole timestep instead of instantly. + ! This is a decent approximation to the inclusion of + ! sum(u dh_dt) while also correcting for truncation errors. +BT_USE_VISC_REM_U_UH0 = False ! [Boolean] default = False + ! If true, use the viscous remnants when estimating the + ! barotropic velocities that were used to calculate uh0 + ! and vh0. False is probably the better choice. +USE_BT_CONT_TYPE = True ! [Boolean] default = True + ! If true, use a structure with elements that describe + ! effective face areas from the summed continuity solver + ! as a function the barotropic flow in coupling between + ! the barotropic and baroclinic flow. This is only used + ! if SPLIT is true. +NONLINEAR_BT_CONTINUITY = False ! [Boolean] default = False + ! If true, use nonlinear transports in the barotropic + ! continuity equation. This does not apply if + ! USE_BT_CONT_TYPE is true. +BT_MASS_SOURCE_LIMIT = 0.0 ! [nondim] default = 0.0 + ! The fraction of the initial depth of the ocean that can + ! be added to or removed from the bartropic solution + ! within a thermodynamic time step. By default this is 0 + ! for no correction. +BT_PROJECT_VELOCITY = True ! [Boolean] default = False + ! If true, step the barotropic velocity first and project + ! out the velocity tendancy by 1+BEBT when calculating the + ! transport. The default (false) is to use a predictor + ! continuity step to find the pressure field, and then + ! to do a corrector continuity step using a weighted + ! average of the old and new velocities, with weights + ! of (1-BEBT) and BEBT. +DYNAMIC_SURFACE_PRESSURE = False ! [Boolean] default = False + ! If true, add a dynamic pressure due to a viscous ice + ! shelf, for instance. +SADOURNY = True ! [Boolean] default = True + ! If true, the Coriolis terms are discretized with the + ! Sadourny (1975) energy conserving scheme, otherwise + ! the Arakawa & Hsu scheme is used. If the internal + ! deformation radius is not resolved, the Sadourny scheme + ! should probably be used. +BT_THICK_SCHEME = "FROM_BT_CONT" ! default = "FROM_BT_CONT" + ! A string describing the scheme that is used to set the + ! open face areas used for barotropic transport and the + ! relative weights of the accelerations. Valid values are: + ! ARITHMETIC - arithmetic mean layer thicknesses + ! HARMONIC - harmonic mean layer thicknesses + ! HYBRID (the default) - use arithmetic means for + ! layers above the shallowest bottom, the harmonic + ! mean for layers below, and a weighted average for + ! layers that straddle that depth + ! FROM_BT_CONT - use the average thicknesses kept + ! in the h_u and h_v fields of the BT_cont_type +BT_STRONG_DRAG = False ! [Boolean] default = False + ! If true, use a stronger estimate of the retarding + ! effects of strong bottom drag, by making it implicit + ! with the barotropic time-step instead of implicit with + ! the baroclinic time-step and dividing by the number of + ! barotropic steps. +BT_LINEAR_WAVE_DRAG = False ! [Boolean] default = False + ! If true, apply a linear drag to the barotropic velocities, + ! using rates set by lin_drag_u & _vdivided by the depth of + ! the ocean. This was introduced to facilitate tide modeling. +CLIP_BT_VELOCITY = False ! [Boolean] default = False + ! If true, limit any velocity components that exceed + ! CFL_TRUNCATE. This should only be used as a desperate + ! debugging measure. +MAXCFL_BT_CONT = 0.25 ! [nondim] default = 0.25 + ! The maximum permitted CFL number associated with the + ! barotropic accelerations from the summed velocities + ! times the time-derivatives of thicknesses. +DT_BT_FILTER = -0.25 ! [sec or nondim] default = -0.25 + ! A time-scale over which the barotropic mode solutions + ! are filtered, in seconds if positive, or as a fraction + ! of DT if negative. When used this can never be taken to + ! be longer than 2*dt. Set this to 0 to apply no filtering. +G_BT_EXTRA = 0.0 ! [nondim] default = 0.0 + ! A nondimensional factor by which gtot is enhanced. +SSH_EXTRA = 10.0 ! [m] default = 10.0 + ! An estimate of how much higher SSH might get, for use + ! in calculating the safe external wave speed. The + ! default is the minimum of 10 m or 5% of MAXIMUM_DEPTH. +DEBUG_BT = False ! [Boolean] default = False + ! If true, write out verbose debugging data within the + ! barotropic time-stepping loop. The data volume can be + ! quite large if this is true. +BEBT = 0.2 ! [nondim] default = 0.1 + ! BEBT determines whether the barotropic time stepping + ! uses the forward-backward time-stepping scheme or a + ! backward Euler scheme. BEBT is valid in the range from + ! 0 (for a forward-backward treatment of nonrotating + ! gravity waves) to 1 (for a backward Euler treatment). + ! In practice, BEBT must be greater than about 0.05. +DTBT = -0.9 ! [s or nondim] default = -0.98 + ! The barotropic time step, in s. DTBT is only used with + ! the split explicit time stepping. To set the time step + ! automatically based the maximum stable value use 0, or + ! a negative value gives the fraction of the stable value. + ! Setting DTBT to 0 is the same as setting it to -0.98. + ! The value of DTBT that will actually be used is an + ! integer fraction of DT, rounding down. +BT_USE_OLD_CORIOLIS_BRACKET_BUG = False ! [Boolean] default = False + ! If True, use an order of operations that is not bitwise + ! rotationally symmetric in the meridional Coriolis term of + ! the barotropic solver. + +! === module MOM_thickness_diffuse === +KHTH = 0.0 ! [m2 s-1] default = 0.0 + ! The background horizontal thickness diffusivity. +KHTH_MIN = 0.0 ! [m2 s-1] default = 0.0 + ! The minimum horizontal thickness diffusivity. +KHTH_MAX = 0.0 ! [m2 s-1] default = 0.0 + ! The maximum horizontal thickness diffusivity. +KHTH_MAX_CFL = 0.8 ! [nondimensional] default = 0.8 + ! The maximum value of the local diffusive CFL ratio that + ! is permitted for the thickness diffusivity. 1.0 is the + ! marginally unstable value in a pure layered model, but + ! much smaller numbers (e.g. 0.1) seem to work better for + ! ALE-based models. +DETANGLE_INTERFACES = False ! [Boolean] default = False + ! If defined add 3-d structured enhanced interface height + ! diffusivities to horizonally smooth jagged layers. +KHTH_SLOPE_MAX = 0.01 ! [nondim] default = 0.01 + ! A slope beyond which the calculated isopycnal slope is + ! not reliable and is scaled away. +KD_SMOOTH = 1.0E-06 ! [not defined] default = 1.0E-06 + ! A diapycnal diffusivity that is used to interpolate + ! more sensible values of T & S into thin layers. +KHTH_USE_FGNV_STREAMFUNCTION = False ! [Boolean] default = False + ! If true, use the streamfunction formulation of + ! Ferrari et al., 2010, which effectively emphasizes + ! graver vertical modes by smoothing in the vertical. + +! === module MOM_mixed_layer_restrat === +MIXEDLAYER_RESTRAT = False ! [Boolean] default = False + ! If true, a density-gradient dependent re-stratifying + ! flow is imposed in the mixed layer. Can be used in ALE mode + ! without restriction but in layer mode can only be used if + ! BULKMIXEDLAYER is true. +DIAG_EBT_MONO_N2_COLUMN_FRACTION = 0.0 ! [nondim] default = 0.0 + ! The lower fraction of water column over which N2 is limited as monotonic + ! for the purposes of calculating the equivalent barotropic wave speed. +DIAG_EBT_MONO_N2_DEPTH = -1.0 ! [m] default = -1.0 + ! The depth below which N2 is limited as monotonic for the + ! purposes of calculating the equivalent barotropic wave speed. + +! === module MOM_diag_to_Z === +Z_OUTPUT_GRID_FILE = "" ! default = "" + ! The file that specifies the vertical grid for + ! depth-space diagnostics, or blank to disable + ! depth-space output. + +! === module MOM_diabatic_driver === +! The following parameters are used for diabatic processes. + +! === module MOM_tracer_advect === +TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM" + ! The horizontal transport scheme for tracers: + ! PLM - Piecewise Linear Method + ! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order) + ! PPM - Piecewise Parabolic Method (Colella-Woodward) + +! === module MOM_tracer_hor_diff === +KHTR = 0.0 ! [m2 s-1] default = 0.0 + ! The background along-isopycnal tracer diffusivity. +KHTR_MIN = 0.0 ! [m2 s-1] default = 0.0 + ! The minimum along-isopycnal tracer diffusivity. +KHTR_MAX = 0.0 ! [m2 s-1] default = 0.0 + ! The maximum along-isopycnal tracer diffusivity. +KHTR_PASSIVITY_COEFF = 0.0 ! [nondim] default = 0.0 + ! The coefficient that scales deformation radius over + ! grid-spacing in passivity, where passiviity is the ratio + ! between along isopycnal mxiing of tracers to thickness mixing. + ! A non-zero value enables this parameterization. +KHTR_PASSIVITY_MIN = 0.5 ! [nondim] default = 0.5 + ! The minimum passivity which is the ratio between + ! along isopycnal mxiing of tracers to thickness mixing. +DIFFUSE_ML_TO_INTERIOR = False ! [Boolean] default = False + ! If true, enable epipycnal mixing between the surface + ! boundary layer and the interior. +CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False + ! If true, use enough iterations the diffusion to ensure + ! that the diffusive equivalent of the CFL limit is not + ! violated. If false, always use 1 iteration. + +! === module MOM_neutral_diffusion === +! This module implements neutral diffusion of tracers +USE_NEUTRAL_DIFFUSION = False ! [Boolean] default = False + ! If true, enables the neutral diffusion module. +OBSOLETE_DIAGNOSTIC_IS_FATAL = True ! [Boolean] default = True + ! If an obsolete diagnostic variable appears in the diag_table + ! then cause a FATAL error rather than issue a WARNING. + +! === module MOM_surface_forcing === +VARIABLE_WINDS = False ! [Boolean] default = True + ! If true, the winds vary in time after the initialization. +VARIABLE_BUOYFORCE = False ! [Boolean] default = True + ! If true, the buoyancy forcing varies in time after the + ! initialization of the model. +BUOY_CONFIG = "zero" ! + ! The character string that indicates how buoyancy forcing + ! is specified. Valid options include (file), (zero), + ! (linear), (USER), (BFB) and (NONE). +WIND_CONFIG = "zero" ! + ! The character string that indicates how wind forcing + ! is specified. Valid options include (file), (2gyre), + ! (1gyre), (gyres), (zero), 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. +LATENT_HEAT_FUSION = 3.34E+05 ! [J/kg] default = 3.34E+05 + ! The latent heat of fusion. +LATENT_HEAT_VAPORIZATION = 2.5E+06 ! [J/kg] default = 2.5E+06 + ! The latent heat of fusion. +GUST_CONST = 0.02 ! [Pa] default = 0.02 + ! The background gustiness in the winds. +READ_GUST_2D = False ! [Boolean] default = False + ! If true, use a 2-dimensional gustiness supplied from + ! an input file + +! === module MOM_restart === +ICE_SHELF = False ! [Boolean] default = False + ! If true, enables the ice shelf model. + +! === module MOM_sum_output === +CALCULATE_APE = True ! [Boolean] default = True + ! If true, calculate the available potential energy of + ! the interfaces. Setting this to false reduces the + ! memory footprint of high-PE-count models dramatically. +WRITE_STOCKS = True ! [Boolean] default = True + ! If true, write the integrated tracer amounts to stdout + ! when the energy files are written. +MAXTRUNC = 100000 ! [truncations save_interval-1] default = 0 + ! The run will be stopped, and the day set to a very + ! large value if the velocity is truncated more than + ! MAXTRUNC times between energy saves. Set MAXTRUNC to 0 + ! to stop if there is any truncation of velocities. +MAX_ENERGY = 0.0 ! [m2 s-2] default = 0.0 + ! The maximum permitted average energy per unit mass; the + ! model will be stopped if there is more energy than + ! this. If zero or negative, this is set to 10*MAXVEL^2. +ENERGYFILE = "ocean.stats" ! default = "ocean.stats" + ! The file to use to write the energies and globally + ! summed diagnostics. +DATE_STAMPED_STDOUT = False ! [Boolean] default = True + ! If true, use dates (not times) in messages to stdout +TIMEUNIT = 8.64E+04 ! [s] default = 8.64E+04 + ! The time unit in seconds a number of input fields +READ_DEPTH_LIST = True ! [Boolean] default = False + ! Read the depth list from a file if it exists or + ! create that file otherwise. +DEPTH_LIST_MIN_INC = 1.0E-06 ! [m] default = 1.0E-10 + ! The minimum increment between the depths of the + ! entries in the depth-list file. +DEPTH_LIST_FILE = "Depth_list.nc" ! default = "Depth_list.nc" + ! The name of the depth list file. + +! === module MOM_write_cputime === +MAXCPU = -1.0 ! [wall-clock seconds] default = -1.0 + ! The maximum amount of cpu time per processor for which + ! MOM should run before saving a restart file and + ! quitting with a return value that indicates that a + ! further run is required to complete the simulation. + ! If automatic restarts are not desired, use a negative + ! value for MAXCPU. MAXCPU has units of wall-clock + ! seconds, so the actual CPU time used is larger by a + ! factor of the number of processors used. +CPU_TIME_FILE = "CPU_stats" ! default = "CPU_stats" + ! The file into which CPU time is written. + +! === module MOM_main (MOM_driver) === +DT_FORCING = 3600.0 ! [s] default = 900.0 + ! The time step for changing forcing, coupling with other + ! components, or potentially writing certain diagnostics. + ! The default value is given by DT. +DAYMAX = 10.0 ! [days] + ! The final time of the whole simulation, in units of + ! TIMEUNIT seconds. This also sets the potential end + ! time of the present run segment if the end time is + ! not set via ocean_solo_nml in input.nml. +RESTART_CONTROL = 3 ! default = 1 + ! An integer whose bits encode which restart files are + ! written. Add 2 (bit 1) for a time-stamped file, and odd + ! (bit 0) for a non-time-stamped file. A non-time-stamped + ! restart file is saved at the end of the run segment + ! for any non-negative value. +RESTINT = 110.0 ! [days] default = 0.0 + ! The interval between saves of the restart file in units + ! of TIMEUNIT. Use 0 (the default) to not save + ! incremental restart files at all. +ENERGYSAVEDAYS = 0.25 ! [days] default = 0.0416666666666667 + ! The interval in units of TIMEUNIT between saves of the + ! energies of the run and other globally summed diagnostics. + +! === module MOM_file_parser === +SEND_LOG_TO_STDOUT = False ! [Boolean] default = False + ! If true, all log messages are also sent to stdout. +REPORT_UNUSED_PARAMS = False ! [Boolean] default = False + ! If true, report any parameter lines that are not used + ! in the run. +FATAL_UNUSED_PARAMS = False ! [Boolean] default = False + ! If true, kill the run if there are any unused + ! parameters. +DOCUMENT_FILE = "MOM_parameter_doc" ! default = "MOM_parameter_doc" + ! The basename for files where run-time parameters, their + ! settings, units and defaults are documented. Blank will + ! disable all parameter documentation. +COMPLETE_DOCUMENTATION = True ! [Boolean] default = True + ! If true, all run-time parameters are + ! documented in MOM_parameter_doc.all . +MINIMAL_DOCUMENTATION = True ! [Boolean] default = True + ! If true, non-default run-time parameters are + ! documented in MOM_parameter_doc.short . diff --git a/ocean_only/tides_025/MOM_parameter_doc.layout b/ocean_only/tides_025/MOM_parameter_doc.layout new file mode 100644 index 0000000000..1337bfd0aa --- /dev/null +++ b/ocean_only/tides_025/MOM_parameter_doc.layout @@ -0,0 +1,73 @@ +! This file was written by the model and records the layout parameters used at run-time. +GLOBAL_INDEXING = False ! [Boolean] default = False + ! If true, use a global lateral indexing convention, so + ! that corresponding points on different processors have + ! the same index. This does not work with static memory. +!SYMMETRIC_MEMORY_ = True ! [Boolean] + ! If defined, the velocity point data domain includes + ! every face of the thickness points. In other words, + ! some arrays are larger than others, depending on where + ! they are on the staggered grid. Also, the starting + ! index of the velocity-point arrays is usually 0, not 1. + ! This can only be set at compile time. +NONBLOCKING_UPDATES = False ! [Boolean] default = False + ! If true, non-blocking halo updates may be used. +THIN_HALO_UPDATES = True ! [Boolean] default = True + ! If true, optional arguments may be used to specify the + ! The width of the halos that are updated with each call. +!STATIC_MEMORY_ = False ! [Boolean] + ! If STATIC_MEMORY_ is defined, the principle variables + ! will have sizes that are statically determined at + ! compile time. Otherwise the sizes are not determined + ! until run time. The STATIC option is substantially + ! faster, but does not allow the PE count to be changed + ! at run time. This can only be set at compile time. +NIHALO = 4 ! default = 4 + ! The number of halo points on each side in the + ! x-direction. With STATIC_MEMORY_ this is set as NIHALO_ + ! in MOM_memory.h at compile time; without STATIC_MEMORY_ + ! the default is NIHALO_ in MOM_memory.h (if defined) or 2. +NJHALO = 4 ! default = 4 + ! The number of halo points on each side in the + ! y-direction. With STATIC_MEMORY_ this is set as NJHALO_ + ! in MOM_memory.h at compile time; without STATIC_MEMORY_ + ! the default is NJHALO_ in MOM_memory.h (if defined) or 2. +MASKTABLE = "MOM_mask_table" ! default = "MOM_mask_table" + ! A text file to specify n_mask, layout and mask_list. + ! This feature masks out processors that contain only land points. + ! The first line of mask_table is the number of regions to be masked out. + ! The second line is the layout of the model and must be + ! consistent with the actual model layout. + ! The following (n_mask) lines give the logical positions + ! of the processors that are masked out. The mask_table + ! can be created by tools like check_mask. The + ! following example of mask_table masks out 2 processors, + ! (1,2) and (3,6), out of the 24 in a 4x6 layout: + ! 2 + ! 4,6 + ! 1,2 + ! 3,6 +NIPROC = 24 ! + ! The number of processors in the x-direction. With + ! STATIC_MEMORY_ this is set in MOM_memory.h at compile time. +NJPROC = 24 ! + ! The number of processors in the x-direction. With + ! STATIC_MEMORY_ this is set in MOM_memory.h at compile time. +LAYOUT = 24, 24 ! + ! The processor layout that was acutally used. +IO_LAYOUT = 1, 1 ! default = 1 + ! The processor layout to be used, or 0,0 to automatically + ! set the io_layout to be the same as the layout. +NIBLOCK = 1 ! default = 1 + ! The number of blocks in the x-direction on each processor (for openmp). +NJBLOCK = 1 ! default = 1 + ! The number of blocks in the y-direction on each processor (for openmp). +BT_USE_WIDE_HALOS = True ! [Boolean] default = True + ! If true, use wide halos and march in during the + ! barotropic time stepping for efficiency. +BTHALO = 0 ! default = 0 + ! The minimum halo size for the barotropic solver. +!BT x-halo = 0 ! + ! The barotropic x-halo size that is actually used. +!BT y-halo = 0 ! + ! The barotropic y-halo size that is actually used. diff --git a/ocean_only/tides_025/MOM_parameter_doc.short b/ocean_only/tides_025/MOM_parameter_doc.short new file mode 100644 index 0000000000..c9f12d7b61 --- /dev/null +++ b/ocean_only/tides_025/MOM_parameter_doc.short @@ -0,0 +1,439 @@ +! This file was written by the model and records the non-default parameters used at run-time. + +! === module MOM === +ENABLE_THERMODYNAMICS = False ! [Boolean] default = True + ! If true, Temperature and salinity are used as state + ! variables. +ADIABATIC = True ! [Boolean] default = False + ! There are no diapycnal mass fluxes if ADIABATIC is + ! true. This assumes that KD = KDML = 0.0 and that + ! there is no buoyancy forcing, but makes the model + ! faster by eliminating subroutine calls. +DT = 900.0 ! [s] + ! The (baroclinic) dynamics time step. The time-step that + ! is actually used will be an integer fraction of the + ! forcing time-step (DT_FORCING in ocean-only mode or the + ! coupling timestep in coupled mode.) +DT_THERM = 3600.0 ! [s] default = 900.0 + ! The thermodynamic and tracer advection time step. + ! Ideally DT_THERM should be an integer multiple of DT + ! and less than the forcing or coupling time-step, unless + ! THERMO_SPANS_COUPLING is true, in which case DT_THERM + ! can be an integer multiple of the coupling timestep. By + ! default DT_THERM is set to DT. +DTBT_RESET_PERIOD = -1.0 ! [s] default = 3600.0 + ! The period between recalculations of DTBT (if DTBT <= 0). + ! If DTBT_RESET_PERIOD is negative, DTBT is set based + ! only on information available at initialization. If + ! dynamic, DTBT will be set at least every forcing time + ! step, and if 0, every dynamics time step. The default is + ! set by DT_THERM. This is only used if SPLIT is true. +CHECK_BAD_SURFACE_VALS = True ! [Boolean] default = False + ! If true, check the surface state for ridiculous values. +BAD_VAL_SSH_MAX = 50.0 ! [m] default = 20.0 + ! The value of SSH above which a bad value message is + ! triggered, if CHECK_BAD_SURFACE_VALS is true. +SAVE_INITIAL_CONDS = True ! [Boolean] default = False + ! If true, write the initial conditions to a file given + ! by IC_OUTPUT_FILE. + +! === module MOM_domains === +TRIPOLAR_N = True ! [Boolean] default = False + ! Use tripolar connectivity at the northern edge of the + ! domain. With TRIPOLAR_N, NIGLOBAL must be even. +NIGLOBAL = 1440 ! + ! The total number of thickness grid points in the + ! x-direction in the physical domain. With STATIC_MEMORY_ + ! this is set in MOM_memory.h at compile time. +NJGLOBAL = 1080 ! + ! The total number of thickness grid points in the + ! y-direction in the physical domain. With STATIC_MEMORY_ + ! this is set in MOM_memory.h at compile time. + +! === module MOM_hor_index === +! Sets the horizontal array index types. + +! === module MOM_verticalGrid === +! Parameters providing information about the vertical grid. +BOUSSINESQ = False ! [Boolean] default = True + ! If true, make the Boussinesq approximation. +NK = 2 ! [nondim] + ! The number of model layers. + +! === module MOM_fixed_initialization === +INPUTDIR = "INPUT" ! default = "." + ! The directory in which input files are found. + +! === module MOM_grid_init === +GRID_CONFIG = "mosaic" ! + ! A character string that determines the method for + ! defining the horizontal grid. Current options are: + ! mosaic - read the grid from a mosaic (supergrid) + ! file set by GRID_FILE. + ! cartesian - use a (flat) Cartesian grid. + ! spherical - use a simple spherical grid. + ! mercator - use a Mercator spherical grid. +GRID_FILE = "ocean_hgrid.nc" ! + ! Name of the file from which to read horizontal grid data. +TOPO_CONFIG = "file" ! + ! This specifies how bathymetry is specified: + ! file - read bathymetric information from the file + ! specified by (TOPO_FILE). + ! flat - flat bottom set to MAXIMUM_DEPTH. + ! bowl - an analytically specified bowl-shaped basin + ! ranging between MAXIMUM_DEPTH and MINIMUM_DEPTH. + ! spoon - a similar shape to 'bowl', but with an vertical + ! wall at the southern face. + ! halfpipe - a zonally uniform channel with a half-sine + ! profile in the meridional direction. + ! benchmark - use the benchmark test case topography. + ! Neverland - use the Neverland test case topography. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a slope and channel configuration for the + ! ISOMIP test case. + ! DOME2D - use a shelf and slope configuration for the + ! DOME2D gravity current/overflow test case. + ! Kelvin - flat but with rotated land mask. + ! seamount - Gaussian bump for spontaneous motion test case. + ! shelfwave - exponential slope for shelfwave test case. + ! supercritical - flat but with 8.95 degree land mask. + ! Phillips - ACC-like idealized topography used in the Phillips config. + ! dense - Denmark Strait-like dense water formation and overflow. + ! USER - call a user modified routine. +TOPO_FILE = "ocean_topog.nc" ! default = "topog.nc" + ! The file from which the bathymetry is read. +TOPO_EDITS_FILE = "All_edits.nc" ! default = "" + ! The file from which to read a list of i,j,z topography overrides. +MAXIMUM_DEPTH = 6500.0 ! [m] + ! The maximum depth of the ocean. +MINIMUM_DEPTH = 9.5 ! [m] default = 0.0 + ! If MASKING_DEPTH is unspecified, then anything shallower than + ! MINIMUM_DEPTH is assumed to be land and all fluxes are masked out. + ! If MASKING_DEPTH is specified, then all depths shallower than + ! MINIMUM_DEPTH but deeper than MASKING_DEPTH are rounded to MINIMUM_DEPTH. + +! === module MOM_open_boundary === +! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any. +MASKING_DEPTH = 0.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all + ! fluxes are zeroed out. MASKING_DEPTH is ignored if negative. +CHANNEL_CONFIG = "list" ! default = "none" + ! A parameter that determines which set of channels are + ! restricted to specific widths. Options are: + ! none - All channels have the grid width. + ! global_1deg - Sets 16 specific channels appropriate + ! for a 1-degree model, as used in CM2G. + ! list - Read the channel locations and widths from a + ! text file, like MOM_channel_list in the MOM_SIS + ! test case. + ! file - Read open face widths everywhere from a + ! NetCDF file on the model grid. +CHANNEL_LIST_FILE = "MOM_channels_global_025" ! default = "MOM_channel_list" + ! The file from which the list of narrowed channels is read. + +! === module MOM_tracer_registry === + +! === module MOM_restart === + +! === module MOM_tracer_flow_control === + +! === module MOM_coord_initialization === +COORD_CONFIG = "gprime" ! + ! This specifies how layers are to be defined: + ! ALE or none - used to avoid defining layers in ALE mode + ! file - read coordinate information from the file + ! specified by (COORD_FILE). + ! BFB - Custom coords for buoyancy-forced basin case + ! based on SST_S, T_BOT and DRHO_DT. + ! linear - linear based on interfaces not layers + ! layer_ref - linear based on layer densities + ! ts_ref - use reference temperature and salinity + ! ts_range - use range of temperature and salinity + ! (T_REF and S_REF) to determine surface density + ! and GINT calculate internal densities. + ! gprime - use reference density (RHO_0) for surface + ! density and GINT calculate internal densities. + ! ts_profile - use temperature and salinity profiles + ! (read from COORD_FILE) to set layer densities. + ! USER - call a user modified routine. +GINT = 0.0164 ! [m s-2] + ! The reduced gravity across internal interfaces. + +! === module MOM_grid === +! Parameters providing information about the lateral grid. + +! === module MOM_state_initialization === +THICKNESS_CONFIG = "list" ! + ! A string that determines how the initial layer + ! thicknesses are specified for a new run: + ! file - read interface heights from the file specified + ! thickness_file - read thicknesses from the file specified + ! by (THICKNESS_FILE). + ! coord - determined by ALE coordinate. + ! uniform - uniform thickness layers evenly distributed + ! between the surface and MAXIMUM_DEPTH. + ! list - read a list of positive interface depths. + ! DOME - use a slope and channel configuration for the + ! DOME sill-overflow test case. + ! ISOMIP - use a configuration for the + ! ISOMIP test case. + ! benchmark - use the benchmark test case thicknesses. + ! Neverland - use the Neverland test case thicknesses. + ! search - search a density profile for the interface + ! densities. This is not yet implemented. + ! circle_obcs - the circle_obcs test case is used. + ! DOME2D - 2D version of DOME initialization. + ! adjustment2d - TBD AJA. + ! sloshing - TBD AJA. + ! seamount - TBD AJA. + ! soliton - Equatorial Rossby soliton. + ! rossby_front - a mixed layer front in thermal wind balance. + ! USER - call a user modified routine. +INTERFACE_IC_FILE = "interface_IC_2layer.nc" ! + ! The file from which horizontal mean initial conditions + ! for interface depths can be read. + +! === module MOM_diag_mediator === + +! === module MOM_MEKE === + +! === module MOM_lateral_mixing_coeffs === +RESOLN_SCALED_KH = True ! [Boolean] default = False + ! If true, the Laplacian lateral viscosity is scaled away + ! when the first baroclinic deformation radius is well + ! resolved. +INTERPOLATE_RES_FN = False ! [Boolean] default = True + ! If true, interpolate the resolution function to the + ! velocity points from the thickness points; otherwise + ! interpolate the wave speed and calculate the resolution + ! function independently at each point. +GILL_EQUATORIAL_LD = True ! [Boolean] default = False + ! If true, uses Gill's definition of the baroclinic + ! equatorial deformation radius, otherwise, if false, use + ! Pedlosky's definition. These definitions differ by a factor + ! of 2 infront of the beta term in the denominator. Gill'sis the more appropriate definition. + +! === module MOM_set_visc === +CHANNEL_DRAG = True ! [Boolean] default = False + ! If true, the bottom drag is exerted directly on each + ! layer proportional to the fraction of the bottom it + ! overlies. +HBBL = 10.0 ! [m] + ! The thickness of a bottom boundary layer with a + ! viscosity of KVBBL if BOTTOMDRAGLAW is not defined, or + ! the thickness over which near-bottom velocities are + ! averaged for the drag law if BOTTOMDRAGLAW is defined + ! but LINEAR_DRAG is not. +DRAG_BG_VEL = 0.1 ! [m s-1] default = 0.0 + ! DRAG_BG_VEL is either the assumed bottom velocity (with + ! LINEAR_DRAG) or an unresolved velocity that is + ! combined with the resolved velocity to estimate the + ! velocity magnitude. DRAG_BG_VEL is only used when + ! BOTTOMDRAGLAW is defined. +BBL_THICK_MIN = 0.1 ! [m] default = 0.0 + ! The minimum bottom boundary layer thickness that can be + ! used with BOTTOMDRAGLAW. This might be + ! Kv / (cdrag * drag_bg_vel) to give Kv as the minimum + ! near-bottom viscosity. +KV = 1.0E-04 ! [m2 s-1] + ! The background kinematic viscosity in the interior. + ! The molecular value, ~1e-6 m2 s-1, may be used. +TIDES = True ! [Boolean] default = False + ! If true, apply tidal momentum forcing. + +! === module MOM_continuity === + +! === module MOM_continuity_PPM === +ETA_TOLERANCE = 1.0E-12 ! [m] default = 1.0E-10 + ! The tolerance for the differences between the + ! barotropic and baroclinic estimates of the sea surface + ! height due to the fluxes through each face. The total + ! tolerance for SSH is 4 times this value. The default + ! is 0.5*NK*ANGSTROM, and this should not be set less x + ! than about 10^-15*MAXIMUM_DEPTH. + +! === module MOM_CoriolisAdv === +BOUND_CORIOLIS = True ! [Boolean] default = False + ! If true, the Coriolis terms at u-points are bounded by + ! the four estimates of (f+rv)v from the four neighboring + ! v-points, and similarly at v-points. This option would + ! have no effect on the SADOURNY Coriolis scheme if it + ! were possible to use centered difference thickness fluxes. + +! === module MOM_tidal_forcing === +TIDE_M2 = True ! [Boolean] default = False + ! If true, apply tidal momentum forcing at the M2 + ! frequency. This is only used if TIDES is true. +TIDE_SAL_SCALAR_VALUE = 0.094 ! [m m-1] + ! The constant of proportionality between sea surface + ! height (really it should be bottom pressure) anomalies + ! and bottom geopotential anomalies. This is only used if + ! TIDES and TIDE_USE_SAL_SCALAR are true. + +! === module MOM_PressureForce === + +! === module MOM_PressureForce_AFV === + +! === module MOM_hor_visc === +LAPLACIAN = True ! [Boolean] default = False + ! If true, use a Laplacian horizontal viscosity. +KH_VEL_SCALE = 0.003 ! [m s-1] default = 0.0 + ! The velocity scale which is multiplied by the grid + ! spacing to calculate the Laplacian viscosity. + ! The final viscosity is the largest of this scaled + ! viscosity, the Smagorinsky and Leith viscosities, and KH. +AH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 + ! The velocity scale which is multiplied by the cube of + ! the grid spacing to calculate the biharmonic viscosity. + ! The final viscosity is the largest of this scaled + ! viscosity, the Smagorinsky and Leith viscosities, and AH. +SMAGORINSKY_AH = True ! [Boolean] default = False + ! If true, use a biharmonic Smagorinsky nonlinear eddy + ! viscosity. +SMAG_BI_CONST = 0.06 ! [nondim] default = 0.0 + ! The nondimensional biharmonic Smagorinsky constant, + ! typically 0.015 - 0.06. + +! === module MOM_vert_friction === +DIRECT_STRESS = True ! [Boolean] default = False + ! If true, the wind stress is distributed over the + ! topmost HMIX_STRESS of fluid (like in HYCOM), and KVML + ! may be set to a very small value. +U_TRUNC_FILE = "U_velocity_truncations" ! default = "" + ! The absolute path to a file into which the accelerations + ! leading to zonal velocity truncations are written. + ! Undefine this for efficiency if this diagnostic is not + ! needed. +V_TRUNC_FILE = "V_velocity_truncations" ! default = "" + ! The absolute path to a file into which the accelerations + ! leading to meridional velocity truncations are written. + ! Undefine this for efficiency if this diagnostic is not + ! needed. +HMIX_FIXED = 20.0 ! [m] + ! The prescribed depth over which the near-surface + ! viscosity and diffusivity are elevated when the bulk + ! mixed layer is not used. +KVML = 0.01 ! [m2 s-1] default = 1.0E-04 + ! The kinematic viscosity in the mixed layer. A typical + ! value is ~1e-2 m2 s-1. KVML is not used if + ! BULKMIXEDLAYER is true. The default is set by KV. +MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 + ! The maximum velocity allowed before the velocity + ! components are truncated. + +! === module MOM_PointAccel === + +! === module MOM_barotropic === +BOUND_BT_CORRECTION = True ! [Boolean] default = False + ! If true, the corrective pseudo mass-fluxes into the + ! barotropic solver are limited to values that require + ! less than maxCFL_BT_cont to be accommodated. +BT_PROJECT_VELOCITY = True ! [Boolean] default = False + ! If true, step the barotropic velocity first and project + ! out the velocity tendancy by 1+BEBT when calculating the + ! transport. The default (false) is to use a predictor + ! continuity step to find the pressure field, and then + ! to do a corrector continuity step using a weighted + ! average of the old and new velocities, with weights + ! of (1-BEBT) and BEBT. +BEBT = 0.2 ! [nondim] default = 0.1 + ! BEBT determines whether the barotropic time stepping + ! uses the forward-backward time-stepping scheme or a + ! backward Euler scheme. BEBT is valid in the range from + ! 0 (for a forward-backward treatment of nonrotating + ! gravity waves) to 1 (for a backward Euler treatment). + ! In practice, BEBT must be greater than about 0.05. +DTBT = -0.9 ! [s or nondim] default = -0.98 + ! The barotropic time step, in s. DTBT is only used with + ! the split explicit time stepping. To set the time step + ! automatically based the maximum stable value use 0, or + ! a negative value gives the fraction of the stable value. + ! Setting DTBT to 0 is the same as setting it to -0.98. + ! The value of DTBT that will actually be used is an + ! integer fraction of DT, rounding down. + +! === module MOM_thickness_diffuse === + +! === module MOM_mixed_layer_restrat === + +! === module MOM_diag_to_Z === + +! === module MOM_diabatic_driver === +! The following parameters are used for diabatic processes. + +! === module MOM_tracer_advect === +TRACER_ADVECTION_SCHEME = "PPM:H3" ! default = "PLM" + ! The horizontal transport scheme for tracers: + ! PLM - Piecewise Linear Method + ! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order) + ! PPM - Piecewise Parabolic Method (Colella-Woodward) + +! === module MOM_tracer_hor_diff === +CHECK_DIFFUSIVE_CFL = True ! [Boolean] default = False + ! If true, use enough iterations the diffusion to ensure + ! that the diffusive equivalent of the CFL limit is not + ! violated. If false, always use 1 iteration. + +! === module MOM_neutral_diffusion === +! This module implements neutral diffusion of tracers + +! === module MOM_surface_forcing === +VARIABLE_WINDS = False ! [Boolean] default = True + ! If true, the winds vary in time after the initialization. +VARIABLE_BUOYFORCE = False ! [Boolean] default = True + ! If true, the buoyancy forcing varies in time after the + ! initialization of the model. +BUOY_CONFIG = "zero" ! + ! The character string that indicates how buoyancy forcing + ! is specified. Valid options include (file), (zero), + ! (linear), (USER), (BFB) and (NONE). +WIND_CONFIG = "zero" ! + ! The character string that indicates how wind forcing + ! is specified. Valid options include (file), (2gyre), + ! (1gyre), (gyres), (zero), and (USER). + +! === module MOM_restart === + +! === module MOM_sum_output === +MAXTRUNC = 100000 ! [truncations save_interval-1] default = 0 + ! The run will be stopped, and the day set to a very + ! large value if the velocity is truncated more than + ! MAXTRUNC times between energy saves. Set MAXTRUNC to 0 + ! to stop if there is any truncation of velocities. +DATE_STAMPED_STDOUT = False ! [Boolean] default = True + ! If true, use dates (not times) in messages to stdout +READ_DEPTH_LIST = True ! [Boolean] default = False + ! Read the depth list from a file if it exists or + ! create that file otherwise. +DEPTH_LIST_MIN_INC = 1.0E-06 ! [m] default = 1.0E-10 + ! The minimum increment between the depths of the + ! entries in the depth-list file. + +! === module MOM_write_cputime === + +! === module MOM_main (MOM_driver) === +DT_FORCING = 3600.0 ! [s] default = 900.0 + ! The time step for changing forcing, coupling with other + ! components, or potentially writing certain diagnostics. + ! The default value is given by DT. +DAYMAX = 10.0 ! [days] + ! The final time of the whole simulation, in units of + ! TIMEUNIT seconds. This also sets the potential end + ! time of the present run segment if the end time is + ! not set via ocean_solo_nml in input.nml. +RESTART_CONTROL = 3 ! default = 1 + ! An integer whose bits encode which restart files are + ! written. Add 2 (bit 1) for a time-stamped file, and odd + ! (bit 0) for a non-time-stamped file. A non-time-stamped + ! restart file is saved at the end of the run segment + ! for any non-negative value. +RESTINT = 110.0 ! [days] default = 0.0 + ! The interval between saves of the restart file in units + ! of TIMEUNIT. Use 0 (the default) to not save + ! incremental restart files at all. +ENERGYSAVEDAYS = 0.25 ! [days] default = 0.0416666666666667 + ! The interval in units of TIMEUNIT between saves of the + ! energies of the run and other globally summed diagnostics. + +! === module MOM_file_parser === diff --git a/ocean_only/tides_025/diag_table b/ocean_only/tides_025/diag_table new file mode 100644 index 0000000000..c38a01b06c --- /dev/null +++ b/ocean_only/tides_025/diag_table @@ -0,0 +1,54 @@ +tides_025 +1 1 1 0 0 0 +# MOM6 ocean diagnostics files + +"ocean_sfc", 1, "hours", 1, "days", "time" +"ocean_interior", 1, "hours", 1, "days", "time" +"ocean_static", -1, "months", 1, "days", "time" # ocean_static is a protected name. Do not change this line. + +# ----------------------------------------------------------------------------------------- +# CMIP6/OMIP Table G1: static information + "ocean_model", "areacello", "areacello", "ocean_static", "all", "none", "none", 2 + "ocean_model", "deptho", "deptho", "ocean_static", "all", "none", "none", 2 + + "ocean_model", "Coriolis", "Coriolis", "ocean_static", "all", "none", "none", 2 + "ocean_model", "geolon", "geolon", "ocean_static", "all", "none", "none", 2 + "ocean_model", "geolat", "geolat", "ocean_static", "all", "none", "none", 2 + "ocean_model", "geolon_c", "geolon_c", "ocean_static", "all", "none", "none", 2 + "ocean_model", "geolat_c", "geolat_c", "ocean_static", "all", "none", "none", 2 + "ocean_model", "geolon_u", "geolon_u", "ocean_static", "all", "none", "none", 2 + "ocean_model", "geolat_u", "geolat_u", "ocean_static", "all", "none", "none", 2 + "ocean_model", "geolon_v", "geolon_v", "ocean_static", "all", "none", "none", 2 + "ocean_model", "geolat_v", "geolat_v", "ocean_static", "all", "none", "none", 2 + "ocean_model", "wet", "wet", "ocean_static", "all", "none", "none", 2 + "ocean_model", "wet_c", "wet_c", "ocean_static", "all", "none", "none", 2 + "ocean_model", "wet_u", "wet_u", "ocean_static", "all", "none", "none", 2 + "ocean_model", "wet_v", "wet_v", "ocean_static", "all", "none", "none", 2 + "ocean_model", "dxt", "dxt", "ocean_static", "all", "none", "none", 2 + "ocean_model", "dyt", "dyt", "ocean_static", "all", "none", "none", 2 + "ocean_model", "dxCu", "dxCu", "ocean_static", "all", "none", "none", 2 + "ocean_model", "dyCu", "dyCu", "ocean_static", "all", "none", "none", 2 + "ocean_model", "dxCv", "dxCv", "ocean_static", "all", "none", "none", 2 + "ocean_model", "dyCv", "dyCv", "ocean_static", "all", "none", "none", 2 +# "ocean_model", "areacello_cu","areacello_cu","ocean_static", "all", "none", "none", 2 +# "ocean_model", "areacello_cv","areacello_cv","ocean_static", "all", "none", "none", 2 +# "ocean_model", "areacello_bu","areacello_bu","ocean_static", "all", "none", "none", 2 + + +# ----------------------------------------------------------------------------------------- +# High-frequency surface fields + "ocean_model", "SSH", "ssh", "ocean_sfc", "all", "none", "none",2 + "ocean_model", "SSU", "ssu", "ocean_sfc", "all", "none", "none",2 + "ocean_model", "SSV", "ssv", "ocean_sfc", "all", "none", "none",2 + +# ----------------------------------------------------------------------------------------- +# various interior ocean fields + "ocean_model", "uo", "uo", "ocean_interior", "all", "none", "none",2 + "ocean_model", "vo", "vo", "ocean_interior", "all", "none", "none",2 + "ocean_model", "e", "e", "ocean_interior", "all", "none", "none",2 + "ocean_model", "speed", "speed", "ocean_interior", "all", "none", "none",2 +# "ocean_model", "KE", "KE", "ocean_interior", "all", "none", "none",2 + + + + diff --git a/ocean_only/tides_025/input.nml b/ocean_only/tides_025/input.nml new file mode 100644 index 0000000000..36398dcdcd --- /dev/null +++ b/ocean_only/tides_025/input.nml @@ -0,0 +1,16 @@ + &MOM_input_nml + output_directory = './', + input_filename = 'n' + restart_input_dir = 'INPUT/', + restart_output_dir = 'RESTART/', + parameter_filename = 'MOM_input', + 'MOM_override' / + + &diag_manager_nml + / + + &fms_nml + clock_grain='ROUTINE' + clock_flags='SYNC' + domains_stack_size = 955296 + stack_size =0 / From edb052913dd4bb2da4c7e41b476c05286cb8a8ed Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Fri, 17 Nov 2017 14:55:14 -0500 Subject: [PATCH 87/89] FMS: Updated to warsaw_201710 - This release of FMS incorporates everything that was on the branch coupler_types_reform_rwh which was what we were pointing to. It also includes other fixes need for upcoming commits for src/MOM6. --- src/FMS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FMS b/src/FMS index c2cfbd3911..34097d072c 160000 --- a/src/FMS +++ b/src/FMS @@ -1 +1 @@ -Subproject commit c2cfbd3911c01416a703f8cc9bfa47c7846ae293 +Subproject commit 34097d072ca2913668350ebd1a04957516c8fb67 From c1cb38c182f0cdff3bbd7a66462f1470ddf126d3 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 20 Nov 2017 11:25:09 -0500 Subject: [PATCH 88/89] MOM6: Bringing up to date for purpose of dev/master PR No output/answer changes implied but this brings src/MOM6 up to date with head of dev/gfdl in order to submit consistent PR to dev/master. - NOAA-GFDL/MOM6@bdcac96 Merge pull request #655 from ashao/add_ALE_enable_averaging - NOAA-GFDL/MOM6@41b09ba Add enable averaging before ALE routines - NOAA-GFDL/MOM6@20d206a Merge pull request #651 from adcroft/fix-intent-in-coupler-types - NOAA-GFDL/MOM6@baad349 Fixes the intent of argument updated by data_override --- src/MOM6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MOM6 b/src/MOM6 index 2dac087777..bdcac96552 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 2dac087777652940eb374b88cc61fa58df17d1e4 +Subproject commit bdcac965527b36a9accc79f67275c8223cf757e4 From 55838d6f617668ae3841da2778f195a578213ef6 Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Mon, 20 Nov 2017 11:54:11 -0500 Subject: [PATCH 89/89] mkmf: Fixes for symbolically linked files - NOAA-GFDL/mkmf@309d50d Better fix for symlinks - NOAA-GFDL/mkmf@8895cac list_paths now finds symlinks as well --- src/mkmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mkmf b/src/mkmf index f6e28edda7..309d50df87 160000 --- a/src/mkmf +++ b/src/mkmf @@ -1 +1 @@ -Subproject commit f6e28edda7ffc3bffffe39d1ec5a5959e41ec33f +Subproject commit 309d50df87a455337ec3c9bd6d0f43ede348e0c6