Fixes to SKEB runtime parameters and diag field

param_templates/MOM_input.yaml

@@ -3763,6 +3763,45 @@ Global:
             added to the end of the file name. This parameter is ignored for non-ensemble runs."
         datatype: string
         value: ".mom6"
+    DO_SKEB:
+        description: |
+            "default = False
+            If true, then stochastically perturb the currents using the stochastic kinetic
+            energy backscatter scheme."
+        datatype: logical
+        units: Boolean
+        value:
+            $OCN_GRID == "tx2_3v2": True
+    SKEB_USE_FRICT:
+        description: |
+            "default = False
+            If true, adds horizontal friction dissipation rate to the SKEBS amplitude."
+        datatype: logical
+        units: Boolean
+        value:
+            $OCN_GRID == "tx2_3v2": True
+    SKEB_USE_GM:
+        description: |
+            "default = False
+            If true, adds GM work rate to the SKEBS amplitude."
+        datatype: logical
+        units: Boolean
+        value:
+            $OCN_GRID == "tx2_3v2": 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
+    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
 CVMix_CONVECTION:
     BV_SQR_CONV:
         description: |
@@ -3885,45 +3924,7 @@ KPP:
         datatype: real
         value:
            $OCN_GRID == "tx2_3v2": 5.0
-    DO_SKEB:
-        description: |
-            "default = False
-            If true, then stochastically perturb the currents using the stochastic kinetic
-            energy backscatter scheme."
-        datatype: logical
-        units: Boolean
-        value:
-            $OCN_GRID == "tx2_3v2": True
-    SKEB_USE_FRICT:
-        description: |
-            "default = False
-            If true, adds horizontal friction dissipation rate to the SKEBS amplitude."
-        datatype: logical
-        units: Boolean
-        value:
-            $OCN_GRID == "tx2_3v2": True
-    SKEB_USE_GM:
-        description: |
-            "default = False
-            If true, adds GM work rate to the SKEBS amplitude."
-        datatype: logical
-        units: Boolean
-        value:
-            $OCN_GRID == "tx2_3v2": 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
-    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
+
 MLE:
     USE_BODNER23:
         description: |

param_templates/diag_table.yaml

@@ -26,8 +26,6 @@ FieldLists:
 
     - &kpp_diags        ["KPP_OBLdepth:oml", "KPP_OBLdepth:oml_min:min", "KPP_OBLdepth:oml_max:max"]
 
-    - &stochastic_diags ["skeb_amp"]
-
     - &forcing_flds     ["tauuo", "tauvo", "friver", "prsn", "prlq", "evs", "hfsso", "rlntds",
                          "hfsnthermds", "sfdsi", "rsntds", "hfds", "ustar",
                          "hfsifrazil", "wfo", "vprec", "ficeberg", "fsitherm",
@@ -128,7 +126,6 @@ Files:
                     $OCN_DIAG_MODE not in ["spinup", "none"]:
                         [ *prognostic,
                           *kpp_diags,
-                          *stochastic_diags,
                           *forcing_flds,
                           *enthalpy_flds,
                           *surface_flds_common,

param_templates/json/MOM_input.json

@@ -3059,6 +3059,44 @@
          "description": "\"default = ''\nThe prefix for the restart file appendix (i.e., ensemble id for ensemble\nruns). If this prefix is found in the restart file name, the appendix is added\nright after the first occurrence of the prefix. If not found, the appendix is\nadded to the end of the file name. This parameter is ignored for non-ensemble runs.\"\n",
          "datatype": "string",
          "value": ".mom6"
+      },
+      "DO_SKEB": {
+         "description": "\"default = False\nIf true, then stochastically perturb the currents using the stochastic kinetic\nenergy backscatter scheme.\"\n",
+         "datatype": "logical",
+         "units": "Boolean",
+         "value": {
+            "$OCN_GRID == \"tx2_3v2\"": true
+         }
+      },
+      "SKEB_USE_FRICT": {
+         "description": "\"default = False\nIf true, adds horizontal friction dissipation rate to the SKEBS amplitude.\"\n",
+         "datatype": "logical",
+         "units": "Boolean",
+         "value": {
+            "$OCN_GRID == \"tx2_3v2\"": true
+         }
+      },
+      "SKEB_USE_GM": {
+         "description": "\"default = False\nIf true, adds GM work rate to the SKEBS amplitude.\"\n",
+         "datatype": "logical",
+         "units": "Boolean",
+         "value": {
+            "$OCN_GRID == \"tx2_3v2\"": 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
+         }
+      },
+      "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
+         }
       }
    },
    "CVMix_CONVECTION": {
@@ -3167,44 +3205,6 @@
          "value": {
             "$OCN_GRID == \"tx2_3v2\"": 5.0
          }
-      },
-      "DO_SKEB": {
-         "description": "\"default = False\nIf true, then stochastically perturb the currents using the stochastic kinetic\nenergy backscatter scheme.\"\n",
-         "datatype": "logical",
-         "units": "Boolean",
-         "value": {
-            "$OCN_GRID == \"tx2_3v2\"": true
-         }
-      },
-      "SKEB_USE_FRICT": {
-         "description": "\"default = False\nIf true, adds horizontal friction dissipation rate to the SKEBS amplitude.\"\n",
-         "datatype": "logical",
-         "units": "Boolean",
-         "value": {
-            "$OCN_GRID == \"tx2_3v2\"": true
-         }
-      },
-      "SKEB_USE_GM": {
-         "description": "\"default = False\nIf true, adds GM work rate to the SKEBS amplitude.\"\n",
-         "datatype": "logical",
-         "units": "Boolean",
-         "value": {
-            "$OCN_GRID == \"tx2_3v2\"": 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
-         }
-      },
-      "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
-         }
       }
    },
    "MLE": {

param_templates/json/diag_table.json

@@ -89,9 +89,6 @@
          "KPP_OBLdepth:oml_min:min",
          "KPP_OBLdepth:oml_max:max"
       ],
-      [
-         "skeb_amp"
-      ],
       [
          "tauuo",
          "tauvo",
@@ -357,9 +354,6 @@
                         "KPP_OBLdepth:oml_min:min",
                         "KPP_OBLdepth:oml_max:max"
                      ],
-                     [
-                        "skeb_amp"
-                     ],
                      [
                         "tauuo",
                         "tauvo",