Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

*New baselines for tx2_3v2 05/03/2024 #162

Merged
merged 12 commits into from
May 10, 2024
Merged

*New baselines for tx2_3v2 05/03/2024 #162

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7f593b3
Adding option to use zstar_75L
gustavo-marques Apr 29, 2024
ea5c7af
Set KV=KD=0, KD_MIN=2e-07, and PPM_CW for regrid/remap/interp
gustavo-marques May 1, 2024
958c6c5
Add channel list, new topo and more for tx2_3v2
gustavo-marques May 1, 2024
0f76301
Update MEKE settings + RESOLN_SCALED_KHTR = True (tx2_3v2)
gustavo-marques May 1, 2024
4c911ac
Set MEKE_GEOMETRIC_ALPHA = 0.09 for all tx2_3v2 configurations
gustavo-marques May 2, 2024
8eacddb
Update CHANNEL_LIST_FILE for tx2_3v2
gustavo-marques May 3, 2024
8bffcb9
Update INTERPOLATION_SCHEME for tx2_3v2
gustavo-marques May 3, 2024
d710d60
Set INTERPOLATION_SCHEME=PPM_CW for all but MISOMIP
gustavo-marques May 3, 2024
221af09
Define KV for all tested grids
gustavo-marques May 4, 2024
451a0b5
Fix MOM6_VERTICAL_GRID for zstar_75L
gustavo-marques May 5, 2024
20418bd
Add MEKE_POSITIVE option, which is always true for tx2_3v2
gustavo-marques May 9, 2024
6eda98e
Fix the description of MEKE_positive
gustavo-marques May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<entry id="MOM6_VERTICAL_GRID">
<type>char</type>
<valid_values>zstar_65L,hycom1,zstar_60L,sigma_shelf_zstar</valid_values>
<valid_values>zstar_75L,zstar_65L,hycom1,zstar_60L,sigma_shelf_zstar</valid_values>
<default_value>zstar_65L</default_value>
<values>
<value grid="oi%tx0.25v1">hycom1</value>
Expand Down
105 changes: 90 additions & 15 deletions param_templates/MOM_input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Global:
value:
$MOM6_VERTICAL_GRID == "zstar_60L": 60
$MOM6_VERTICAL_GRID == "zstar_65L": 65
$MOM6_VERTICAL_GRID == "hycom1": 75
$MOM6_VERTICAL_GRID == "hycom1" or $MOM6_VERTICAL_GRID == "zstar_75L": 75
$MOM6_VERTICAL_GRID == "sigma_shelf_zstar": 36
USE_LEGACY_DIABATIC_DRIVER:
description: |
Expand Down Expand Up @@ -463,7 +463,7 @@ Global:
value:
$OCN_GRID == "gx1v6": "ocean_topog_230424.nc"
$OCN_GRID == "tx0.66v1": "ocean_topog_200701.nc"
$OCN_GRID == "tx2_3v2": "ocean_topog_230413.nc"
$OCN_GRID == "tx2_3v2": "ocean_topo_tx2_3v2_240501.nc"
$OCN_GRID == "tx0.25v1": "ocean_topog.nc"
MAXIMUM_DEPTH:
description: |
Expand Down Expand Up @@ -516,7 +516,7 @@ Global:
PQM_IH4IH3 (4th-order accurate)
PQM_IH6IH5 (5th-order accurate)"
datatype: string
value: "PPM_H4"
value: "PPM_CW"
INIT_LAYERS_FROM_Z_FILE:
description: |
"[Boolean] default = False
Expand Down Expand Up @@ -666,6 +666,15 @@ Global:
$OCN_GRID == "tx0.66v1": True
$OCN_GRID == "tx2_3v2": True
$OCN_GRID == "tx0.25v1": True
RESOLN_SCALED_KHTR:
description: |
"[Boolean] default = False
If true, the epipycnal tracer diffusivity is scaled away when the first
baroclinic deformation radius is well resolved."
datatype: logical
units: Boolean
value:
$OCN_GRID == "tx2_3v2": True
USE_GM_WORK_BUG:
description: |
"[Boolean] default = True
Expand Down Expand Up @@ -802,7 +811,7 @@ Global:
ADAPTIVE - optimize for smooth neutral density surfaces"
datatype: string
value:
$MOM6_VERTICAL_GRID == "zstar_65L" or $MOM6_VERTICAL_GRID == "zstar_60L": "Z*"
$MOM6_VERTICAL_GRID == "zstar_65L" or $MOM6_VERTICAL_GRID == "zstar_60L" or $MOM6_VERTICAL_GRID == "zstar_75L": "Z*"
$MOM6_VERTICAL_GRID == "hycom1": "HYCOM1"
$MOM6_VERTICAL_GRID == "sigma_shelf_zstar": "SIGMA_SHELF_ZSTAR"
ALE_COORDINATE_CONFIG:
Expand All @@ -824,6 +833,7 @@ Global:
HYBRID:vgrid.nc,sigma2,dz"
datatype: string
value:
$MOM6_VERTICAL_GRID == "zstar_65L": '"FILE:zstar_75layer_2.5m_248.4m-2024-03-29.nc,dz"'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be zstar_75L? zstar_65L is in the next block.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching this, Mike. This has been fixed in the last commit.

$MOM6_VERTICAL_GRID == "zstar_65L": '"FILE:vgrid_65L_20200626.nc,dz"'
$MOM6_VERTICAL_GRID == "zstar_60L": '"FILE:ocean_vgrid.nc,dz"'
$MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID != "tx0.25v1": '"HYBRID:hybrid_75layer_zstar2.50m-2020-11-23.nc,sigma2,dz"'
Expand Down Expand Up @@ -1567,6 +1577,7 @@ Global:
datatype: real
units: m2 s-1
value:
$OCN_GRID == "tx2_3v2": 0.0
$OCN_GRID == "tx0.25v1": 1.5E-05
$OCN_GRID == "MISOMIP": 5.0E-05
else: 2.0E-05
Expand Down Expand Up @@ -1601,7 +1612,7 @@ Global:
value:
$OCN_GRID == "gx1v6": 2.0E-06
$OCN_GRID == "tx0.66v1": 2.0E-06
$OCN_GRID == "tx2_3v2": 2.0E-06
$OCN_GRID == "tx2_3v2": 2.0E-07
$OCN_GRID == "tx0.25v1": 2.0E-06
INT_TIDE_DECAY_SCALE:
description: |
Expand Down Expand Up @@ -2323,7 +2334,7 @@ Global:
$OCN_GRID == "gx1v6": 0.0
$OCN_GRID == "tx0.25v1": 1.0
$OCN_GRID == "tx0.66v1": 0.0
$OCN_GRID == "tx2_3v2": 0.0
$OCN_GRID == "tx2_3v2": 1.0
MEKE_BGSRC:
description: |
"[W kg-1] default = 0.0
Expand All @@ -2341,7 +2352,7 @@ Global:
value:
$OCN_GRID == "tx0.25v1": 1.0
$OCN_GRID == "tx0.66v1": 0.5
$OCN_GRID == "tx2_3v2": 0.5
$OCN_GRID == "tx2_3v2": 0.75
$OCN_GRID == "gx1v6": 0.5
MEKE_VISCOSITY_COEFF_KU:
description: |
Expand All @@ -2353,7 +2364,7 @@ Global:
units: nondim
value:
$OCN_GRID == "tx0.66v1": 0.2
$OCN_GRID == "tx2_3v2": 0.2
$OCN_GRID == "tx2_3v2": 0.0
$OCN_GRID == "gx1v6": 0.2
MEKE_MIN_LSCALE:
description: |
Expand Down Expand Up @@ -2432,7 +2443,16 @@ Global:
units: nondim
value:
$OCN_GRID == "tx0.66v1": -1.0
$OCN_GRID == "tx2_3v2": -1.0
$OCN_GRID == "tx2_3v2": 0.3
USE_SIMPLER_EADY_GROWTH_RATE:
description: |
"[Boolean] default = False
If true, use a simpler method to calculate the Eady growth rate that avoids
division by layer thickness. Recommended."
datatype: logical
units: Boolean
value:
$OCN_GRID == "tx2_3v2": True
KH_RES_SCALE_COEF:
description: |
"[nondim] default = 1.0
Expand All @@ -2442,8 +2462,18 @@ Global:
units: nondim
value:
$OCN_GRID == "tx0.66v1": 0.4
$OCN_GRID == "tx2_3v2": 0.4
$OCN_GRID == "tx2_3v2": 0.9
$OCN_GRID == "gx1v6": 0.4
KH_RES_FN_POWER:
description: |
"[nondim] default = 2
The power of dx/Ld in the Kh resolution function. Any positive integer may be
used, although even integers are more efficient to calculate. Setting this
greater than 100 results in a step-function being used."
datatype: integer
units: nondim
value:
$OCN_GRID == "tx2_3v2": 6
VISC_RES_SCALE_COEF:
description: |
"[nondim] default = 1.0
Expand Down Expand Up @@ -2475,8 +2505,7 @@ Global:
datatype: real
units: nondim
value:
$COMP_ATM == "cam": 0.10
else: 0.07
$OCN_GRID == "tx2_3v2": 0.09
MEKE_KHTH_FAC:
description: |
"[nondim] default = 0.0
Expand All @@ -2497,6 +2526,32 @@ Global:
$OCN_GRID == "tx0.66v1": 1.0
$OCN_GRID == "tx2_3v2": 1.0
$OCN_GRID == "gx1v6": 1.0
MEKE_CB:
description: |
"[nondim] default = 25.0
A coefficient in the expression for the ratio of bottom projected eddy energy
and mean column energy (see Jansen et al. 2015)."
datatype: real
units: nondim
value:
$OCN_GRID == "tx2_3v2": 100.0
MEKE_CDRAG:
description: |
"[nondim] default = 0.003
Drag coefficient relating the magnitude of the velocity field to the bottom
stress in MEKE."
datatype: real
units: nondim
value:
$OCN_GRID == "tx2_3v2": 0.0025
MEKE_MIN_GAMMA2:
description: |
"[nondim] default = 1.0E-04
The minimum allowed value of gamma_b^2."
datatype: real
units: nondim
value:
$OCN_GRID == "tx2_3v2": 1.0E-05
MEKE_EQUILIBRIUM_ALT:
description: |
"[Boolean] default = False
Expand Down Expand Up @@ -2527,7 +2582,7 @@ Global:
units: Boolean
value:
$OCN_GRID == "tx0.66v1": True
$OCN_GRID == "tx2_3v2": True
$OCN_GRID == "tx2_3v2": False
$OCN_GRID == "gx1v6": True
MEKE_RESTORING_TIMESCALE:
description: |
Expand Down Expand Up @@ -2600,7 +2655,7 @@ Global:
$OCN_GRID == "gx1v6": "global_1deg"
$OCN_GRID == "tx0.25v1": "list"
$OCN_GRID == "tx0.66v1": "list"
$OCN_GRID == "tx2_3v2": "none"
$OCN_GRID == "tx2_3v2": "list"
CHANNEL_LIST_FILE:
description: |
"default = MOM_channel_list
Expand All @@ -2609,6 +2664,7 @@ Global:
value:
$OCN_GRID == "tx0.25v1": "MOM_channels_global_025"
$OCN_GRID == "tx0.66v1": "MOM_channels_global_tx06v1"
$OCN_GRID == "tx2_3v2": "MOM_channels_global_tx2_3v2_240501"
SMAG_BI_CONST:
description: |
"[nondim] default = 0.0
Expand Down Expand Up @@ -3034,6 +3090,16 @@ Global:
units: m
value:
$OCN_GRID == "MISOMIP": 1.0E-12
HYCOM1_ONLY_IMPROVES:
description: |
"[Boolean] default = False
When regridding, an interface is only moved if this improves the fit to the
target density."
datatype: logical
units: Boolean
value:
value:
$MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID == "tx2_3v2": True
ISOMIP_TNUDG:
description: |
"default = 0.0 (days)
Expand Down Expand Up @@ -3173,6 +3239,15 @@ Global:
units: m
value:
$OCN_GRID == "MISOMIP": 20.0
KV:
description: |
"[m2 s-1]
kinematic viscosity in the interior. The molecular value, ~1e-6
m2 s-1, may be used."
datatype: real
units: m2 s-1
value:
$OCN_GRID == "tx2_3v2": 0.0
KV_BBL_MIN:
description: |
"[m2 s-1] default = 1.0E-04
Expand Down Expand Up @@ -3483,8 +3558,8 @@ Global:
"TODO"
datatype: string
value:
$MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID != "tx0.25v1": "P1M_H2"
$MOM6_VERTICAL_GRID == "MISOMIP": "PPM_H4"
else: "PPM_CW"
MLE_USE_PBL_MLD:
description: |
"TODO"
Expand Down
Loading