Merge pull request #128 from ESCOMP/new_params_nov2022

Update MOM_input
ESCOMP · Dec 14, 2022 · 5daa936 · 5daa936
2 parents fe4550a + d339dd6
commit 5daa936
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 18 deletions.
diff --git 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
@@ -2010,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]
@@ -2992,16 +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
     DYNAMIC_SURFACE_PRESSURE:
         description: |
             "[Boolean] default = False

diff --git 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",
@@ -1549,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",
@@ -2356,14 +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
-         }
-      },
       "DYNAMIC_SURFACE_PRESSURE": {
          "description": "\"[Boolean] default = False\nIf true, add a dynamic pressure due to a viscous ice\nshelf, for instance.\"\n",
          "datatype": "logical",