From 84568044d5084e6337361280c5694f5f1ad479f3 Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Fri, 18 Nov 2022 11:27:17 -0700 Subject: [PATCH 1/3] Set KVML and KDML to zero In preparation for merging the latest MOM6 main, this PR sets both KVML and KDML to zero in tx06 and tx025. --- param_templates/MOM_input.yaml | 9 +++++++++ param_templates/json/MOM_input.json | 9 ++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index 509ee03..a812c5b 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -1449,6 +1449,14 @@ Global: $OCN_GRID == "tx0.25v1": 1.5E-05 $OCN_GRID == "MISOMIP": 5.0E-05 else: 2.0E-05 + KDML: + description: | + "[m2 s-1] + If BULKMIXEDLAYER is false, KDML is the elevated diapycnal diffusivity in the + topmost HMIX of fluid. KDML is only used if BULKMIXEDLAYER is false." + datatype: real + units: m2 s-1 + value: 0.0 PRANDTL_BKGND: description: | "[nondim] default = 1.0 @@ -3001,6 +3009,7 @@ Global: units: m2 s-1 value: $OCN_GRID == "MISOMIP": 0.01 + else: 0.0 DYNAMIC_SURFACE_PRESSURE: description: | "[Boolean] default = False diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 5739199..6c5ba03 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -1061,6 +1061,12 @@ "else": 2e-05 } }, + "KDML": { + "description": "\"[m2 s-1]\nIf BULKMIXEDLAYER is false, KDML is the elevated diapycnal diffusivity in the\ntopmost HMIX of fluid. KDML is only used if BULKMIXEDLAYER is false.\"\n", + "datatype": "real", + "units": "m2 s-1", + "value": 0.0 + }, "PRANDTL_BKGND": { "description": "\"[nondim] default = 1.0\nTurbulent Prandtl number used to convert vertical background diffusivities\ninto viscosities.\"\n", "datatype": "real", @@ -2361,7 +2367,8 @@ "datatype": "real", "units": "m2 s-1", "value": { - "$OCN_GRID == \"MISOMIP\"": 0.01 + "$OCN_GRID == \"MISOMIP\"": 0.01, + "else": 0.0 } }, "DYNAMIC_SURFACE_PRESSURE": { From 388f6c0ba68a5aff04223b06ef223e1839afc8dd Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Thu, 8 Dec 2022 15:15:48 -0700 Subject: [PATCH 2/3] Set ENTHALPY_FROM_COUPLER=True in all tests --- param_templates/MOM_input.yaml | 10 ++++++++++ param_templates/json/MOM_input.json | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index 1043e5b..c611f8d 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -2018,6 +2018,16 @@ Global: value: $OCN_GRID == "tx0.66v1" and $COMP_ATM == "datm": True # for C and G compsets on tx0.66v1 else: False + + ENTHALPY_FROM_COUPLER: + description: | + "[Boolean] default = False + If True, the heat (enthalpy) associated with mass entering/leaving + the ocean is provided via coupler." + datatype: logical + units: Boolean + value: True + FLUXCONST: description: | "[m day-1] diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 33b159f..46f9e61 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -1555,6 +1555,12 @@ "else": false } }, + "ENTHALPY_FROM_COUPLER": { + "description": "\"[Boolean] default = False\nIf True, the heat (enthalpy) associated with mass entering/leaving\nthe ocean is provided via coupler.\"\n", + "datatype": "logical", + "units": "Boolean", + "value": true + }, "FLUXCONST": { "description": "\"[m day-1]\nThe constant that relates the restoring surface fluxes\nto the relative surface anomalies (akin to a piston\nvelocity). Note the non-MKS units.\"\n", "datatype": "real", From d339dd6523d0c65538dc5aaacd79a5e8b6168c89 Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Thu, 8 Dec 2022 15:29:22 -0700 Subject: [PATCH 3/3] Delete KVML --- param_templates/MOM_input.yaml | 11 ----------- param_templates/json/MOM_input.json | 9 --------- 2 files changed, 20 deletions(-) diff --git a/param_templates/MOM_input.yaml b/param_templates/MOM_input.yaml index c611f8d..b6df34c 100644 --- a/param_templates/MOM_input.yaml +++ b/param_templates/MOM_input.yaml @@ -3010,17 +3010,6 @@ Global: units: nondim value: $OCN_GRID == "MISOMIP": 1.0 - KVML: - description: | - "[m2 s-1] default = 1.0E-04 - The kinematic viscosity in the mixed layer. A typical - value is ~1e-2 m2 s-1. KVML is not used if - BULKMIXEDLAYER is true. The default is set by KV." - datatype: real - units: m2 s-1 - value: - $OCN_GRID == "MISOMIP": 0.01 - else: 0.0 DYNAMIC_SURFACE_PRESSURE: description: | "[Boolean] default = False diff --git a/param_templates/json/MOM_input.json b/param_templates/json/MOM_input.json index 46f9e61..ae59c2c 100644 --- a/param_templates/json/MOM_input.json +++ b/param_templates/json/MOM_input.json @@ -2368,15 +2368,6 @@ "$OCN_GRID == \"MISOMIP\"": 1.0 } }, - "KVML": { - "description": "\"[m2 s-1] default = 1.0E-04\nThe kinematic viscosity in the mixed layer. A typical\nvalue is ~1e-2 m2 s-1. KVML is not used if\nBULKMIXEDLAYER is true. The default is set by KV.\"\n", - "datatype": "real", - "units": "m2 s-1", - "value": { - "$OCN_GRID == \"MISOMIP\"": 0.01, - "else": 0.0 - } - }, "DYNAMIC_SURFACE_PRESSURE": { "description": "\"[Boolean] default = False\nIf true, add a dynamic pressure due to a viscous ice\nshelf, for instance.\"\n", "datatype": "logical",