From e7278b101878d50c6b7cebdfa6bb7a3575f450e3 Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Thu, 2 Apr 2026 10:23:22 -0600 Subject: [PATCH] Add tx2_3v3, following tx2_3v2 --- param_templates/MOM_input.yaml | 350 +++++++++++---------- param_templates/diag_table.yaml | 78 ++--- param_templates/input_data_list.yaml | 10 +- param_templates/json/MOM_input.json | 358 +++++++++++----------- param_templates/json/diag_table.json | 78 ++--- param_templates/json/input_data_list.json | 16 +- 6 files changed, 464 insertions(+), 426 deletions(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index fbbcc35..30111f8 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -43,7 +43,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True else: False NIHALO: @@ -71,7 +71,7 @@ Global: this is set in MOM_memory.h at compile time." datatype: integer value: - $OCN_GRID == "tx2_3v2": 540 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 540 $OCN_GRID == "tx0.25v1": 1440 $OCN_GRID == "MISOMIP": 402 NJGLOBAL: @@ -86,7 +86,7 @@ Global: The processor layout that was acutally used." datatype: integer value: - $OCN_GRID == "tx2_3v2": 480 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 480 $OCN_GRID == "tx0.25v1": 1080 $OCN_GRID == "MISOMIP": 40 NK: @@ -107,7 +107,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False HREF_FOR_MLD: description: | "[m] default = 0.0 @@ -116,7 +116,7 @@ Global: datatype: real units: m value: - $OCN_GRID == "tx2_3v2": 10.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 10.0 USE_REGRIDDING: description: | "[Boolean] default = False @@ -133,7 +133,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True THICKNESSDIFFUSE_FIRST: description: | @@ -143,7 +143,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True DT: description: | @@ -156,7 +156,7 @@ Global: units: s value: $OCN_GRID == "tx0.25v1": 900.0 - $OCN_GRID == "tx2_3v2": 1800 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1800 $OCN_GRID == "MISOMIP": 600.0 DT_THERM: description: | @@ -188,7 +188,7 @@ Global: datatype: real units: m value: - $OCN_GRID == "tx2_3v2": 10.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 10.0 $OCN_GRID == "tx0.25v1": 20.0 DTBT_RESET_PERIOD: description: | @@ -201,7 +201,7 @@ Global: datatype: real units: s value: - $OCN_GRID == "tx2_3v2": 7200.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 7200.0 $OCN_GRID == "tx0.25v1": 3600.0 else: 0.0 FRAZIL: @@ -244,7 +244,7 @@ Global: datatype: real units: J kg-1 K-1 value: - $OCN_GRID == "tx2_3v2": 3992.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 3992.0 $OCN_GRID == "tx0.25v1": 3992.0 $OCN_GRID == "MISOMIP": 3974.0 USE_PSURF_IN_EOS: @@ -262,7 +262,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True SAVE_INITIAL_CONDS: description: | @@ -281,7 +281,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False $OCN_GRID == "tx0.25v1": False EQN_OF_STATE: description: | @@ -300,7 +300,7 @@ Global: datatype: real units: deg C Pa-1 value: - $OCN_GRID == "tx2_3v2": -7.75E-08 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: -7.75E-08 $OCN_GRID == "tx0.25v1": -7.75E-08 $OCN_GRID == "MISOMIP": -7.53E-08 USE_IDEAL_AGE_TRACER: @@ -310,7 +310,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True USE_CFC_CAP: description: | @@ -535,6 +535,7 @@ Global: datatype: string value: $OCN_GRID == "tx2_3v2": "ocean_hgrid_221123.nc" + $OCN_GRID == "tx2_3v3": "ocean_hgrid_250930.nc" $OCN_GRID == "tx0.25v1": "ocean_hgrid.nc" USE_TRIPOLAR_GEOLONB_BUG: description: | @@ -544,7 +545,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False $OCN_GRID == "tx0.25v1": False RAD_EARTH: description: | @@ -583,6 +584,7 @@ Global: datatype: string value: $OCN_GRID == "tx2_3v2": "ocean_topo_tx2_3v2_240501.nc" + $OCN_GRID == "tx2_3v3": "ocean_topo_tx2_3v3_260305.nc" $OCN_GRID == "tx0.25v1": "ocean_topog.nc" TOPO_EDITS_FILE: description: | @@ -599,7 +601,7 @@ Global: datatype: real units: m value: - $OCN_GRID == "tx2_3v2": 6000.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 6000.0 $OCN_GRID == "tx0.25v1": 6500.0 $OCN_GRID == "MISOMIP": 720.0 MINIMUM_DEPTH: @@ -613,7 +615,7 @@ Global: datatype: real units: m value: - $OCN_GRID == "tx2_3v2": 9.5 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 9.5 $OCN_GRID == "tx0.25v1": 9.5 MASKING_DEPTH: description: | @@ -623,7 +625,7 @@ Global: datatype: real units: m value: - $OCN_GRID == "tx2_3v2": 0.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.0 $OCN_GRID == "tx0.25v1": 0.0 REMAPPING_SCHEME: description: | @@ -648,7 +650,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True REMAPPING_USE_OM4_SUBCELLS: description: | "[Boolean] default = True @@ -659,7 +661,7 @@ Global: datatype: bool units: none value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False INIT_LAYERS_FROM_Z_FILE: description: | "[Boolean] default = False @@ -669,7 +671,7 @@ Global: datatype: logical units: Boolean value: - $RUN_TYPE != "hybrid" and $OCN_GRID in ["tx2_3v2", "tx0.25v1"]: + $RUN_TYPE != "hybrid" and $OCN_GRID in ["tx2_3v2", "tx2_3v3", "tx0.25v1"]: True else: False @@ -680,7 +682,7 @@ Global: the layer thicknesses, temperatures and salinities." datatype: string value: - $OCN_GRID == "tx2_3v2": "woa18_04_initial_conditions.nc" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "woa18_04_initial_conditions.nc" $OCN_GRID == "tx0.25v1": "MOM6_IC_TS.nc" Z_INIT_FILE_PTEMP_VAR: description: | @@ -689,7 +691,7 @@ Global: TEMP_SALT_Z_INIT_FILE." datatype: string value: - $OCN_GRID == "tx2_3v2": "theta0" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "theta0" $OCN_GRID == "tx0.25v1": "temp" Z_INIT_FILE_SALT_VAR: description: | @@ -698,7 +700,7 @@ Global: TEMP_SALT_Z_INIT_FILE." datatype: string value: - $OCN_GRID == "tx2_3v2": "s_an" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "s_an" Z_INIT_REMAP_OLD_ALG: description: | "[Boolean] default = True @@ -715,7 +717,7 @@ Global: datatype: logical units: Boolean value: - $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v2"]: True + $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True USE_VARIABLE_MIXING: description: | "[Boolean] default = False @@ -727,7 +729,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True RESOLN_SCALED_KH: description: | @@ -738,7 +740,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True KHTH_SLOPE_CFF: description: | @@ -748,7 +750,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.01 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.01 DEPTH_SCALED_KHTH: description: | "[Boolean] default = False @@ -760,7 +762,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": False DEPTH_SCALED_KHTH_H0: description: | @@ -769,7 +771,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 500.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 500.0 KHTR_SLOPE_CFF: description: | "[nondim] default = 0.0 @@ -787,7 +789,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True RESOLN_SCALED_KHTH: description: | "[Boolean] default = False @@ -797,7 +799,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True RESOLN_SCALED_KHTR: description: | @@ -807,7 +809,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True USE_GM_WORK_BUG: description: | "[Boolean] default = True @@ -825,7 +827,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True USE_STANLEY_ISO: description: | @@ -834,7 +836,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False ETA_TOLERANCE: description: | "[m] default = 3.15E-09 @@ -868,7 +870,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True NDIFF_INTERIOR_ONLY: description: | "[Boolean] default = False @@ -877,7 +879,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True NDIFF_TAPERING: description: | "[Boolean] default = False @@ -887,7 +889,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True USE_HORIZONTAL_BOUNDARY_DIFFUSION: description: | "[Boolean] default = False @@ -895,7 +897,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True HBD_LINEAR_TRANSITION: description: | "[Boolean] default = False @@ -904,7 +906,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True SIMPLE_TKE_TO_KD: description: | "[Boolean] default = False @@ -915,7 +917,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True REGRIDDING_COORDINATE_MODE: description: | @@ -984,6 +986,8 @@ Global: value: $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v2"]: | '"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v2/lev-2025-09-12.nc,Z"' + $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v3"]: | + '"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v3/lev-2025-09-12.nc,Z"' $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID == "tx0.25v1": '"FNC1:5,8000.0,1.0,.01"' MAX_LAYER_THICKNESS_CONFIG: description: | @@ -1001,6 +1005,8 @@ Global: value: $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v2"]: | '"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v2/dz_max-2025-09-12.nc,dz"' + $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v3"]: | + '"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v3/dz_max-2025-09-12.nc,dz"' else: '"FNC1:400,31000.0,0.1,.01"' BOUND_CORIOLIS: description: | @@ -1038,7 +1044,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True LAPLACIAN: description: | "[Boolean] default = False @@ -1053,7 +1059,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True SMAG_LAP_CONST: description: | "[nondim] default = 0.0 @@ -1061,7 +1067,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.15 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.15 KH: description: | "[m2 s-1] default = 0.0 @@ -1082,7 +1088,7 @@ Global: value: $OCN_GRID == "MISOMIP": 0.0 $OCN_GRID == "tx0.25v1": 0.0 - $OCN_GRID == "tx2_3v2": 0.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.0 else: 0.01 KH_SIN_LAT: description: | @@ -1092,7 +1098,7 @@ Global: datatype: real units: m2 s-1 value: - $OCN_GRID == "tx2_3v2": 0.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.0 BIHARMONIC: description: | "[Boolean] default = True @@ -1101,7 +1107,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "MISOMIP": False AH: description: | @@ -1110,7 +1116,7 @@ Global: datatype: real units: m4 s-1 value: - $OCN_GRID == "tx2_3v2": 1.0E+12 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0E+12 AH_VEL_SCALE: description: | "[m s-1] default = 0.0 @@ -1132,7 +1138,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True LEITH_AH: description: | "[Boolean] default = False @@ -1140,7 +1146,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False LEITH_BI_CONST: description: | "[nondim] default = 0.0 @@ -1149,7 +1155,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 75.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 75.0 LEITHY_CK: description: | "[nondim] default = 1.0 @@ -1157,7 +1163,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.0 USE_LAND_MASK_FOR_HVISC: description: | "[Boolean] default = False @@ -1218,7 +1224,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 1.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0 $OCN_GRID == "tx0.25v1": 1.25 U_TRUNC_FILE: description: | @@ -1256,7 +1262,7 @@ Global: datatype: real units: s value: - $OCN_GRID == "tx2_3v2": 7200.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 7200.0 Z_INIT_ALE_REMAPPING: description: | "[Boolean] default = False @@ -1264,7 +1270,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True NUM_DIAG_COORDS: description: | @@ -1272,7 +1278,7 @@ Global: For each coordinate, an entry in DIAG_COORDS must be provided." datatype: integer value: - $OCN_GRID == "tx2_3v2": 2 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 2 $OCN_GRID == "tx0.25v1": 1 DIAG_COORDS: description: | @@ -1281,7 +1287,7 @@ Global: is of the form MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME." datatype: string value: - $OCN_GRID == "tx2_3v2": '"z Z ZSTAR", "rho2 RHO2 RHO"' + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: '"z Z ZSTAR", "rho2 RHO2 RHO"' $OCN_GRID == "tx0.25v1": '"z Z ZSTAR"' DIAG_COORD_DEF_RHO2: description: | @@ -1328,7 +1334,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True DRAG_BG_VEL: description: | @@ -1341,7 +1347,7 @@ Global: datatype: real units: m s-1 value: - $OCN_GRID == "tx2_3v2": 0.1 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.1 $OCN_GRID == "tx0.25v1": 0.1 BBL_USE_EOS: description: | @@ -1388,7 +1394,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True BT_THICK_SCHEME: description: | @@ -1454,7 +1460,7 @@ Global: datatype: real units: m value: - $OCN_GRID == "tx2_3v2": 1.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0 MAX_P_SURF: description: | "[Pa] default = -1.0 @@ -1475,7 +1481,7 @@ Global: datatype: real units: m2 s-1 value: - $OCN_GRID == "tx2_3v2": 0.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.0 $OCN_GRID == "MISOMIP": 0.0 KHTH_MIN: description: | @@ -1484,7 +1490,7 @@ Global: datatype: real units: m2 s-1 value: - $OCN_GRID == "tx2_3v2": 50.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 50.0 FULL_DEPTH_KHTH_MIN: description: | "[Boolean] default = False @@ -1494,7 +1500,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True KHTH_MAX_CFL: description: | "[nondimensional] default = 0.8 @@ -1514,7 +1520,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True STANLEY_COEFF: description: "[nondim] default = -1.0 @@ -1522,7 +1528,7 @@ Global: datatype: real units: nondimensional value: - $OCN_GRID == "tx2_3v2": 0.5 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.5 USE_KH_IN_MEKE: description: | "[Boolean] default = False @@ -1530,7 +1536,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True KHTH_USE_FGNV_STREAMFUNCTION: description: | "[Boolean] default = False @@ -1540,7 +1546,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True FGNV_C_MIN: description: | "[m s-1] default = 0.0 @@ -1549,7 +1555,7 @@ Global: datatype: real units: m s-1 value: - $OCN_GRID == "tx2_3v2": 0.01 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.01 USE_STANLEY_GM: description: | "[Boolean] default = False @@ -1557,7 +1563,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False MIXEDLAYER_RESTRAT: description: | "[Boolean] default = False @@ -1577,7 +1583,7 @@ Global: datatype: bool units: none value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True MLE_DENSITY_DIFF: description: | "[kg/m3] default = 0.03 @@ -1586,7 +1592,7 @@ Global: datatype: real units: kg/m3 value: - $OCN_GRID == "tx2_3v2": 0.02 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.02 FOX_KEMPER_ML_RESTRAT_COEF: description: | "[nondim] default = 0.0 @@ -1606,7 +1612,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 1.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0 $OCN_GRID == "tx0.25v1": 1.0 MLE_FRONT_LENGTH: description: | @@ -1618,7 +1624,7 @@ Global: datatype: real units: m value: - $OCN_GRID == "tx2_3v2": 1000.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1000.0 $OCN_GRID == "tx0.25v1": 500.0 MLE_FRONT_LENGTH_FROM_FILE: description: | @@ -1627,7 +1633,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False MLE_MLD_DECAY_TIME: description: | "[s] default = 0.0 @@ -1638,7 +1644,7 @@ Global: datatype: real units: s value: - $OCN_GRID == "tx2_3v2": 3.45600E+05 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 3.45600E+05 $OCN_GRID == "tx0.25v1": 2.592E+06 USE_STANLEY_ML: description: | @@ -1647,7 +1653,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True USE_CVMix_CONVECTION: description: | "[Boolean] default = False @@ -1658,7 +1664,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True BBL_MIXING_AS_MAX: description: | "[Boolean] default = True @@ -1668,7 +1674,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False $OCN_GRID == "tx0.25v1": False USE_LOTW_BBL_DIFFUSIVITY: description: | @@ -1679,7 +1685,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True KD_MAX: description: | @@ -1690,7 +1696,7 @@ Global: datatype: real units: m2 s-1 value: - $OCN_GRID == "tx2_3v2": 0.1 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.1 $OCN_GRID == "tx0.25v1": 0.1 HORIZ_VARYING_BACKGROUND: description: | @@ -1700,7 +1706,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True KD: description: | @@ -1711,7 +1717,7 @@ Global: datatype: real units: m2 s-1 value: - $OCN_GRID == "tx2_3v2": 1.0E-07 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0E-07 $OCN_GRID == "tx0.25v1": 1.5E-05 $OCN_GRID == "MISOMIP": 5.0E-05 else: 2.0E-05 @@ -1744,7 +1750,7 @@ Global: datatype: real units: m2 s-1 value: - $OCN_GRID == "tx2_3v2": 1.0E-07 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0E-07 else: 2.0E-06 INT_TIDE_DECAY_SCALE: description: | @@ -1813,7 +1819,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True USE_CVMix_TIDAL: description: | "[Boolean] default = False @@ -1821,7 +1827,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True INT_TIDE_DISSIPATION: description: | "[Boolean] default = False @@ -1831,7 +1837,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True INT_TIDE_PROFILE: description: | @@ -1852,13 +1858,14 @@ Global: datatype: string value: $OCN_GRID == "tx2_3v2": "energy_new_tx2_3_conserve_230415_cdf5.nc" + $OCN_GRID == "tx2_3v3": "tidal_energy_tx2_3v3_conserve_260306.nc" TIDAL_ENERGY_TYPE: description: | "The type of input tidal energy flux dataset. Valid values are Jayne ER03" datatype: string value: - $OCN_GRID == "tx2_3v2": "Jayne" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "Jayne" USE_LMD94: description: | "[Boolean] default = False @@ -1867,7 +1874,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True NU_ZERO: description: | "[m2 s-1] default = 0.005 @@ -1875,7 +1882,7 @@ Global: datatype: real units: m2 s-1 value: - $OCN_GRID == "tx2_3v2": 0.0025 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.0025 RI_ZERO: description: | "[nondim] default = 0.8 @@ -1884,7 +1891,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.5 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.5 N_SMOOTH_RI: description: | "default = 0 @@ -1893,7 +1900,7 @@ Global: datatype: integer units: nondim value: - $OCN_GRID == "tx2_3v2": 1 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1 USE_CVMIX_DDIFF: description: | "[Boolean] default = False @@ -1903,7 +1910,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True MAX_ENT_IT: description: | "default = 5 @@ -1920,7 +1927,7 @@ Global: datatype: real units: m value: - $OCN_GRID == "tx2_3v2": 1.0E-05 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0E-05 $OCN_GRID == "MISOMIP": 1.0E-08 HMIX_MIN: description: | @@ -1942,7 +1949,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True MSTAR_MODE: description: | "[units=nondim] default = 0 @@ -2152,7 +2159,7 @@ Global: units: Boolean value: $OCN_GRID == "tx0.25v1": True - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True CHL_FILE: description: | "CHL_FILE is the file containing chl_a concentrations in the variable CHL_A." @@ -2160,6 +2167,7 @@ Global: value: $OCN_GRID == "tx0.25v1": "seawifs-clim-1997-2010.1440x1080.v20180328.nc" $OCN_GRID == "tx2_3v2": "seawifs-clim-1997-2010-tx2_3v2.230416.nc" + $OCN_GRID == "tx2_3v3": "seawifs-clim-1997-2010-tx2_3v3_260305.nc" CHL_VARNAME: description: | "default = 'CHL_A'" @@ -2173,7 +2181,7 @@ Global: datatype: integer value: $OCN_GRID == "tx0.25v1": 3 - $OCN_GRID == "tx2_3v2": 2 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 2 OPACITY_SCHEME: description: | "default = 'MANIZZA_05' @@ -2184,7 +2192,7 @@ Global: OHLMANN_03 - Use Ohlmann, J Clim, 2003." datatype: string value: - $OCN_GRID == "tx2_3v2": "OHLMANN_03" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "OHLMANN_03" TRACER_ADVECTION_SCHEME: description: | "default = 'PLM' @@ -2193,7 +2201,7 @@ Global: PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)" datatype: string value: - $OCN_GRID == "tx2_3v2": '"PPM:H3"' + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: '"PPM:H3"' $OCN_GRID == "tx0.25v1": '"PPM:H3"' KHTR_USE_EBT_STRUCT: description: | @@ -2203,7 +2211,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True KHTR: description: | "[m2 s-1] default = 0.0 @@ -2219,7 +2227,7 @@ Global: datatype: real units: m2 s-1 value: - $OCN_GRID == "tx2_3v2": 50.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 50.0 FULL_DEPTH_KHTR_MIN: description: | "[Boolean] default = False @@ -2229,7 +2237,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True DEBUG: description: | "If true, write out verbose debugging data." @@ -2246,7 +2254,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True MAX_TR_DIFFUSION_CFL: description: | @@ -2258,7 +2266,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 2.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 2.0 MAXTRUNC: description: | "[truncations save_interval-1] default = 0 @@ -2280,7 +2288,7 @@ Global: 'A', 'B', or 'C'." datatype: string value: - $OCN_GRID == "tx2_3v2": "A" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "A" $OCN_GRID == "tx0.25v1": "A" RESTORE_SALINITY: description: | @@ -2291,7 +2299,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2" and $COMP_ATM == "datm": True # for C and G compsets on tx2_3v2 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $COMP_ATM == "datm": True # for C and G compsets on tx2_3v2 else: False WIND_STAGGER: description: | @@ -2317,7 +2325,7 @@ Global: datatype: real units: m day-1 value: - $OCN_GRID == "tx2_3v2": 0.1667 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.1667 SALT_RESTORE_FILE: description: | "default = 'salt_restore.nc' @@ -2325,6 +2333,7 @@ Global: datatype: string value: $OCN_GRID == "tx2_3v2": "state_restore_tx2_3_20230416.nc" + $OCN_GRID == "tx2_3v3": "state_restore_tx2_3v3_260305.nc" ADJUST_NET_FRESH_WATER_TO_ZERO: description: | "[Boolean] default = False @@ -2342,7 +2351,7 @@ Global: datatype: real units: PSU or g kg-1 value: - $OCN_GRID == "tx2_3v2": 5.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 5.0 SRESTORE_AS_SFLUX: description: | "[Boolean] default = False @@ -2351,7 +2360,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True GUST_CONST: description: | "[Pa] default = 0.02 @@ -2398,7 +2407,7 @@ Global: datatype: real units: days value: - $OCN_GRID == "tx2_3v2": 1.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0 $OCN_GRID == "tx0.25v1": 0.25 $OCN_GRID == "MISOMIP": 1.0 ENERGETICS_SFC_PBL: @@ -2421,7 +2430,7 @@ Global: units: Boolean value: $OCN_GRID == "tx0.25v1": True - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True MEKE_GMCOEFF: description: | "[nondim] default = -1.0 @@ -2433,7 +2442,7 @@ Global: units: nondim value: $OCN_GRID == "tx0.25v1": 1.0 - $OCN_GRID == "tx2_3v2": 0.25 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.25 MEKE_BGSRC: description: | "[W kg-1] default = 0.0 @@ -2450,7 +2459,7 @@ Global: units: nondim value: $OCN_GRID == "tx0.25v1": 1.0 - $OCN_GRID == "tx2_3v2": 0.75 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.75 MEKE_VISCOSITY_COEFF_KU: description: | "[nondim] default = 0.0 @@ -2460,7 +2469,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.0 MEKE_MIN_LSCALE: description: | "[Boolean] default = False @@ -2469,7 +2478,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True MEKE_ALPHA_RHINES: description: | "[nondim] default = 0.05 @@ -2488,7 +2497,7 @@ Global: units: nondim value: $OCN_GRID == "tx0.25v1": 0.15 - $OCN_GRID == "tx2_3v2": 1.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0 MEKE_FRCOEFF: description: | "[nondim] default = -1.0 @@ -2497,7 +2506,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.3 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.3 MEKE_CT: description: | "[nondim] default = 50.0 @@ -2506,7 +2515,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.0 MEKE_POSITIVE: description: | "[Boolean] default = False @@ -2514,7 +2523,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True USE_SIMPLER_EADY_GROWTH_RATE: description: | "[Boolean] default = False @@ -2523,7 +2532,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True KH_RES_SCALE_COEF: description: | "[nondim] default = 1.0 @@ -2532,7 +2541,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.9 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.9 KH_RES_FN_POWER: description: | "[nondim] default = 2 @@ -2542,7 +2551,7 @@ Global: datatype: integer units: nondim value: - $OCN_GRID == "tx2_3v2": 6 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 6 VISC_RES_SCALE_COEF: description: | "[nondim] default = 1.0 @@ -2552,7 +2561,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.4 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.4 MEKE_GEOMETRIC: description: | "[Boolean] default = False @@ -2561,7 +2570,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True MEKE_GEOMETRIC_ALPHA: description: | "[nondim] default = 0.05 @@ -2570,7 +2579,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.06 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.06 MEKE_KHTH_FAC: description: | "[nondim] default = 0.0 @@ -2578,7 +2587,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 1.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0 MEKE_KHTR_FAC: description: | "[nondim] default = 0.0 @@ -2586,7 +2595,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 1.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0 MEKE_CB: description: | "[nondim] default = 25.0 @@ -2595,7 +2604,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 100.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 100.0 MEKE_CDRAG: description: | "[nondim] default = 0.003 @@ -2604,7 +2613,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.0025 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.0025 MEKE_MIN_GAMMA2: description: | "[nondim] default = 1.0E-04 @@ -2612,7 +2621,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 1.0E-05 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0E-05 MEKE_EQUILIBRIUM_ALT: description: | "[Boolean] default = False @@ -2621,7 +2630,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True MEKE_VISC_DRAG: description: | "[Boolean] default = True @@ -2629,7 +2638,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False MEKE_EQUILIBRIUM_RESTORING: description: | "[Boolean] default = False @@ -2638,7 +2647,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False MEKE_RESTORING_TIMESCALE: description: | "[s] default = 1.0E+06 @@ -2646,7 +2655,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 1.0E+07 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0E+07 MEKE_ADVECTION_FACTOR: description: | "[nondim] default = 0.0 @@ -2656,7 +2665,7 @@ Global: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 1.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0 DIAG_COORD_DEF_Z: description: | "default = WOA09 @@ -2702,7 +2711,7 @@ Global: datatype: string value: $OCN_GRID == "tx0.25v1": "list" - $OCN_GRID == "tx2_3v2": "list" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "list" CHANNEL_LIST_FILE: description: | "default = MOM_channel_list @@ -2711,6 +2720,7 @@ Global: value: $OCN_GRID == "tx0.25v1": "MOM_channels_global_025" $OCN_GRID == "tx2_3v2": "channels_tx2_3v2_250107.txt" + $OCN_GRID == "tx2_3v3": "channels_tx2_3v3_260304.txt" SMAG_BI_CONST: description: | "[nondim] default = 0.0 @@ -2775,7 +2785,7 @@ Global: datatype: real units: PPT value: - $OCN_GRID == "tx2_3v2" or $COMP_ATM == "cam": 75.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] or $COMP_ATM == "cam": 75.0 BAD_VAL_SST_MAX: description: | "[deg C] default = 45.0, PTripp: changed from 55.0 on 12/28/2017 @@ -2793,7 +2803,7 @@ Global: datatype: real units: degC value: - $OCN_GRID == "tx2_3v2": -3.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: -3.0 $OCN_GRID == "tx0.25v1": -3.0 DEFAULT_ANSWER_DATE: description: | @@ -2841,7 +2851,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True $OCN_GRID == "tx0.25v1": True else: False PARALLEL_RESTARTFILES: @@ -3141,7 +3151,7 @@ Global: datatype: logical units: Boolean value: - $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID == "tx2_3v2": True + $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True ISOMIP_TNUDG: description: | "default = 0.0 (days) @@ -3289,7 +3299,7 @@ Global: datatype: real units: m2 s-1 value: - $OCN_GRID == "tx2_3v2": 1.0E-06 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0E-06 else: 1.0E-04 KV_BBL_MIN: description: | @@ -3629,7 +3639,7 @@ Global: datatype: real units: W m-2 or various value: - $OCN_GRID == "tx2_3v2": 1.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0 $OCN_GRID == "tx0.25v1": 1.0 GEOTHERMAL_FILE: description: | @@ -3639,6 +3649,7 @@ Global: datatype: string value: $OCN_GRID == "tx2_3v2": "geothermal_davies2013_tx2_3_20240318_cdf5.nc" + $OCN_GRID == "tx2_3v3": "geothermal_davies2013_tx2_3v3_260305.nc" $OCN_GRID == "tx0.25v1": "geothermal_davies2013_v1.nc" GEOTHERMAL_VARNAME: description: | @@ -3647,7 +3658,7 @@ Global: GEOTHERMAL_FILE." datatype: string value: - $OCN_GRID == "tx2_3v2": "geothermal_hf" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "geothermal_hf" $OCN_GRID == "tx0.25v1": "geothermal_hf" MIX_BOUNDARY_TRACER_ALE: description: | @@ -3735,7 +3746,7 @@ Global: Turn on automatic mask table generation to eliminate land blocks datatype: list value: - $OCN_GRID in ["tx2_3v2", "tx0.25v1"]: True + $OCN_GRID in ["tx2_3v2", "tx2_3v3", "tx0.25v1"]: True TARGET_IO_PES: description: | When AUTO_MASKTABLE is enabled, target number of IO PEs. If the given target @@ -3743,7 +3754,7 @@ Global: nearest smaller number of PEs that is achievable. datatype: integer value: - $OCN_GRID == "tx2_3v2" and $TEST: = - ( - $NTASKS_OCN // 256) + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST: = - ( - $NTASKS_OCN // 256) $OCN_GRID == "tx0.25v1": = - ( - $NTASKS_OCN // 128) GEOM_FILE: description: | @@ -3778,7 +3789,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True SKEB_USE_FRICT: description: | "default = False @@ -3786,7 +3797,7 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True SKEB_USE_GM: description: | "default = False @@ -3794,21 +3805,21 @@ Global: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True SKEB_NPASS: description: | "[nondim] default = 0 number of passes of a 9-point smoother of the dissipation estimate." datatype: integer value: - $OCN_GRID == "tx2_3v2": 8 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 8 SKEB_GM_COEF: description: | "[nondim] default = 0.0 Fraction of GM work that is added to backscatter rate." datatype: real value: - $OCN_GRID == "tx2_3v2": 0.75 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.75 CVMix_CONVECTION: BV_SQR_CONV: description: | @@ -3818,7 +3829,7 @@ CVMix_CONVECTION: datatype: real units: 1/s^2 value: - $OCN_GRID == "tx2_3v2": -1.0E-08 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: -1.0E-08 KPP: N_SMOOTH: description: | @@ -3827,7 +3838,7 @@ KPP: OBL depth purely for diagnostic purposes." datatype: integer value: - $OCN_GRID == "tx2_3v2": 3 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 3 MATCH_TECHNIQUE: description: | "default = 'SimpleShapes' @@ -3839,14 +3850,14 @@ KPP: ParabolicNonLocal = sigma*(1-sigma)^2 for diffusivity; (1-sigma)^2 for NLT" datatype: string value: - $OCN_GRID == "tx2_3v2": "MatchGradient" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "MatchGradient" INTERP_TYPE2: description: | "Type of interpolation to compute diff and visc at OBL_depth Allowed types are: linear, quadratic, cubic or LMD94." datatype: string value: - $OCN_GRID == "tx2_3v2": "LMD94" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "LMD94" KPP_IS_ADDITIVE: description: | "[Boolean] default = True @@ -3855,7 +3866,7 @@ KPP: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False USE_KPP_LT_K: description: | default = False @@ -3900,14 +3911,14 @@ KPP: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 1.8 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.8 ENHANCE_DIFFUSION: description: | "default = True If True, adds enhanced diffusion at the based of the boundary layer." datatype: logical value: - $OCN_GRID == "tx2_3v2": False + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: False STOKES_MOST: description: | "default = False @@ -3922,7 +3933,7 @@ KPP: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True MINIMUM_OBL_DEPTH: description: | "[m] default = 0.0 @@ -3930,7 +3941,7 @@ KPP: parameter, the OBL depth is always at least as deep as the first layer." datatype: real value: - $OCN_GRID == "tx2_3v2": 5.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 5.0 MLE: USE_BODNER23: @@ -3941,7 +3952,7 @@ MLE: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True CR: description: | "[nondim] default = 0.0 @@ -3949,7 +3960,7 @@ MLE: datatype: real units: nondim value: - $OCN_GRID == "tx2_3v2": 0.01 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 0.01 USE_CR_GRID: description: | "[Boolean] default = False @@ -3957,13 +3968,14 @@ MLE: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True CR_FILE: description: | "The path to the file containing the Cr fields." datatype: string value: $OCN_GRID == "tx2_3v2": "mle-cr-mask_20250627.nc" + $OCN_GRID == "tx2_3v3": "mle_cr_labsea_mask_tx2_3v3_260306.nc" WAVE_ENHANCED_USTAR: description: | "default = False @@ -3971,7 +3983,7 @@ MLE: datatype: logical units: Boolean value: - $OCN_GRID == "tx2_3v2": True + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: True MIN_WSTAR2: description: | "[m2 s-2] default = 1.0E-24 @@ -3983,7 +3995,7 @@ MLE: datatype: real units: m2 s-2 value: - $OCN_GRID == "tx2_3v2": 1.0E-09 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 1.0E-09 BLD_DECAYING_TFILTER: description: | "default = 0.0 @@ -3993,7 +4005,7 @@ MLE: datatype: real units: s value: - $OCN_GRID == "tx2_3v2": 8.64E+04 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 8.64E+04 BLD_GROWING_TFILTER: description: | "[s] default = 0.0 @@ -4003,7 +4015,7 @@ MLE: datatype: real units: s value: - $OCN_GRID == "tx2_3v2": 300.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 300.0 MLD_GROWING_TFILTER: description: | "[s] default = 0.0 @@ -4013,7 +4025,7 @@ MLE: datatype: real units: s value: - $OCN_GRID == "tx2_3v2": 3600.0 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 3600.0 MLD_DECAYING_TFILTER: description: | "[s] default = 0.0 @@ -4023,5 +4035,5 @@ MLE: datatype: real units: s value: - $OCN_GRID == "tx2_3v2": 2.592E+06 + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: 2.592E+06 ... diff --git a/param_templates/diag_table.yaml b/param_templates/diag_table.yaml index 575229e..5c9f742 100644 --- a/param_templates/diag_table.yaml +++ b/param_templates/diag_table.yaml @@ -259,9 +259,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "20.1 20.1 -69.8 -34.6 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "20.1 20.1 -69.8 -34.6 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_u ] @@ -275,9 +275,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-5.75 19.0 78.93 78.93 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-5.75 19.0 78.93 78.93 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] @@ -291,9 +291,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-174.5 -172.3 66.6 66.6 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-174.5 -172.3 66.6 66.6 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] @@ -307,9 +307,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "28.3 29.0 42.9 42.9 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "28.3 29.0 42.9 42.9 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] @@ -323,9 +323,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-53.1 -46.2 69.5 69.5 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-53.1 -46.2 69.5 69.5 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] @@ -339,9 +339,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-38.0 -22.5 65.0 65.0 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-38.0 -22.5 65.0 65.0 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] @@ -355,9 +355,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-67.0 -67.0 -67.2 -55.1 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-67.0 -67.0 -67.2 -55.1 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_u ] @@ -371,9 +371,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-0.333 -0.333 51.1 51.7 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-0.333 -0.333 51.1 51.7 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_u ] @@ -387,9 +387,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-21.0 -10.4 80.5 80.5 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-21.0 -10.4 80.5 80.5 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] @@ -403,7 +403,7 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-80.26 -78.24 25.5 25.5 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-80.26 -78.24 25.5 25.5 -1 -1" fields: $OCN_GRID = "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space @@ -419,9 +419,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-78.0 -72.0 24.5 24.5 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-78.0 -72.0 24.5 24.5 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] @@ -435,9 +435,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-80.75 -80.75 23.0 25.5 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-80.75 -80.75 23.0 25.5 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_u ] @@ -451,9 +451,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-6.3 -6.3 35.7 36.4 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-6.3 -6.3 35.7 36.4 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_u ] @@ -467,7 +467,7 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-17.0 1.5 65.0 65.0 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-17.0 1.5 65.0 65.0 -1 -1" fields: $OCN_GRID in = "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space @@ -483,9 +483,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-246.5 -220.8 -7.0 -7.0 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-246.5 -220.8 -7.0 -7.0 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] @@ -499,9 +499,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "39.9 44.7 -16.25 -16.25 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "39.9 44.7 -16.25 -16.25 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] @@ -515,7 +515,7 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-155.0 -155.0 -2.0 2.0 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-155.0 -155.0 -2.0 2.0 -1 -1" fields: $OCN_GRID "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space @@ -531,9 +531,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-34.8 -34.8 83.07 83.70 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-34.8 -34.8 83.07 83.70 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_u ] @@ -547,9 +547,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-239.0 -239.0 18.5 22.45 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-239.0 -239.0 18.5 22.45 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_u ] @@ -563,9 +563,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-74.35 -73.0 19.92 19.92 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-74.35 -73.0 19.92 19.92 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] @@ -579,9 +579,9 @@ Files: new_file_freq_units: "months" reduction_method: ".true." # time average regional_section: - $OCN_GRID == "tx2_3v2": "-87.0 -85.0 21.785 21.785 -1 -1" + $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: "-87.0 -85.0 21.785 21.785 -1 -1" fields: - $OCN_GRID == "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True: + $OCN_GRID in ["tx2_3v2", "tx2_3v3"] and $TEST == False and $OCN_DIAG_SECTIONS == True: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: [ *vert_sections_v ] diff --git a/param_templates/input_data_list.yaml b/param_templates/input_data_list.yaml index c5f4221..e6ebf63 100644 --- a/param_templates/input_data_list.yaml +++ b/param_templates/input_data_list.yaml @@ -3,6 +3,7 @@ mom.input_data_list: GRID_FILE: $OCN_GRID == "tx2_3v2": "${INPUTDIR}/ocean_hgrid_221123.nc" + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/ocean_hgrid_250930.nc" $OCN_GRID == "tx0.25v1": "${INPUTDIR}/ocean_hgrid.nc" ALE_COORDINATE_CONFIG: $MOM6_VERTICAL_GRID == "zstar_75L": "${INPUTDIR}/zstar_75layer_2.5m_248.4m-2024-03-29.nc" @@ -20,32 +21,39 @@ mom.input_data_list: $OCN_GRID == "tx0.25v1": "${INPUTDIR}/layer_coord.nc" TOPO_FILE: $OCN_GRID == "tx2_3v2": "${INPUTDIR}/ocean_topo_tx2_3v2_240501.nc" + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/ocean_topo_tx2_3v3_260305.nc" $OCN_GRID == "tx0.25v1": "${INPUTDIR}/ocean_topog.nc" TOPO_EDITS_FILE: $OCN_GRID == "tx2_3v2": "${INPUTDIR}/topo_edits_tx2_3v2_250107.nc" $OCN_GRID == "tx0.25v1": "${INPUTDIR}/All_edits.nc" TEMP_SALT_Z_INIT_FILE: - $OCN_GRID in ["tx2_3v2", "tx0.25v1"]: + $OCN_GRID in ["tx2_3v2", "tx2_3v3", "tx0.25v1"]: $INIT_LAYERS_FROM_Z_FILE == "True": "${INPUTDIR}/${TEMP_SALT_Z_INIT_FILE}" SURFACE_PRESSURE_FILE: $OCN_GRID == "MISOMIP": "${INPUTDIR}/MISOMIP_181108.nc" SALT_RESTORE_FILE: $OCN_GRID == "tx2_3v2": "${INPUTDIR}/state_restore_tx2_3_20230416.nc" + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/state_restore_tx2_3v3_260305.nc" TIDAL_ENERGY_FILE: $OCN_GRID == "tx2_3v2": "${INPUTDIR}/energy_new_tx2_3_conserve_230415_cdf5.nc" + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/tidal_energy_tx2_3v3_conserve_260306.nc" $OCN_GRID == "tx0.25v1": "${INPUTDIR}/tidal_amplitude.v20140616.nc" CHANNEL_LIST_FILE: $OCN_GRID == "tx2_3v2": "${INPUTDIR}/channels_tx2_3v2_250107.txt" + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/channels_tx2_3v3_260304.txt" $OCN_GRID == "tx0.25v1": "${INPUTDIR}/MOM_channels_global_025" GEOTHERMAL_FILE: $OCN_GRID == "tx2_3v2": "${INPUTDIR}/geothermal_davies2013_tx2_3_20240318_cdf5.nc" + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/geothermal_davies2013_tx2_3v3_260305.nc" $OCN_GRID == "tx0.25v1": "${INPUTDIR}/geothermal_davies2013_v1.nc" CHL_FILE: $OCN_GRID == "tx0.25v1": "${INPUTDIR}/seawifs-clim-1997-2010.1440x1080.v20180328.nc" $OCN_GRID == "tx2_3v2": "${INPUTDIR}/seawifs-clim-1997-2010-tx2_3v2.230416.nc" + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/seawifs-clim-1997-2010-tx2_3v3_260305.nc" CR_FILE: $OCN_GRID == "tx2_3v2": "${INPUTDIR}/mle-cr-mask_20250627.nc" + $OCN_GRID == "tx2_3v3": "${INPUTDIR}/mle_cr_labsea_mask_tx2_3v3_260306.nc" CFC_BC_FILE: "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/cfc_atm_20230310.nc" DIAG_COORD_DEF_RHO2: $OCN_GRID == "tx2_3v2": "${INPUTDIR}/ocean_rho2_190917.nc" diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 4958db0..ee6d98e 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -10,7 +10,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true, "else": false } @@ -29,7 +29,7 @@ "description": "\"The total number of thickness grid points in the\nx-direction in the physical domain. With STATIC_MEMORY_\nthis is set in MOM_memory.h at compile time.\"\n", "datatype": "integer", "value": { - "$OCN_GRID == \"tx2_3v2\"": 540, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 540, "$OCN_GRID == \"tx0.25v1\"": 1440, "$OCN_GRID == \"MISOMIP\"": 402 } @@ -38,7 +38,7 @@ "description": "\"The total number of thickness grid points in the\ny-direction in the physical domain. With STATIC_MEMORY_\nthis is set in MOM_memory.h at compile time.\nThe number of processors in the x-direction. With\nSTATIC_MEMORY_ this is set in MOM_memory.h at compile time.\nThe number of processors in the x-direction. With\nSTATIC_MEMORY_ this is set in MOM_memory.h at compile time.\nThe processor layout that was acutally used.\"\n", "datatype": "integer", "value": { - "$OCN_GRID == \"tx2_3v2\"": 480, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 480, "$OCN_GRID == \"tx0.25v1\"": 1080, "$OCN_GRID == \"MISOMIP\"": 40 } @@ -58,7 +58,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false } }, "HREF_FOR_MLD": { @@ -66,7 +66,7 @@ "datatype": "real", "units": "m", "value": { - "$OCN_GRID == \"tx2_3v2\"": 10.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 10.0 } }, "USE_REGRIDDING": { @@ -80,7 +80,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -89,7 +89,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -99,7 +99,7 @@ "units": "s", "value": { "$OCN_GRID == \"tx0.25v1\"": 900.0, - "$OCN_GRID == \"tx2_3v2\"": 1800, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1800, "$OCN_GRID == \"MISOMIP\"": 600.0 } }, @@ -117,7 +117,7 @@ "datatype": "real", "units": "m", "value": { - "$OCN_GRID == \"tx2_3v2\"": 10.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 10.0, "$OCN_GRID == \"tx0.25v1\"": 20.0 } }, @@ -126,7 +126,7 @@ "datatype": "real", "units": "s", "value": { - "$OCN_GRID == \"tx2_3v2\"": 7200.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 7200.0, "$OCN_GRID == \"tx0.25v1\"": 3600.0, "else": 0.0 } @@ -157,7 +157,7 @@ "datatype": "real", "units": "J kg-1 K-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 3992.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 3992.0, "$OCN_GRID == \"tx0.25v1\"": 3992.0, "$OCN_GRID == \"MISOMIP\"": 3974.0 } @@ -173,7 +173,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -188,7 +188,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false, "$OCN_GRID == \"tx0.25v1\"": false } }, @@ -205,7 +205,7 @@ "datatype": "real", "units": "deg C Pa-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": -7.75e-08, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": -7.75e-08, "$OCN_GRID == \"tx0.25v1\"": -7.75e-08, "$OCN_GRID == \"MISOMIP\"": -7.53e-08 } @@ -215,7 +215,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -417,6 +417,7 @@ "datatype": "string", "value": { "$OCN_GRID == \"tx2_3v2\"": "ocean_hgrid_221123.nc", + "$OCN_GRID == \"tx2_3v3\"": "ocean_hgrid_250930.nc", "$OCN_GRID == \"tx0.25v1\"": "ocean_hgrid.nc" } }, @@ -425,7 +426,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false, "$OCN_GRID == \"tx0.25v1\"": false } }, @@ -448,6 +449,7 @@ "datatype": "string", "value": { "$OCN_GRID == \"tx2_3v2\"": "ocean_topo_tx2_3v2_240501.nc", + "$OCN_GRID == \"tx2_3v3\"": "ocean_topo_tx2_3v3_260305.nc", "$OCN_GRID == \"tx0.25v1\"": "ocean_topog.nc" } }, @@ -464,7 +466,7 @@ "datatype": "real", "units": "m", "value": { - "$OCN_GRID == \"tx2_3v2\"": 6000.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 6000.0, "$OCN_GRID == \"tx0.25v1\"": 6500.0, "$OCN_GRID == \"MISOMIP\"": 720.0 } @@ -474,7 +476,7 @@ "datatype": "real", "units": "m", "value": { - "$OCN_GRID == \"tx2_3v2\"": 9.5, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 9.5, "$OCN_GRID == \"tx0.25v1\"": 9.5 } }, @@ -483,7 +485,7 @@ "datatype": "real", "units": "m", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.0, "$OCN_GRID == \"tx0.25v1\"": 0.0 } }, @@ -497,7 +499,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "REMAPPING_USE_OM4_SUBCELLS": { @@ -505,7 +507,7 @@ "datatype": "bool", "units": "none", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false } }, "INIT_LAYERS_FROM_Z_FILE": { @@ -513,7 +515,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$RUN_TYPE != \"hybrid\" and $OCN_GRID in [\"tx2_3v2\", \"tx0.25v1\"]": true, + "$RUN_TYPE != \"hybrid\" and $OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\", \"tx0.25v1\"]": true, "else": false } }, @@ -521,7 +523,7 @@ "description": "\"default = 'temp_salt_z.nc'\nThe name of the z-space input file used to initialize\nthe layer thicknesses, temperatures and salinities.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "woa18_04_initial_conditions.nc", + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "woa18_04_initial_conditions.nc", "$OCN_GRID == \"tx0.25v1\"": "MOM6_IC_TS.nc" } }, @@ -529,7 +531,7 @@ "description": "\"default = 'ptemp'\nThe name of the potential temperature variable in\nTEMP_SALT_Z_INIT_FILE.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "theta0", + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "theta0", "$OCN_GRID == \"tx0.25v1\"": "temp" } }, @@ -537,7 +539,7 @@ "description": "\"default = 'salt'\nThe name of the salinity variable in\nTEMP_SALT_Z_INIT_FILE.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "s_an" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "s_an" } }, "Z_INIT_REMAP_OLD_ALG": { @@ -551,7 +553,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$MOM6_VERTICAL_GRID == \"hycom1\" and $OCN_GRID in [\"tx2_3v2\"]": true + "$MOM6_VERTICAL_GRID == \"hycom1\" and $OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "USE_VARIABLE_MIXING": { @@ -559,7 +561,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -568,7 +570,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -577,7 +579,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.01 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.01 } }, "DEPTH_SCALED_KHTH": { @@ -585,7 +587,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": false } }, @@ -594,7 +596,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 500.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 500.0 } }, "KHTR_SLOPE_CFF": { @@ -610,7 +612,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "RESOLN_SCALED_KHTH": { @@ -618,7 +620,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -627,7 +629,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "USE_GM_WORK_BUG": { @@ -641,7 +643,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -650,7 +652,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false } }, "ETA_TOLERANCE": { @@ -675,7 +677,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "NDIFF_INTERIOR_ONLY": { @@ -683,7 +685,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "NDIFF_TAPERING": { @@ -691,7 +693,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "USE_HORIZONTAL_BOUNDARY_DIFFUSION": { @@ -699,7 +701,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "HBD_LINEAR_TRANSITION": { @@ -707,7 +709,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "SIMPLE_TKE_TO_KD": { @@ -715,7 +717,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -751,6 +753,7 @@ "datatype": "string", "value": { "$MOM6_VERTICAL_GRID == \"hycom1\" and $OCN_GRID in [\"tx2_3v2\"]": "'\"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v2/lev-2025-09-12.nc,Z\"'\n", + "$MOM6_VERTICAL_GRID == \"hycom1\" and $OCN_GRID in [\"tx2_3v3\"]": "'\"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v3/lev-2025-09-12.nc,Z\"'\n", "$MOM6_VERTICAL_GRID == \"hycom1\" and $OCN_GRID == \"tx0.25v1\"": "\"FNC1:5,8000.0,1.0,.01\"" } }, @@ -759,6 +762,7 @@ "datatype": "string", "value": { "$MOM6_VERTICAL_GRID == \"hycom1\" and $OCN_GRID in [\"tx2_3v2\"]": "'\"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v2/dz_max-2025-09-12.nc,dz\"'\n", + "$MOM6_VERTICAL_GRID == \"hycom1\" and $OCN_GRID in [\"tx2_3v3\"]": "'\"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v3/dz_max-2025-09-12.nc,dz\"'\n", "else": "\"FNC1:400,31000.0,0.1,.01\"" } }, @@ -785,7 +789,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "LAPLACIAN": { @@ -799,7 +803,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "SMAG_LAP_CONST": { @@ -807,7 +811,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.15 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.15 } }, "KH": { @@ -825,7 +829,7 @@ "value": { "$OCN_GRID == \"MISOMIP\"": 0.0, "$OCN_GRID == \"tx0.25v1\"": 0.0, - "$OCN_GRID == \"tx2_3v2\"": 0.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.0, "else": 0.01 } }, @@ -834,7 +838,7 @@ "datatype": "real", "units": "m2 s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.0 } }, "BIHARMONIC": { @@ -842,7 +846,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"MISOMIP\"": false } }, @@ -851,7 +855,7 @@ "datatype": "real", "units": "m4 s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1000000000000.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1000000000000.0 } }, "AH_VEL_SCALE": { @@ -868,7 +872,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "LEITH_AH": { @@ -876,7 +880,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false } }, "LEITH_BI_CONST": { @@ -884,7 +888,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 75.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 75.0 } }, "LEITHY_CK": { @@ -892,7 +896,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.0 } }, "USE_LAND_MASK_FOR_HVISC": { @@ -936,7 +940,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1.0, "$OCN_GRID == \"tx0.25v1\"": 1.25 } }, @@ -964,7 +968,7 @@ "datatype": "real", "units": "s", "value": { - "$OCN_GRID == \"tx2_3v2\"": 7200.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 7200.0 } }, "Z_INIT_ALE_REMAPPING": { @@ -972,7 +976,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -980,7 +984,7 @@ "description": "\" The number of diagnostic vertical coordinates to use.\nFor each coordinate, an entry in DIAG_COORDS must be provided.\"\n", "datatype": "integer", "value": { - "$OCN_GRID == \"tx2_3v2\"": 2, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 2, "$OCN_GRID == \"tx0.25v1\"": 1 } }, @@ -988,7 +992,7 @@ "description": "\"A list of string tuples associating diag_table modules to\na coordinate definition used for diagnostics. Each string\nis of the form MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "\"z Z ZSTAR\", \"rho2 RHO2 RHO\"", + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "\"z Z ZSTAR\", \"rho2 RHO2 RHO\"", "$OCN_GRID == \"tx0.25v1\"": "\"z Z ZSTAR\"" } }, @@ -1017,7 +1021,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -1026,7 +1030,7 @@ "datatype": "real", "units": "m s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.1, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.1, "$OCN_GRID == \"tx0.25v1\"": 0.1 } }, @@ -1056,7 +1060,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -1096,7 +1100,7 @@ "datatype": "real", "units": "m", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1.0 } }, "MAX_P_SURF": { @@ -1112,7 +1116,7 @@ "datatype": "real", "units": "m2 s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.0, "$OCN_GRID == \"MISOMIP\"": 0.0 } }, @@ -1121,7 +1125,7 @@ "datatype": "real", "units": "m2 s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 50.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 50.0 } }, "FULL_DEPTH_KHTH_MIN": { @@ -1129,7 +1133,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "KHTH_MAX_CFL": { @@ -1145,7 +1149,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "STANLEY_COEFF": { @@ -1153,7 +1157,7 @@ "datatype": "real", "units": "nondimensional", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.5 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.5 } }, "USE_KH_IN_MEKE": { @@ -1161,7 +1165,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "KHTH_USE_FGNV_STREAMFUNCTION": { @@ -1169,7 +1173,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "FGNV_C_MIN": { @@ -1177,7 +1181,7 @@ "datatype": "real", "units": "m s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.01 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.01 } }, "USE_STANLEY_GM": { @@ -1185,7 +1189,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false } }, "MIXEDLAYER_RESTRAT": { @@ -1202,7 +1206,7 @@ "datatype": "bool", "units": "none", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "MLE_DENSITY_DIFF": { @@ -1210,7 +1214,7 @@ "datatype": "real", "units": "kg/m3", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.02 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.02 } }, "FOX_KEMPER_ML_RESTRAT_COEF": { @@ -1218,7 +1222,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1.0, "$OCN_GRID == \"tx0.25v1\"": 1.0 } }, @@ -1227,7 +1231,7 @@ "datatype": "real", "units": "m", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1000.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1000.0, "$OCN_GRID == \"tx0.25v1\"": 500.0 } }, @@ -1236,7 +1240,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false } }, "MLE_MLD_DECAY_TIME": { @@ -1244,7 +1248,7 @@ "datatype": "real", "units": "s", "value": { - "$OCN_GRID == \"tx2_3v2\"": 345600.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 345600.0, "$OCN_GRID == \"tx0.25v1\"": 2592000.0 } }, @@ -1253,7 +1257,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "USE_CVMix_CONVECTION": { @@ -1261,7 +1265,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "BBL_MIXING_AS_MAX": { @@ -1269,7 +1273,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false, "$OCN_GRID == \"tx0.25v1\"": false } }, @@ -1278,7 +1282,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -1287,7 +1291,7 @@ "datatype": "real", "units": "m2 s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.1, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.1, "$OCN_GRID == \"tx0.25v1\"": 0.1 } }, @@ -1296,7 +1300,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -1305,7 +1309,7 @@ "datatype": "real", "units": "m2 s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1e-07, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1e-07, "$OCN_GRID == \"tx0.25v1\"": 1.5e-05, "$OCN_GRID == \"MISOMIP\"": 5e-05, "else": 2e-05 @@ -1332,7 +1336,7 @@ "datatype": "real", "units": "m2 s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1e-07, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1e-07, "else": 2e-06 } }, @@ -1395,7 +1399,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "USE_CVMix_TIDAL": { @@ -1403,7 +1407,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "INT_TIDE_DISSIPATION": { @@ -1411,7 +1415,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -1426,14 +1430,15 @@ "description": "\"The path to the file containing tidal energy\ndissipation. Used with CVMix tidal mixing schemes.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "energy_new_tx2_3_conserve_230415_cdf5.nc" + "$OCN_GRID == \"tx2_3v2\"": "energy_new_tx2_3_conserve_230415_cdf5.nc", + "$OCN_GRID == \"tx2_3v3\"": "tidal_energy_tx2_3v3_conserve_260306.nc" } }, "TIDAL_ENERGY_TYPE": { "description": "\"The type of input tidal energy flux dataset. Valid values are Jayne\nER03\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "Jayne" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "Jayne" } }, "USE_LMD94": { @@ -1441,7 +1446,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "NU_ZERO": { @@ -1449,7 +1454,7 @@ "datatype": "real", "units": "m2 s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.0025 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.0025 } }, "RI_ZERO": { @@ -1457,7 +1462,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.5 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.5 } }, "N_SMOOTH_RI": { @@ -1465,7 +1470,7 @@ "datatype": "integer", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1 } }, "USE_CVMIX_DDIFF": { @@ -1473,7 +1478,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "MAX_ENT_IT": { @@ -1489,7 +1494,7 @@ "datatype": "real", "units": "m", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1e-05, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1e-05, "$OCN_GRID == \"MISOMIP\"": 1e-08 } }, @@ -1508,7 +1513,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "MSTAR_MODE": { @@ -1685,7 +1690,7 @@ "units": "Boolean", "value": { "$OCN_GRID == \"tx0.25v1\"": true, - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "CHL_FILE": { @@ -1693,7 +1698,8 @@ "datatype": "string", "value": { "$OCN_GRID == \"tx0.25v1\"": "seawifs-clim-1997-2010.1440x1080.v20180328.nc", - "$OCN_GRID == \"tx2_3v2\"": "seawifs-clim-1997-2010-tx2_3v2.230416.nc" + "$OCN_GRID == \"tx2_3v2\"": "seawifs-clim-1997-2010-tx2_3v2.230416.nc", + "$OCN_GRID == \"tx2_3v3\"": "seawifs-clim-1997-2010-tx2_3v3_260305.nc" } }, "CHL_VARNAME": { @@ -1708,21 +1714,21 @@ "datatype": "integer", "value": { "$OCN_GRID == \"tx0.25v1\"": 3, - "$OCN_GRID == \"tx2_3v2\"": 2 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 2 } }, "OPACITY_SCHEME": { "description": "\"default = 'MANIZZA_05'\nThis character string specifies how chlorophyll concentrations are translated\ninto opacities. Currently valid options include:\n MANIZZA_05 - Use Manizza et al., GRL, 2005.\n MOREL_88 - Use Morel, JGR, 1988.\n OHLMANN_03 - Use Ohlmann, J Clim, 2003.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "OHLMANN_03" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "OHLMANN_03" } }, "TRACER_ADVECTION_SCHEME": { "description": "\"default = 'PLM'\nThe horizontal transport scheme for tracers:\nPLM - Piecewise Linear Method\nPPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "\"PPM:H3\"", + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "\"PPM:H3\"", "$OCN_GRID == \"tx0.25v1\"": "\"PPM:H3\"" } }, @@ -1731,7 +1737,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "KHTR": { @@ -1747,7 +1753,7 @@ "datatype": "real", "units": "m2 s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 50.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 50.0 } }, "FULL_DEPTH_KHTR_MIN": { @@ -1755,7 +1761,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "DEBUG": { @@ -1769,7 +1775,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true } }, @@ -1778,7 +1784,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 2.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 2.0 } }, "MAXTRUNC": { @@ -1794,7 +1800,7 @@ "description": "\"default = 'C'\nA case-insensitive character string to indicate the\nstaggering of the surface velocity field that is\nreturned to the coupler. Valid values include\n'A', 'B', or 'C'.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "A", + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "A", "$OCN_GRID == \"tx0.25v1\"": "A" } }, @@ -1803,7 +1809,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\" and $COMP_ATM == \"datm\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $COMP_ATM == \"datm\"": true, "else": false } }, @@ -1823,14 +1829,15 @@ "datatype": "real", "units": "m day-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.1667 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.1667 } }, "SALT_RESTORE_FILE": { "description": "\"default = 'salt_restore.nc'\nA file in which to find the surface salinity to use for restoring.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "state_restore_tx2_3_20230416.nc" + "$OCN_GRID == \"tx2_3v2\"": "state_restore_tx2_3_20230416.nc", + "$OCN_GRID == \"tx2_3v3\"": "state_restore_tx2_3v3_260305.nc" } }, "ADJUST_NET_FRESH_WATER_TO_ZERO": { @@ -1847,7 +1854,7 @@ "datatype": "real", "units": "PSU or g kg-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 5.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 5.0 } }, "SRESTORE_AS_SFLUX": { @@ -1855,7 +1862,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "GUST_CONST": { @@ -1892,7 +1899,7 @@ "datatype": "real", "units": "days", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1.0, "$OCN_GRID == \"tx0.25v1\"": 0.25, "$OCN_GRID == \"MISOMIP\"": 1.0 } @@ -1912,7 +1919,7 @@ "units": "Boolean", "value": { "$OCN_GRID == \"tx0.25v1\"": true, - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "MEKE_GMCOEFF": { @@ -1921,7 +1928,7 @@ "units": "nondim", "value": { "$OCN_GRID == \"tx0.25v1\"": 1.0, - "$OCN_GRID == \"tx2_3v2\"": 0.25 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.25 } }, "MEKE_BGSRC": { @@ -1938,7 +1945,7 @@ "units": "nondim", "value": { "$OCN_GRID == \"tx0.25v1\"": 1.0, - "$OCN_GRID == \"tx2_3v2\"": 0.75 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.75 } }, "MEKE_VISCOSITY_COEFF_KU": { @@ -1946,7 +1953,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.0 } }, "MEKE_MIN_LSCALE": { @@ -1954,7 +1961,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "MEKE_ALPHA_RHINES": { @@ -1971,7 +1978,7 @@ "units": "nondim", "value": { "$OCN_GRID == \"tx0.25v1\"": 0.15, - "$OCN_GRID == \"tx2_3v2\"": 1.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1.0 } }, "MEKE_FRCOEFF": { @@ -1979,7 +1986,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.3 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.3 } }, "MEKE_CT": { @@ -1987,7 +1994,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.0 } }, "MEKE_POSITIVE": { @@ -1995,7 +2002,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "USE_SIMPLER_EADY_GROWTH_RATE": { @@ -2003,7 +2010,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "KH_RES_SCALE_COEF": { @@ -2011,7 +2018,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.9 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.9 } }, "KH_RES_FN_POWER": { @@ -2019,7 +2026,7 @@ "datatype": "integer", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 6 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 6 } }, "VISC_RES_SCALE_COEF": { @@ -2027,7 +2034,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.4 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.4 } }, "MEKE_GEOMETRIC": { @@ -2035,7 +2042,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "MEKE_GEOMETRIC_ALPHA": { @@ -2043,7 +2050,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.06 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.06 } }, "MEKE_KHTH_FAC": { @@ -2051,7 +2058,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1.0 } }, "MEKE_KHTR_FAC": { @@ -2059,7 +2066,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1.0 } }, "MEKE_CB": { @@ -2067,7 +2074,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 100.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 100.0 } }, "MEKE_CDRAG": { @@ -2075,7 +2082,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.0025 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.0025 } }, "MEKE_MIN_GAMMA2": { @@ -2083,7 +2090,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1e-05 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1e-05 } }, "MEKE_EQUILIBRIUM_ALT": { @@ -2091,7 +2098,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "MEKE_VISC_DRAG": { @@ -2099,7 +2106,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false } }, "MEKE_EQUILIBRIUM_RESTORING": { @@ -2107,7 +2114,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false } }, "MEKE_RESTORING_TIMESCALE": { @@ -2115,7 +2122,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 10000000.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 10000000.0 } }, "MEKE_ADVECTION_FACTOR": { @@ -2123,7 +2130,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1.0 } }, "DIAG_COORD_DEF_Z": { @@ -2146,7 +2153,7 @@ "datatype": "string", "value": { "$OCN_GRID == \"tx0.25v1\"": "list", - "$OCN_GRID == \"tx2_3v2\"": "list" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "list" } }, "CHANNEL_LIST_FILE": { @@ -2154,7 +2161,8 @@ "datatype": "string", "value": { "$OCN_GRID == \"tx0.25v1\"": "MOM_channels_global_025", - "$OCN_GRID == \"tx2_3v2\"": "channels_tx2_3v2_250107.txt" + "$OCN_GRID == \"tx2_3v2\"": "channels_tx2_3v2_250107.txt", + "$OCN_GRID == \"tx2_3v3\"": "channels_tx2_3v3_260304.txt" } }, "SMAG_BI_CONST": { @@ -2208,7 +2216,7 @@ "datatype": "real", "units": "PPT", "value": { - "$OCN_GRID == \"tx2_3v2\" or $COMP_ATM == \"cam\"": 75.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] or $COMP_ATM == \"cam\"": 75.0 } }, "BAD_VAL_SST_MAX": { @@ -2224,7 +2232,7 @@ "datatype": "real", "units": "degC", "value": { - "$OCN_GRID == \"tx2_3v2\"": -3.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": -3.0, "$OCN_GRID == \"tx0.25v1\"": -3.0 } }, @@ -2263,7 +2271,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true, "$OCN_GRID == \"tx0.25v1\"": true, "else": false } @@ -2512,7 +2520,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$MOM6_VERTICAL_GRID == \"hycom1\" and $OCN_GRID == \"tx2_3v2\"": true + "$MOM6_VERTICAL_GRID == \"hycom1\" and $OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "ISOMIP_TNUDG": { @@ -2642,7 +2650,7 @@ "datatype": "real", "units": "m2 s-1", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1e-06, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1e-06, "else": 0.0001 } }, @@ -2946,7 +2954,7 @@ "datatype": "real", "units": "W m-2 or various", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1.0, + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1.0, "$OCN_GRID == \"tx0.25v1\"": 1.0 } }, @@ -2955,6 +2963,7 @@ "datatype": "string", "value": { "$OCN_GRID == \"tx2_3v2\"": "geothermal_davies2013_tx2_3_20240318_cdf5.nc", + "$OCN_GRID == \"tx2_3v3\"": "geothermal_davies2013_tx2_3v3_260305.nc", "$OCN_GRID == \"tx0.25v1\"": "geothermal_davies2013_v1.nc" } }, @@ -2962,7 +2971,7 @@ "description": "\"default = 'geo_heat'\nThe name of the geothermal heating variable in\nGEOTHERMAL_FILE.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "geothermal_hf", + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "geothermal_hf", "$OCN_GRID == \"tx0.25v1\"": "geothermal_hf" } }, @@ -3041,14 +3050,14 @@ "description": "Turn on automatic mask table generation to eliminate land blocks\n", "datatype": "list", "value": { - "$OCN_GRID in [\"tx2_3v2\", \"tx0.25v1\"]": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\", \"tx0.25v1\"]": true } }, "TARGET_IO_PES": { "description": "When AUTO_MASKTABLE is enabled, target number of IO PEs. If the given target\nnumber of IO PEs is not achievable, the target number of IO PEs is set to the\nnearest smaller number of PEs that is achievable.\n", "datatype": "integer", "value": { - "$OCN_GRID == \"tx2_3v2\" and $TEST": "= - ( - $NTASKS_OCN // 256)", + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST": "= - ( - $NTASKS_OCN // 256)", "$OCN_GRID == \"tx0.25v1\"": "= - ( - $NTASKS_OCN // 128)" } }, @@ -3072,7 +3081,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "SKEB_USE_FRICT": { @@ -3080,7 +3089,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "SKEB_USE_GM": { @@ -3088,21 +3097,21 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "SKEB_NPASS": { "description": "\"[nondim] default = 0\n number of passes of a 9-point smoother of the dissipation estimate.\"\n", "datatype": "integer", "value": { - "$OCN_GRID == \"tx2_3v2\"": 8 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 8 } }, "SKEB_GM_COEF": { "description": "\"[nondim] default = 0.0\nFraction of GM work that is added to backscatter rate.\"\n", "datatype": "real", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.75 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.75 } } }, @@ -3112,7 +3121,7 @@ "datatype": "real", "units": "1/s^2", "value": { - "$OCN_GRID == \"tx2_3v2\"": -1e-08 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": -1e-08 } } }, @@ -3121,21 +3130,21 @@ "description": "\"default = 0\nThe number of times the 1-1-4-1-1 Laplacian filter is applied on\nOBL depth purely for diagnostic purposes.\"\n", "datatype": "integer", "value": { - "$OCN_GRID == \"tx2_3v2\"": 3 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 3 } }, "MATCH_TECHNIQUE": { "description": "\"default = 'SimpleShapes'\nCVMix method to set profile function for diffusivity and NLT,\nas well as matching across OBL base. Allowed values are:\nSimpleShapes = sigma*(1-sigma)^2 for both diffusivity and NLT\nMatchGradient = sigma*(1-sigma)^2 for NLT; diffusivity profile from matching\nMatchBoth = match gradient for both diffusivity and NLT\nParabolicNonLocal = sigma*(1-sigma)^2 for diffusivity; (1-sigma)^2 for NLT\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "MatchGradient" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "MatchGradient" } }, "INTERP_TYPE2": { "description": "\"Type of interpolation to compute diff and visc at OBL_depth\nAllowed types are: linear, quadratic, cubic or LMD94.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "LMD94" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "LMD94" } }, "KPP_IS_ADDITIVE": { @@ -3143,7 +3152,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false } }, "USE_KPP_LT_K": { @@ -3181,14 +3190,14 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1.8 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1.8 } }, "ENHANCE_DIFFUSION": { "description": "\"default = True\nIf True, adds enhanced diffusion at the based of the boundary layer.\"\n", "datatype": "logical", "value": { - "$OCN_GRID == \"tx2_3v2\"": false + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": false } }, "STOKES_MOST": { @@ -3203,14 +3212,14 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "MINIMUM_OBL_DEPTH": { "description": "\"[m] default = 0.0\nIf non-zero, a minimum depth to use for KPP OBL depth. Independent of this\nparameter, the OBL depth is always at least as deep as the first layer.\"\n", "datatype": "real", "value": { - "$OCN_GRID == \"tx2_3v2\"": 5.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 5.0 } } }, @@ -3220,7 +3229,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "CR": { @@ -3228,7 +3237,7 @@ "datatype": "real", "units": "nondim", "value": { - "$OCN_GRID == \"tx2_3v2\"": 0.01 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 0.01 } }, "USE_CR_GRID": { @@ -3236,14 +3245,15 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "CR_FILE": { "description": "\"The path to the file containing the Cr fields.\"\n", "datatype": "string", "value": { - "$OCN_GRID == \"tx2_3v2\"": "mle-cr-mask_20250627.nc" + "$OCN_GRID == \"tx2_3v2\"": "mle-cr-mask_20250627.nc", + "$OCN_GRID == \"tx2_3v3\"": "mle_cr_labsea_mask_tx2_3v3_260306.nc" } }, "WAVE_ENHANCED_USTAR": { @@ -3251,7 +3261,7 @@ "datatype": "logical", "units": "Boolean", "value": { - "$OCN_GRID == \"tx2_3v2\"": true + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": true } }, "MIN_WSTAR2": { @@ -3259,7 +3269,7 @@ "datatype": "real", "units": "m2 s-2", "value": { - "$OCN_GRID == \"tx2_3v2\"": 1e-09 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 1e-09 } }, "BLD_DECAYING_TFILTER": { @@ -3267,7 +3277,7 @@ "datatype": "real", "units": "s", "value": { - "$OCN_GRID == \"tx2_3v2\"": 86400.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 86400.0 } }, "BLD_GROWING_TFILTER": { @@ -3275,7 +3285,7 @@ "datatype": "real", "units": "s", "value": { - "$OCN_GRID == \"tx2_3v2\"": 300.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 300.0 } }, "MLD_GROWING_TFILTER": { @@ -3283,7 +3293,7 @@ "datatype": "real", "units": "s", "value": { - "$OCN_GRID == \"tx2_3v2\"": 3600.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 3600.0 } }, "MLD_DECAYING_TFILTER": { @@ -3291,7 +3301,7 @@ "datatype": "real", "units": "s", "value": { - "$OCN_GRID == \"tx2_3v2\"": 2592000.0 + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": 2592000.0 } } } diff --git a/param_templates/json/diag_table.json b/param_templates/json/diag_table.json index 7fccf8f..37864c0 100644 --- a/param_templates/json/diag_table.json +++ b/param_templates/json/diag_table.json @@ -716,10 +716,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "20.1 20.1 -69.8 -34.6 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "20.1 20.1 -69.8 -34.6 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -743,10 +743,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-5.75 19.0 78.93 78.93 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-5.75 19.0 78.93 78.93 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -770,10 +770,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-174.5 -172.3 66.6 66.6 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-174.5 -172.3 66.6 66.6 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -797,10 +797,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "28.3 29.0 42.9 42.9 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "28.3 29.0 42.9 42.9 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -824,10 +824,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-53.1 -46.2 69.5 69.5 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-53.1 -46.2 69.5 69.5 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -851,10 +851,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-38.0 -22.5 65.0 65.0 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-38.0 -22.5 65.0 65.0 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -878,10 +878,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-67.0 -67.0 -67.2 -55.1 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-67.0 -67.0 -67.2 -55.1 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -905,10 +905,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-0.333 -0.333 51.1 51.7 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-0.333 -0.333 51.1 51.7 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -932,10 +932,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-21.0 -10.4 80.5 80.5 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-21.0 -10.4 80.5 80.5 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -959,7 +959,7 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-80.26 -78.24 25.5 25.5 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-80.26 -78.24 25.5 25.5 -1 -1" }, "fields": { "$OCN_GRID = \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { @@ -986,10 +986,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-78.0 -72.0 24.5 24.5 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-78.0 -72.0 24.5 24.5 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -1013,10 +1013,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-80.75 -80.75 23.0 25.5 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-80.75 -80.75 23.0 25.5 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -1040,10 +1040,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-6.3 -6.3 35.7 36.4 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-6.3 -6.3 35.7 36.4 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -1067,7 +1067,7 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-17.0 1.5 65.0 65.0 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-17.0 1.5 65.0 65.0 -1 -1" }, "fields": { "$OCN_GRID in = \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { @@ -1094,10 +1094,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-246.5 -220.8 -7.0 -7.0 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-246.5 -220.8 -7.0 -7.0 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -1121,10 +1121,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "39.9 44.7 -16.25 -16.25 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "39.9 44.7 -16.25 -16.25 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -1148,7 +1148,7 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-155.0 -155.0 -2.0 2.0 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-155.0 -155.0 -2.0 2.0 -1 -1" }, "fields": { "$OCN_GRID \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { @@ -1175,10 +1175,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-34.8 -34.8 83.07 83.70 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-34.8 -34.8 83.07 83.70 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -1202,10 +1202,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-239.0 -239.0 18.5 22.45 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-239.0 -239.0 18.5 22.45 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -1229,10 +1229,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-74.35 -73.0 19.92 19.92 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-74.35 -73.0 19.92 19.92 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ @@ -1256,10 +1256,10 @@ "new_file_freq_units": "months", "reduction_method": ".true.", "regional_section": { - "$OCN_GRID == \"tx2_3v2\"": "-87.0 -85.0 21.785 21.785 -1 -1" + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"]": "-87.0 -85.0 21.785 21.785 -1 -1" }, "fields": { - "$OCN_GRID == \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\"] and $TEST == False and $OCN_DIAG_SECTIONS == True": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", "lists": [ diff --git a/param_templates/json/input_data_list.json b/param_templates/json/input_data_list.json index 85970ee..505e668 100644 --- a/param_templates/json/input_data_list.json +++ b/param_templates/json/input_data_list.json @@ -2,6 +2,7 @@ "mom.input_data_list": { "GRID_FILE": { "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/ocean_hgrid_221123.nc", + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/ocean_hgrid_250930.nc", "$OCN_GRID == \"tx0.25v1\"": "${INPUTDIR}/ocean_hgrid.nc" }, "ALE_COORDINATE_CONFIG": { @@ -25,6 +26,7 @@ }, "TOPO_FILE": { "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/ocean_topo_tx2_3v2_240501.nc", + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/ocean_topo_tx2_3v3_260305.nc", "$OCN_GRID == \"tx0.25v1\"": "${INPUTDIR}/ocean_topog.nc" }, "TOPO_EDITS_FILE": { @@ -32,7 +34,7 @@ "$OCN_GRID == \"tx0.25v1\"": "${INPUTDIR}/All_edits.nc" }, "TEMP_SALT_Z_INIT_FILE": { - "$OCN_GRID in [\"tx2_3v2\", \"tx0.25v1\"]": { + "$OCN_GRID in [\"tx2_3v2\", \"tx2_3v3\", \"tx0.25v1\"]": { "$INIT_LAYERS_FROM_Z_FILE == \"True\"": "${INPUTDIR}/${TEMP_SALT_Z_INIT_FILE}" } }, @@ -40,26 +42,32 @@ "$OCN_GRID == \"MISOMIP\"": "${INPUTDIR}/MISOMIP_181108.nc" }, "SALT_RESTORE_FILE": { - "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/state_restore_tx2_3_20230416.nc" + "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/state_restore_tx2_3_20230416.nc", + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/state_restore_tx2_3v3_260305.nc" }, "TIDAL_ENERGY_FILE": { "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/energy_new_tx2_3_conserve_230415_cdf5.nc", + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/tidal_energy_tx2_3v3_conserve_260306.nc", "$OCN_GRID == \"tx0.25v1\"": "${INPUTDIR}/tidal_amplitude.v20140616.nc" }, "CHANNEL_LIST_FILE": { "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/channels_tx2_3v2_250107.txt", + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/channels_tx2_3v3_260304.txt", "$OCN_GRID == \"tx0.25v1\"": "${INPUTDIR}/MOM_channels_global_025" }, "GEOTHERMAL_FILE": { "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/geothermal_davies2013_tx2_3_20240318_cdf5.nc", + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/geothermal_davies2013_tx2_3v3_260305.nc", "$OCN_GRID == \"tx0.25v1\"": "${INPUTDIR}/geothermal_davies2013_v1.nc" }, "CHL_FILE": { "$OCN_GRID == \"tx0.25v1\"": "${INPUTDIR}/seawifs-clim-1997-2010.1440x1080.v20180328.nc", - "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/seawifs-clim-1997-2010-tx2_3v2.230416.nc" + "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/seawifs-clim-1997-2010-tx2_3v2.230416.nc", + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/seawifs-clim-1997-2010-tx2_3v3_260305.nc" }, "CR_FILE": { - "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/mle-cr-mask_20250627.nc" + "$OCN_GRID == \"tx2_3v2\"": "${INPUTDIR}/mle-cr-mask_20250627.nc", + "$OCN_GRID == \"tx2_3v3\"": "${INPUTDIR}/mle_cr_labsea_mask_tx2_3v3_260306.nc" }, "CFC_BC_FILE": "${DIN_LOC_ROOT}/ocn/mom/grid_indpt/cfc_atm_20230310.nc", "DIAG_COORD_DEF_RHO2": {