diff --git a/MOM_input b/MOM_input index 1f3971de..f731ac21 100644 --- a/MOM_input +++ b/MOM_input @@ -143,7 +143,7 @@ NK = 75 ! [nondim] ! The number of model layers. ! === module MOM_EOS === -EQN_OF_STATE = "ROQUET_RHO" ! default = "WRIGHT" +EQN_OF_STATE = "ROQUET_RHO" ! default = "WRIGHT_FULL" ! EQN_OF_STATE determines which ocean equation of state should be used. ! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT", ! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and @@ -193,8 +193,23 @@ ALE_COORDINATE_CONFIG = "FILE:ocean_vgrid.nc,interfaces=zeta" ! default = "UNIFO ! 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 + ! by a comma or space, for sigma-2 and dz. + ! e.g. HYBRID:vgrid.nc,sigma2,dz + ! HYBRID_3D:string - read from a file. The string specifies + ! the filename and two 3D variable names, separated + ! by a comma or space, for sigma-2 and dz. The + ! latter can be FNC1:string which is used everywhere. + ! e.g. HYBRID_3D:vgrid.nc,sigma2,dz + ! HYBRID_MAP:string - read from a file. The string specifies + ! the filename and three variable names, separated + ! by a comma or space, for map, sigma-2 and dz. + ! Map is a spatial index array with, maxval(map)=N, + ! and the others are 2D arrays containing N profiles. + ! Map typically contains integer values, but it can + ! contain real values, I+w, which imply using + ! the weighted sum of profiles I and I+1. + ! Dz can be FNC1:string which is used everywhere. + ! e.g. HYBRID_MAP:vgrid.nc,map,sigma2,dz !ALE_RESOLUTION = 1.0825614929199219, 1.1963462829589844, 1.322089672088623, 1.4610481262207031, 1.614609718322754, 1.784308910369873, 1.9718408584594727, 2.1790781021118164, 2.4080896377563477, 2.661160469055176, 2.940814971923828, 3.249845504760742, 3.591329574584961, 3.968667984008789, 4.385614395141602, 4.846321105957031, 5.355350494384766, 5.917766571044922, 6.539115905761719, 7.225547790527344, 7.983818054199219, 8.821372985839844, 9.746376037597656, 10.767845153808594, 11.895652770996094, 13.140586853027344, 14.514511108398438, 16.030319213867188, 17.7020263671875, 19.544876098632812, 21.575271606445312, 23.810821533203125, 26.270294189453125, 28.973419189453125, 31.94091796875, 35.194000244140625, 38.75390625, 42.641632080078125, 46.876739501953125, 51.476593017578125, 56.45489501953125, 61.82025146484375, 67.5743408203125, 73.70965576171875, 80.207763671875, 87.03759765625, 94.1534423828125, 101.4951171875, 108.9879150390625, 116.5452880859375, 124.0714111328125, 131.4671630859375, 138.6346435546875, 145.484130859375, 151.938232421875, 157.93701171875, 163.439697265625, 168.42431640625, 172.8876953125, 176.842041015625, 180.3125, 183.33154296875, 185.938720703125, 188.175048828125, 190.08251953125, 191.701171875 REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all @@ -256,13 +271,23 @@ DIAG_COORD_DEF_Z = "FILE:ocean_vgrid.nc,interfaces=zeta" ! default = "WOA09" ! 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 -REGRIDDING_ANSWER_DATE = 99991231 ! default = 20181231 - ! The vintage of the expressions and order of arithmetic to use for regridding. - ! Values below 20190101 result in the use of older, less accurate expressions - ! that were in use at the end of 2018. Higher values result in the use of more - ! robust and accurate forms of mathematically equivalent expressions. + ! by a comma or space, for sigma-2 and dz. + ! e.g. HYBRID:vgrid.nc,sigma2,dz + ! HYBRID_3D:string - read from a file. The string specifies + ! the filename and two 3D variable names, separated + ! by a comma or space, for sigma-2 and dz. The + ! latter can be FNC1:string which is used everywhere. + ! e.g. HYBRID_3D:vgrid.nc,sigma2,dz + ! HYBRID_MAP:string - read from a file. The string specifies + ! the filename and three variable names, separated + ! by a comma or space, for map, sigma-2 and dz. + ! Map is a spatial index array with, maxval(map)=N, + ! and the others are 2D arrays containing N profiles. + ! Map typically contains integer values, but it can + ! contain real values, I+w, which imply using + ! the weighted sum of profiles I and I+1. + ! Dz can be FNC1:string which is used everywhere. + ! e.g. HYBRID_MAP:vgrid.nc,map,sigma2,dz DIAG_COORD_DEF_RHO2 = "RFNC1:76,999.5,1020.,1034.1,3.1,1041.,0.002" ! default = "WOA09" ! Determines how to specify the coordinate resolution. Valid options are: ! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2 @@ -277,8 +302,23 @@ DIAG_COORD_DEF_RHO2 = "RFNC1:76,999.5,1020.,1034.1,3.1,1041.,0.002" ! default = ! 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 + ! by a comma or space, for sigma-2 and dz. + ! e.g. HYBRID:vgrid.nc,sigma2,dz + ! HYBRID_3D:string - read from a file. The string specifies + ! the filename and two 3D variable names, separated + ! by a comma or space, for sigma-2 and dz. The + ! latter can be FNC1:string which is used everywhere. + ! e.g. HYBRID_3D:vgrid.nc,sigma2,dz + ! HYBRID_MAP:string - read from a file. The string specifies + ! the filename and three variable names, separated + ! by a comma or space, for map, sigma-2 and dz. + ! Map is a spatial index array with, maxval(map)=N, + ! and the others are 2D arrays containing N profiles. + ! Map typically contains integer values, but it can + ! contain real values, I+w, which imply using + ! the weighted sum of profiles I and I+1. + ! Dz can be FNC1:string which is used everywhere. + ! e.g. HYBRID_MAP:vgrid.nc,map,sigma2,dz ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False @@ -370,11 +410,6 @@ FGNV_FILTER_SCALE = 0.1 ! [nondim] default = 1.0 ! streamfunction formulation. ! === module MOM_dynamics_split_RK2 === -VISC_REM_BUG = False ! [Boolean] default = True - ! If true, visc_rem_[uv] in split mode is incorrectly calculated or accounted - ! for in two places. This parameter controls the defaults of two individual - ! flags, VISC_REM_TIMESTEP_BUG in MOM_dynamics_split_RK2(b) and - ! VISC_REM_BT_WEIGHT_BUG in MOM_barotropic. ! === module MOM_continuity_PPM === ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.75E-09 @@ -397,6 +432,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENSTRO" ! default = "SADOURNY75_ENERGY" ! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst. ! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with ! Arakawa & Hsu and Sadourny energy + ! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy + ! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy + ! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy 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 @@ -409,6 +447,10 @@ BOUND_CORIOLIS = True ! [Boolean] default = False MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP = False ! [Boolean] default = True + ! If true and MASS_WEIGHT_IN_PRESSURE_GRADIENT is true, use mass weighting when + ! interpolating T/S for integrals near the top of the water column in FV + ! pressure gradient calculations. ! === module MOM_Zanna_Bolton === @@ -428,26 +470,13 @@ AH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 ! scaled viscosity, the Smagorinsky and Leith viscosities, and AH. SMAGORINSKY_AH = True ! [Boolean] default = False ! If true, use a biharmonic Smagorinsky nonlinear eddy viscosity. -BACKSCATTER_UNDERBOUND = False ! [Boolean] default = True - ! If true, the bounds on the biharmonic viscosity are allowed to increase where - ! the Laplacian viscosity is negative (due to backscatter parameterizations) - ! beyond the largest timestep-dependent stable values of biharmonic viscosity - ! when no Laplacian viscosity is applied. The default is true for historical - ! reasons, but this option probably should not be used because it can contribute - ! to numerical instabilities. SMAG_BI_CONST = 0.06 ! [nondim] default = 0.0 ! The nondimensional biharmonic Smagorinsky constant, typically 0.015 - 0.06. -FRICTWORK_BUG = False ! [Boolean] default = True - ! If true, retain an answer-changing bug in calculating the FrictWork, which - ! cancels the h in thickness flux and the h at velocity point. This isnot - ! recommended. ! === module MOM_vert_friction === HMIX_FIXED = 0.5 ! [m] ! The prescribed depth over which the near-surface viscosity and diffusivity are ! elevated when the bulk mixed layer is not used. -MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 - ! The maximum velocity allowed before the velocity components are truncated. CFL_TRUNCATE_RAMP_TIME = 7200.0 ! [s] default = 0.0 ! The time over which the CFL truncation value is ramped up at the beginning of ! the run. @@ -564,11 +593,6 @@ USE_LOTW_BBL_DIFFUSIVITY = True ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. -LOTW_BBL_ANSWER_DATE = 99991231 ! default = 20190101 - ! The vintage of the order of arithmetic and expressions in the LOTW_BBL - ! calculations. Values below 20240630 recover the original answers, while - ! higher values use more accurate expressions. This only applies when - ! USE_LOTW_BBL_DIFFUSIVITY is true. SIMPLE_TKE_TO_KD = True ! [Boolean] default = False ! If true, uses a simple estimate of Kd/TKE that will work for arbitrary ! vertical coordinates. If false, calculates Kd/TKE and bounds based on exact @@ -648,10 +672,10 @@ EPBL_MSTAR_SCHEME = "OM4" ! default = "CONSTANT" ! REICHL_H18 - Use the scheme documented in Reichl & Hallberg, 2018. MSTAR_CAP = 1.25 ! [nondim] default = -1.0 ! If this value is positive, it sets the maximum value of mstar allowed in ePBL. - ! (This is not used if EPBL_MSTAR_SCHEME = CONSTANT). + ! (This is not used if EPBL_mstar_scheme = CONSTANT). MSTAR2_COEF1 = 0.29 ! [nondim] default = 0.3 ! Coefficient in computing mstar when rotation and stabilizing effects are both - ! important (used if EPBL_MSTAR_SCHEME = OM4). + ! important (used if EPBL_mstar_scheme = OM4). MSTAR2_COEF2 = 0.152 ! [nondim] default = 0.085 ! Coefficient in computing mstar when only rotation limits the total mixing ! (used if EPBL_MSTAR_SCHEME = OM4) @@ -721,8 +745,15 @@ MAX_TR_DIFFUSION_CFL = 2.0 ! [nondim] default = -1.0 ! This module implements neutral diffusion of tracers USE_NEUTRAL_DIFFUSION = True ! [Boolean] default = False ! If true, enables the neutral diffusion module. +NDIFF_ANSWER_DATE = 20240101 ! default = 99991231 + ! The vintage of the order of arithmetic to use for the neutral diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! neutral diffusion code, while higher values use mathematically equivalent + ! expressions that recover rotational symmetry. ! === module MOM_sum_output === +MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 + ! The maximum velocity allowed before the velocity components are truncated. ! === module ocean_stochastics_init === @@ -769,3 +800,11 @@ USE_RIGID_SEA_ICE = True ! [Boolean] default = False SEA_ICE_RIGID_MASS = 100.0 ! [kg m-2] default = 1000.0 ! The mass of sea-ice per unit area at which the sea-ice starts to exhibit ! rigidity +WAVE_INTERFACE_ANSWER_DATE = 20221231 ! default = 99991231 + ! The vintage of the order of arithmetic and expressions in the surface wave + ! calculations. Values below 20230101 recover the answers from the end of 2022, + ! while higher values use updated and more robust forms of the same expressions: + ! < 20230101 - Original answers for wave interface routines + ! >= 20230101 - More robust expressions for Update_Stokes_Drift + ! >= 20230102 - More robust expressions for get_StokesSL_LiFoxKemper + ! >= 20230103 - More robust expressions for ust_2_u10_coare3p5 diff --git a/config.yaml b/config.yaml index 97b421dd..dff396ba 100644 --- a/config.yaml +++ b/config.yaml @@ -16,9 +16,9 @@ sync: #Model software version modules: use: - - /g/data/vk83/modules + - /g/data/vk83/prerelease/modules load: - - access-om3/2025.08.001 + - access-om3/pr164-1 queue: normal ncpus: 240 diff --git a/docs/MOM_parameter_doc.all b/docs/MOM_parameter_doc.all index 51e0cd2c..997a48ff 100644 --- a/docs/MOM_parameter_doc.all +++ b/docs/MOM_parameter_doc.all @@ -181,9 +181,6 @@ SURFACE_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the expressions for the surface properties. Values below ! 20190101 recover the answers from the end of 2018, while higher values use ! updated and more robust forms of the same expressions. -USE_DIABATIC_TIME_BUG = False ! [Boolean] default = False - ! If true, uses the wrong calendar time for diabatic processes, as was done in - ! MOM6 versions prior to February 2018. This is not recommended. 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" @@ -355,7 +352,7 @@ NK = 75 ! [nondim] ! === module MOM_tracer_registry === ! === module MOM_EOS === -EQN_OF_STATE = "ROQUET_RHO" ! default = "WRIGHT" +EQN_OF_STATE = "ROQUET_RHO" ! default = "WRIGHT_FULL" ! EQN_OF_STATE determines which ocean equation of state should be used. ! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT", ! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and @@ -530,8 +527,23 @@ ALE_COORDINATE_CONFIG = "FILE:ocean_vgrid.nc,interfaces=zeta" ! default = "UNIFO ! 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 + ! by a comma or space, for sigma-2 and dz. + ! e.g. HYBRID:vgrid.nc,sigma2,dz + ! HYBRID_3D:string - read from a file. The string specifies + ! the filename and two 3D variable names, separated + ! by a comma or space, for sigma-2 and dz. The + ! latter can be FNC1:string which is used everywhere. + ! e.g. HYBRID_3D:vgrid.nc,sigma2,dz + ! HYBRID_MAP:string - read from a file. The string specifies + ! the filename and three variable names, separated + ! by a comma or space, for map, sigma-2 and dz. + ! Map is a spatial index array with, maxval(map)=N, + ! and the others are 2D arrays containing N profiles. + ! Map typically contains integer values, but it can + ! contain real values, I+w, which imply using + ! the weighted sum of profiles I and I+1. + ! Dz can be FNC1:string which is used everywhere. + ! e.g. HYBRID_MAP:vgrid.nc,map,sigma2,dz !ALE_RESOLUTION = 1.0825614929199219, 1.1963462829589844, 1.322089672088623, 1.4610481262207031, 1.614609718322754, 1.784308910369873, 1.9718408584594727, 2.1790781021118164, 2.4080896377563477, 2.661160469055176, 2.940814971923828, 3.249845504760742, 3.591329574584961, 3.968667984008789, 4.385614395141602, 4.846321105957031, 5.355350494384766, 5.917766571044922, 6.539115905761719, 7.225547790527344, 7.983818054199219, 8.821372985839844, 9.746376037597656, 10.767845153808594, 11.895652770996094, 13.140586853027344, 14.514511108398438, 16.030319213867188, 17.7020263671875, 19.544876098632812, 21.575271606445312, 23.810821533203125, 26.270294189453125, 28.973419189453125, 31.94091796875, 35.194000244140625, 38.75390625, 42.641632080078125, 46.876739501953125, 51.476593017578125, 56.45489501953125, 61.82025146484375, 67.5743408203125, 73.70965576171875, 80.207763671875, 87.03759765625, 94.1534423828125, 101.4951171875, 108.9879150390625, 116.5452880859375, 124.0714111328125, 131.4671630859375, 138.6346435546875, 145.484130859375, 151.938232421875, 157.93701171875, 163.439697265625, 168.42431640625, 172.8876953125, 176.842041015625, 180.3125, 183.33154296875, 185.938720703125, 188.175048828125, 190.08251953125, 191.701171875 MIN_THICKNESS = 0.001 ! [m] default = 0.001 ! When regridding, this is the minimum layer thickness allowed. @@ -740,8 +752,23 @@ DIAG_COORD_DEF_Z = "FILE:ocean_vgrid.nc,interfaces=zeta" ! default = "WOA09" ! 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 + ! by a comma or space, for sigma-2 and dz. + ! e.g. HYBRID:vgrid.nc,sigma2,dz + ! HYBRID_3D:string - read from a file. The string specifies + ! the filename and two 3D variable names, separated + ! by a comma or space, for sigma-2 and dz. The + ! latter can be FNC1:string which is used everywhere. + ! e.g. HYBRID_3D:vgrid.nc,sigma2,dz + ! HYBRID_MAP:string - read from a file. The string specifies + ! the filename and three variable names, separated + ! by a comma or space, for map, sigma-2 and dz. + ! Map is a spatial index array with, maxval(map)=N, + ! and the others are 2D arrays containing N profiles. + ! Map typically contains integer values, but it can + ! contain real values, I+w, which imply using + ! the weighted sum of profiles I and I+1. + ! Dz can be FNC1:string which is used everywhere. + ! e.g. HYBRID_MAP:vgrid.nc,map,sigma2,dz DIAG_COORD_INTERP_SCHEME_RHO2 = "PPM_H4" ! default = "PPM_H4" ! This sets the interpolation scheme to use to determine the new grid. These ! parameters are only relevant when REGRIDDING_COORDINATE_MODE is set to a @@ -758,7 +785,7 @@ DIAG_COORD_INTERP_SCHEME_RHO2 = "PPM_H4" ! default = "PPM_H4" ! P3M_IH6IH5 (4th-order accurate) ! PQM_IH4IH3 (4th-order accurate) ! PQM_IH6IH5 (5th-order accurate) -REGRIDDING_ANSWER_DATE = 99991231 ! default = 20181231 +REGRIDDING_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the expressions and order of arithmetic to use for regridding. ! Values below 20190101 result in the use of older, less accurate expressions ! that were in use at the end of 2018. Higher values result in the use of more @@ -777,8 +804,23 @@ DIAG_COORD_DEF_RHO2 = "RFNC1:76,999.5,1020.,1034.1,3.1,1041.,0.002" ! default = ! 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 + ! by a comma or space, for sigma-2 and dz. + ! e.g. HYBRID:vgrid.nc,sigma2,dz + ! HYBRID_3D:string - read from a file. The string specifies + ! the filename and two 3D variable names, separated + ! by a comma or space, for sigma-2 and dz. The + ! latter can be FNC1:string which is used everywhere. + ! e.g. HYBRID_3D:vgrid.nc,sigma2,dz + ! HYBRID_MAP:string - read from a file. The string specifies + ! the filename and three variable names, separated + ! by a comma or space, for map, sigma-2 and dz. + ! Map is a spatial index array with, maxval(map)=N, + ! and the others are 2D arrays containing N profiles. + ! Map typically contains integer values, but it can + ! contain real values, I+w, which imply using + ! the weighted sum of profiles I and I+1. + ! Dz can be FNC1:string which is used everywhere. + ! e.g. HYBRID_MAP:vgrid.nc,map,sigma2,dz DIAG_COORD_P_REF_RHO2 = 2.0E+07 ! [Pa] default = 2.0E+07 ! The pressure that is used for calculating the diagnostic coordinate density. ! (1 Pa = 1e4 dbar, so 2e7 is commonly used.) This is only used for the RHO @@ -1200,6 +1242,8 @@ TIDES = False ! [Boolean] default = False ! If true, apply tidal momentum forcing. CALCULATE_SAL = False ! [Boolean] default = False ! If true, calculate self-attraction and loading. +USE_HA = False ! [Boolean] default = False + ! If true, perform inline harmonic analysis. 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 @@ -1219,13 +1263,18 @@ SPLIT_BOTTOM_STRESS = False ! [Boolean] default = False 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. +BT_ADJ_CORR_MASS_SRC = True ! [Boolean] default = True + ! If true, recalculates the barotropic mass source after predictor step. This + ! should make little difference in the deep ocean but appears to help for + ! vanished layers. If false, uses the same mass source as from the predictor + ! step. STORE_CORIOLIS_ACCEL = True ! [Boolean] default = True ! If true, calculate the Coriolis accelerations at the end of each timestep for ! use in the predictor step of the next split RK2 timestep. FPMIX = False ! [Boolean] default = False ! If true, add non-local momentum flux increments and diffuse down the Eulerian ! gradient. -VISC_REM_BUG = False ! [Boolean] default = True +VISC_REM_BUG = False ! [Boolean] default = False ! If true, visc_rem_[uv] in split mode is incorrectly calculated or accounted ! for in two places. This parameter controls the defaults of two individual ! flags, VISC_REM_TIMESTEP_BUG in MOM_dynamics_split_RK2(b) and @@ -1295,6 +1344,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENSTRO" ! default = "SADOURNY75_ENERGY" ! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst. ! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with ! Arakawa & Hsu and Sadourny energy + ! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy + ! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy + ! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy 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 @@ -1303,7 +1355,7 @@ BOUND_CORIOLIS = True ! [Boolean] default = False 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 + ! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV, KE_UP3 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) @@ -1334,7 +1386,7 @@ SSH_IN_EOS_PRESSURE_FOR_PGF = False ! [Boolean] default = False MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. -MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP = False ! [Boolean] default = False +MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP = False ! [Boolean] default = True ! If true and MASS_WEIGHT_IN_PRESSURE_GRADIENT is true, use mass weighting when ! interpolating T/S for integrals near the top of the water column in FV ! pressure gradient calculations. @@ -1375,6 +1427,9 @@ USE_ZB2020 = False ! [Boolean] default = False ! mesoscale eddies. ! === module MOM_hor_visc === +USE_CIRCULATION_IN_HORVISC = False ! [Boolean] default = False + ! Use circulation theorem to compute vorticity in horvisc module (for ZB20 or + ! Leith) USE_CONT_THICKNESS = False ! [Boolean] default = False ! If true, use thickness at velocity points from continuity solver. This option ! currently only works with split mode. @@ -1403,9 +1458,6 @@ RES_SCALE_MEKE_VISC = False ! [Boolean] default = False ! function. 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. EY24_EBT_BS = False ! [Boolean] default = False ! If true, use the the backscatter scheme (EBT mode with kill switch)developed ! by Yankovsky et al. (2024). @@ -1436,13 +1488,10 @@ USE_LEITHY = False ! [Boolean] default = False ! harmonic backscatter. 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. RE_AH = 0.0 ! [nondim] default = 0.0 ! If nonzero, the biharmonic coefficient is scaled so that the biharmonic ! Reynolds number is equal to this. -BACKSCATTER_UNDERBOUND = False ! [Boolean] default = True +BACKSCATTER_UNDERBOUND = False ! [Boolean] default = False ! If true, the bounds on the biharmonic viscosity are allowed to increase where ! the Laplacian viscosity is negative (due to backscatter parameterizations) ! beyond the largest timestep-dependent stable values of biharmonic viscosity @@ -1471,7 +1520,7 @@ HORVISC_BOUND_COEF = 0.8 ! [nondim] default = 0.8 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. -FRICTWORK_BUG = False ! [Boolean] default = True +FRICTWORK_BUG = False ! [Boolean] default = False ! If true, retain an answer-changing bug in calculating the FrictWork, which ! cancels the h in thickness flux and the h at velocity point. This isnot ! recommended. @@ -1519,10 +1568,6 @@ KV_ML_INVZ2 = 0.0 ! [m2 s-1] default = 0.0 ! from the surface, to allow for finite wind stresses to be transmitted through ! infinitesimally thin surface layers. This is an older option for numerical ! convenience without a strong physical basis, and its use is now discouraged. -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. @@ -1673,6 +1718,11 @@ DTBT = -0.95 ! [s or nondim] default = -0.98 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. +MASK_COASTAL_PRESSURE_FORCE = False ! [Boolean] default = False + ! If true, use the land masks to zero out the diagnosed barotropic pressure + ! gradient accelerations at coastal or land points. This changes diagnostics + ! and improves the reproducibility of certain debugging checksums, but it does + ! not alter the solutions themselves. ! === module MOM_mixed_layer_restrat === MIXEDLAYER_RESTRAT = True ! [Boolean] default = False @@ -1805,6 +1855,9 @@ EVAP_CFL_LIMIT = 0.8 ! [nondim] default = 0.8 MLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 ! The energy values used to compute MLDs. If not set (or all set to 0.), the ! default will overwrite to 25., 2500., 250000. +BMLD_EN_VALS = 25.0, 2500.0, 2.5E+05 ! [J/m2] default = 25.0, 2500.0, 2.5E+05 + ! The energy values used to compute Bottom MLDs. If not set (or all set to 0.), + ! the default will overwrite to 25., 2500., 250000. HREF_FOR_MLD = 0.0 ! [m] default = 0.0 ! Reference depth used to calculate the potential density used to find the mixed ! layer depth based on a delta rho = 0.03 kg/m3. @@ -1950,7 +2003,7 @@ LOTW_BBL_USE_OMEGA = True ! [Boolean] default = True ! Otherwise, N is N. VON_KARMAN_BBL = 0.41 ! [nondim] default = 0.41 ! The value the von Karman constant as used in calculating the BBL diffusivity. -LOTW_BBL_ANSWER_DATE = 99991231 ! default = 20190101 +LOTW_BBL_ANSWER_DATE = 99991231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the LOTW_BBL ! calculations. Values below 20240630 recover the original answers, while ! higher values use more accurate expressions. This only applies when @@ -2211,13 +2264,15 @@ EPBL_MSTAR_SCHEME = "OM4" ! default = "CONSTANT" ! REICHL_H18 - Use the scheme documented in Reichl & Hallberg, 2018. MSTAR_CAP = 1.25 ! [nondim] default = -1.0 ! If this value is positive, it sets the maximum value of mstar allowed in ePBL. - ! (This is not used if EPBL_MSTAR_SCHEME = CONSTANT). + ! (This is not used if EPBL_mstar_scheme = CONSTANT). MSTAR2_COEF1 = 0.29 ! [nondim] default = 0.3 ! Coefficient in computing mstar when rotation and stabilizing effects are both - ! important (used if EPBL_MSTAR_SCHEME = OM4). + ! important (used if EPBL_mstar_scheme = OM4). MSTAR2_COEF2 = 0.152 ! [nondim] default = 0.085 ! Coefficient in computing mstar when only rotation limits the total mixing ! (used if EPBL_MSTAR_SCHEME = OM4) +EPBL_BBL_USE_MSTAR = False ! [nondim] default = False + ! A logical to use mstar in the calculation of TKE in the ePBL BBL scheme NSTAR = 0.06 ! [nondim] default = 0.2 ! The portion of the buoyant potential energy imparted by surface fluxes that is ! available to drive entrainment at the base of mixed layer when that energy is @@ -2429,7 +2484,7 @@ NDIFF_USE_UNMASKED_TRANSPORT_BUG = False ! [Boolean] default = False ! If true, use an older form for the accumulation of neutral-diffusion ! transports that were unmasked, as used prior to Jan 2018. This is not ! recommended. -NDIFF_ANSWER_DATE = 20240101 ! default = 20240101 +NDIFF_ANSWER_DATE = 20240101 ! default = 99991231 ! The vintage of the order of arithmetic to use for the neutral diffusion. ! Values of 20240330 or below recover the answers from the original form of the ! neutral diffusion code, while higher values use mathematically equivalent @@ -2459,6 +2514,8 @@ 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. +MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 + ! The maximum velocity allowed before the velocity components are truncated. ENERGYFILE = "ocean.stats" ! default = "ocean.stats" ! The file to use to write the energies and globally summed diagnostics. DATE_STAMPED_STDOUT = True ! [Boolean] default = True @@ -2621,7 +2678,7 @@ LIQUID_RUNOFF_FROM_DATA = False ! [Boolean] default = False ! the component name 'OCN'. ! === module MOM_restart === -WAVE_INTERFACE_ANSWER_DATE = 20221231 ! default = 20221231 +WAVE_INTERFACE_ANSWER_DATE = 20221231 ! default = 99991231 ! The vintage of the order of arithmetic and expressions in the surface wave ! calculations. Values below 20230101 recover the answers from the end of 2022, ! while higher values use updated and more robust forms of the same expressions: diff --git a/docs/MOM_parameter_doc.short b/docs/MOM_parameter_doc.short index d1270581..341ca843 100644 --- a/docs/MOM_parameter_doc.short +++ b/docs/MOM_parameter_doc.short @@ -119,7 +119,7 @@ NK = 75 ! [nondim] ! The number of model layers. ! === module MOM_EOS === -EQN_OF_STATE = "ROQUET_RHO" ! default = "WRIGHT" +EQN_OF_STATE = "ROQUET_RHO" ! default = "WRIGHT_FULL" ! EQN_OF_STATE determines which ocean equation of state should be used. ! Currently, the valid choices are "LINEAR", "UNESCO", "JACKETT_MCD", "WRIGHT", ! "WRIGHT_REDUCED", "WRIGHT_FULL", "NEMO", "ROQUET_RHO", "ROQUET_SPV" and @@ -169,8 +169,23 @@ ALE_COORDINATE_CONFIG = "FILE:ocean_vgrid.nc,interfaces=zeta" ! default = "UNIFO ! 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 + ! by a comma or space, for sigma-2 and dz. + ! e.g. HYBRID:vgrid.nc,sigma2,dz + ! HYBRID_3D:string - read from a file. The string specifies + ! the filename and two 3D variable names, separated + ! by a comma or space, for sigma-2 and dz. The + ! latter can be FNC1:string which is used everywhere. + ! e.g. HYBRID_3D:vgrid.nc,sigma2,dz + ! HYBRID_MAP:string - read from a file. The string specifies + ! the filename and three variable names, separated + ! by a comma or space, for map, sigma-2 and dz. + ! Map is a spatial index array with, maxval(map)=N, + ! and the others are 2D arrays containing N profiles. + ! Map typically contains integer values, but it can + ! contain real values, I+w, which imply using + ! the weighted sum of profiles I and I+1. + ! Dz can be FNC1:string which is used everywhere. + ! e.g. HYBRID_MAP:vgrid.nc,map,sigma2,dz !ALE_RESOLUTION = 1.0825614929199219, 1.1963462829589844, 1.322089672088623, 1.4610481262207031, 1.614609718322754, 1.784308910369873, 1.9718408584594727, 2.1790781021118164, 2.4080896377563477, 2.661160469055176, 2.940814971923828, 3.249845504760742, 3.591329574584961, 3.968667984008789, 4.385614395141602, 4.846321105957031, 5.355350494384766, 5.917766571044922, 6.539115905761719, 7.225547790527344, 7.983818054199219, 8.821372985839844, 9.746376037597656, 10.767845153808594, 11.895652770996094, 13.140586853027344, 14.514511108398438, 16.030319213867188, 17.7020263671875, 19.544876098632812, 21.575271606445312, 23.810821533203125, 26.270294189453125, 28.973419189453125, 31.94091796875, 35.194000244140625, 38.75390625, 42.641632080078125, 46.876739501953125, 51.476593017578125, 56.45489501953125, 61.82025146484375, 67.5743408203125, 73.70965576171875, 80.207763671875, 87.03759765625, 94.1534423828125, 101.4951171875, 108.9879150390625, 116.5452880859375, 124.0714111328125, 131.4671630859375, 138.6346435546875, 145.484130859375, 151.938232421875, 157.93701171875, 163.439697265625, 168.42431640625, 172.8876953125, 176.842041015625, 180.3125, 183.33154296875, 185.938720703125, 188.175048828125, 190.08251953125, 191.701171875 REMAPPING_SCHEME = "PPM_H4" ! default = "PLM" ! This sets the reconstruction scheme used for vertical remapping for all @@ -232,13 +247,23 @@ DIAG_COORD_DEF_Z = "FILE:ocean_vgrid.nc,interfaces=zeta" ! default = "WOA09" ! 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 -REGRIDDING_ANSWER_DATE = 99991231 ! default = 20181231 - ! The vintage of the expressions and order of arithmetic to use for regridding. - ! Values below 20190101 result in the use of older, less accurate expressions - ! that were in use at the end of 2018. Higher values result in the use of more - ! robust and accurate forms of mathematically equivalent expressions. + ! by a comma or space, for sigma-2 and dz. + ! e.g. HYBRID:vgrid.nc,sigma2,dz + ! HYBRID_3D:string - read from a file. The string specifies + ! the filename and two 3D variable names, separated + ! by a comma or space, for sigma-2 and dz. The + ! latter can be FNC1:string which is used everywhere. + ! e.g. HYBRID_3D:vgrid.nc,sigma2,dz + ! HYBRID_MAP:string - read from a file. The string specifies + ! the filename and three variable names, separated + ! by a comma or space, for map, sigma-2 and dz. + ! Map is a spatial index array with, maxval(map)=N, + ! and the others are 2D arrays containing N profiles. + ! Map typically contains integer values, but it can + ! contain real values, I+w, which imply using + ! the weighted sum of profiles I and I+1. + ! Dz can be FNC1:string which is used everywhere. + ! e.g. HYBRID_MAP:vgrid.nc,map,sigma2,dz DIAG_COORD_DEF_RHO2 = "RFNC1:76,999.5,1020.,1034.1,3.1,1041.,0.002" ! default = "WOA09" ! Determines how to specify the coordinate resolution. Valid options are: ! PARAM - use the vector-parameter DIAG_COORD_RES_RHO2 @@ -253,8 +278,23 @@ DIAG_COORD_DEF_RHO2 = "RFNC1:76,999.5,1020.,1034.1,3.1,1041.,0.002" ! default = ! 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 + ! by a comma or space, for sigma-2 and dz. + ! e.g. HYBRID:vgrid.nc,sigma2,dz + ! HYBRID_3D:string - read from a file. The string specifies + ! the filename and two 3D variable names, separated + ! by a comma or space, for sigma-2 and dz. The + ! latter can be FNC1:string which is used everywhere. + ! e.g. HYBRID_3D:vgrid.nc,sigma2,dz + ! HYBRID_MAP:string - read from a file. The string specifies + ! the filename and three variable names, separated + ! by a comma or space, for map, sigma-2 and dz. + ! Map is a spatial index array with, maxval(map)=N, + ! and the others are 2D arrays containing N profiles. + ! Map typically contains integer values, but it can + ! contain real values, I+w, which imply using + ! the weighted sum of profiles I and I+1. + ! Dz can be FNC1:string which is used everywhere. + ! e.g. HYBRID_MAP:vgrid.nc,map,sigma2,dz ! === module MOM_MEKE === USE_MEKE = True ! [Boolean] default = False @@ -346,11 +386,6 @@ FGNV_FILTER_SCALE = 0.1 ! [nondim] default = 1.0 ! streamfunction formulation. ! === module MOM_dynamics_split_RK2 === -VISC_REM_BUG = False ! [Boolean] default = True - ! If true, visc_rem_[uv] in split mode is incorrectly calculated or accounted - ! for in two places. This parameter controls the defaults of two individual - ! flags, VISC_REM_TIMESTEP_BUG in MOM_dynamics_split_RK2(b) and - ! VISC_REM_BT_WEIGHT_BUG in MOM_barotropic. ! === module MOM_continuity_PPM === ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.75E-09 @@ -373,6 +408,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENSTRO" ! default = "SADOURNY75_ENERGY" ! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst. ! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with ! Arakawa & Hsu and Sadourny energy + ! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy + ! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy + ! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy 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 @@ -385,6 +423,10 @@ BOUND_CORIOLIS = True ! [Boolean] default = False MASS_WEIGHT_IN_PRESSURE_GRADIENT = True ! [Boolean] default = False ! If true, use mass weighting when interpolating T/S for integrals near the ! bathymetry in FV pressure gradient calculations. +MASS_WEIGHT_IN_PRESSURE_GRADIENT_TOP = False ! [Boolean] default = True + ! If true and MASS_WEIGHT_IN_PRESSURE_GRADIENT is true, use mass weighting when + ! interpolating T/S for integrals near the top of the water column in FV + ! pressure gradient calculations. ! === module MOM_Zanna_Bolton === @@ -404,26 +446,13 @@ AH_VEL_SCALE = 0.01 ! [m s-1] default = 0.0 ! scaled viscosity, the Smagorinsky and Leith viscosities, and AH. SMAGORINSKY_AH = True ! [Boolean] default = False ! If true, use a biharmonic Smagorinsky nonlinear eddy viscosity. -BACKSCATTER_UNDERBOUND = False ! [Boolean] default = True - ! If true, the bounds on the biharmonic viscosity are allowed to increase where - ! the Laplacian viscosity is negative (due to backscatter parameterizations) - ! beyond the largest timestep-dependent stable values of biharmonic viscosity - ! when no Laplacian viscosity is applied. The default is true for historical - ! reasons, but this option probably should not be used because it can contribute - ! to numerical instabilities. SMAG_BI_CONST = 0.06 ! [nondim] default = 0.0 ! The nondimensional biharmonic Smagorinsky constant, typically 0.015 - 0.06. -FRICTWORK_BUG = False ! [Boolean] default = True - ! If true, retain an answer-changing bug in calculating the FrictWork, which - ! cancels the h in thickness flux and the h at velocity point. This isnot - ! recommended. ! === module MOM_vert_friction === HMIX_FIXED = 0.5 ! [m] ! The prescribed depth over which the near-surface viscosity and diffusivity are ! elevated when the bulk mixed layer is not used. -MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 - ! The maximum velocity allowed before the velocity components are truncated. CFL_TRUNCATE_RAMP_TIME = 7200.0 ! [s] default = 0.0 ! The time over which the CFL truncation value is ramped up at the beginning of ! the run. @@ -540,11 +569,6 @@ USE_LOTW_BBL_DIFFUSIVITY = True ! [Boolean] default = False ! If true, uses a simple, imprecise but non-coordinate dependent, model of BBL ! mixing diffusivity based on Law of the Wall. Otherwise, uses the original BBL ! scheme. -LOTW_BBL_ANSWER_DATE = 99991231 ! default = 20190101 - ! The vintage of the order of arithmetic and expressions in the LOTW_BBL - ! calculations. Values below 20240630 recover the original answers, while - ! higher values use more accurate expressions. This only applies when - ! USE_LOTW_BBL_DIFFUSIVITY is true. SIMPLE_TKE_TO_KD = True ! [Boolean] default = False ! If true, uses a simple estimate of Kd/TKE that will work for arbitrary ! vertical coordinates. If false, calculates Kd/TKE and bounds based on exact @@ -624,10 +648,10 @@ EPBL_MSTAR_SCHEME = "OM4" ! default = "CONSTANT" ! REICHL_H18 - Use the scheme documented in Reichl & Hallberg, 2018. MSTAR_CAP = 1.25 ! [nondim] default = -1.0 ! If this value is positive, it sets the maximum value of mstar allowed in ePBL. - ! (This is not used if EPBL_MSTAR_SCHEME = CONSTANT). + ! (This is not used if EPBL_mstar_scheme = CONSTANT). MSTAR2_COEF1 = 0.29 ! [nondim] default = 0.3 ! Coefficient in computing mstar when rotation and stabilizing effects are both - ! important (used if EPBL_MSTAR_SCHEME = OM4). + ! important (used if EPBL_mstar_scheme = OM4). MSTAR2_COEF2 = 0.152 ! [nondim] default = 0.085 ! Coefficient in computing mstar when only rotation limits the total mixing ! (used if EPBL_MSTAR_SCHEME = OM4) @@ -697,8 +721,15 @@ MAX_TR_DIFFUSION_CFL = 2.0 ! [nondim] default = -1.0 ! This module implements neutral diffusion of tracers USE_NEUTRAL_DIFFUSION = True ! [Boolean] default = False ! If true, enables the neutral diffusion module. +NDIFF_ANSWER_DATE = 20240101 ! default = 99991231 + ! The vintage of the order of arithmetic to use for the neutral diffusion. + ! Values of 20240330 or below recover the answers from the original form of the + ! neutral diffusion code, while higher values use mathematically equivalent + ! expressions that recover rotational symmetry. ! === module MOM_sum_output === +MAXVEL = 6.0 ! [m s-1] default = 3.0E+08 + ! The maximum velocity allowed before the velocity components are truncated. ! === module ocean_stochastics_init === @@ -745,3 +776,11 @@ USE_RIGID_SEA_ICE = True ! [Boolean] default = False SEA_ICE_RIGID_MASS = 100.0 ! [kg m-2] default = 1000.0 ! The mass of sea-ice per unit area at which the sea-ice starts to exhibit ! rigidity +WAVE_INTERFACE_ANSWER_DATE = 20221231 ! default = 99991231 + ! The vintage of the order of arithmetic and expressions in the surface wave + ! calculations. Values below 20230101 recover the answers from the end of 2022, + ! while higher values use updated and more robust forms of the same expressions: + ! < 20230101 - Original answers for wave interface routines + ! >= 20230101 - More robust expressions for Update_Stokes_Drift + ! >= 20230102 - More robust expressions for get_StokesSL_LiFoxKemper + ! >= 20230103 - More robust expressions for ust_2_u10_coare3p5 diff --git a/docs/available_diags.000000 b/docs/available_diags.000000 index a7843474..46a2401d 100644 --- a/docs/available_diags.000000 +++ b/docs/available_diags.000000 @@ -1066,6 +1066,12 @@ ! long_name: Meridional Anomalous Barotropic Pressure Force Acceleration ! units: m s-2 ! cell_methods: xh:mean yq:point +"etaPF_anom" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! dimensions: xh, yh + ! long_name: Eta anomalies used for pressure forces averaged over a baroclinic timestep + ! units: m + ! cell_methods: xh:mean yh:mean area:mean "CoruBT" [Unused] ! modules: {ocean_model,ocean_model_d2} ! dimensions: xq, yh @@ -1182,6 +1188,18 @@ ! units: nondim ! cell_methods: xh:mean yq:point zl:mean ! variants: {visc_rem_v,visc_rem_v_xyave} +"bt_rem_u" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! dimensions: xq, yh + ! long_name: Barotropic viscous remnant per barotropic step at u + ! units: nondim + ! cell_methods: xq:point yh:mean +"bt_rem_v" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! dimensions: xh, yq + ! long_name: Barotropic viscous remnant per barotropic step at v + ! units: nondim + ! cell_methods: xh:mean yq:point "gtot_n" [Unused] ! modules: {ocean_model,ocean_model_d2} ! dimensions: xh, yh @@ -1230,6 +1248,12 @@ ! long_name: High Frequency Predictor Barotropic SSH ! units: m ! cell_methods: xh:mean yh:mean area:mean +"etaPF_hifreq" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! dimensions: xh, yh + ! long_name: High Frequency Barotropic SSH anomalies used for pressure forces + ! units: m + ! cell_methods: xh:mean yh:mean area:mean "uhbt_hifreq" [Unused] ! modules: {ocean_model,ocean_model_d2} ! dimensions: xq, yh @@ -2353,6 +2377,24 @@ ! long_name: Mixed layer depth for energy value set to 250000.00 J/m2 (Energy set by 3rd MLD_EN_VALS) ! units: m ! cell_methods: xh:mean yh:mean area:mean +"BMLD_EN1" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! dimensions: xh, yh + ! long_name: Bottom mixed layer depth for energy value set to 25.00 J/m2 (Energy set by 1st MLD_EN_VALS) + ! units: m + ! cell_methods: xh:mean yh:mean area:mean +"BMLD_EN2" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! dimensions: xh, yh + ! long_name: Bottom mixed layer depth for energy value set to 2500.00 J/m2 (Energy set by 2nd MLD_EN_VALS) + ! units: m + ! cell_methods: xh:mean yh:mean area:mean +"BMLD_EN3" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! dimensions: xh, yh + ! long_name: Bottom mixed layer depth for energy value set to 250000.00 J/m2 (Energy set by 3rd MLD_EN_VALS) + ! units: m + ! cell_methods: xh:mean yh:mean area:mean "subML_N2" [Unused] ! modules: {ocean_model,ocean_model_d2} ! dimensions: xh, yh @@ -3255,6 +3297,18 @@ ! long_name: Surface mixed layer depth based on active turbulence ! units: m ! cell_methods: xh:mean yh:mean area:mean +"ePBL_ustar" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! dimensions: xh, yh + ! long_name: Surface friction in ePBL + ! units: m s-1 + ! cell_methods: xh:mean yh:mean area:mean +"ePBL_bflx" [Unused] + ! modules: {ocean_model,ocean_model_d2} + ! dimensions: xh, yh + ! long_name: Surface buoyancy flux in ePBL + ! units: m2 s-3 + ! cell_methods: xh:mean yh:mean area:mean "ePBL_TKE_wind" [Unused] ! modules: {ocean_model,ocean_model_d2} ! dimensions: xh, yh diff --git a/manifests/exe.yaml b/manifests/exe.yaml index 5101ae28..152a5020 100644 --- a/manifests/exe.yaml +++ b/manifests/exe.yaml @@ -2,7 +2,7 @@ format: yamanifest version: 1.0 --- work/access-om3-MOM6-CICE6: - fullpath: /g/data/vk83/apps/spack/0.22/release/linux-rocky8-x86_64_v4/oneapi-2025.2.0/access3-2025.08.000-n2qsfzdl7syl4k6m4dx3ydqxarpkmw6l/bin/access-om3-MOM6-CICE6 + fullpath: /g/data/vk83/prerelease/apps/spack/0.22/release/linux-rocky8-x86_64_v4/oneapi-2025.2.0/access3-2025.08.000-xhzpxdjuhlvvsuzlnck3muaej3h5w72n/bin/access-om3-MOM6-CICE6 hashes: - binhash: 2c767b4b07ae2e86e21b4a50582de8df - md5: cda3625020745cae76fcfc1f800ef4b3 + binhash: 94399e2a2fd8c6bf3d0ab11d57bbdc78 + md5: 51b7a0b1bb91754e3eb4fc9478d25841