diff --git a/cime_config/testdefs/testlist_mom.xml b/cime_config/testdefs/testlist_mom.xml
index 8574fc0..f14d7fe 100644
--- a/cime_config/testdefs/testlist_mom.xml
+++ b/cime_config/testdefs/testlist_mom.xml
@@ -173,6 +173,47 @@
       <option name="wallclock">01:00:00</option>
     </options>
   </test>
+  <!-- temporarily added t233 tests. To be removed when we fully switch from t232 to t233-->
+  <test name="SMS_D_Ld2" grid="T62_t233" compset="G">
+    <machines>
+      <machine name="derecho" compiler="gnu" category="aux_mom"/>
+      <machine name="derecho" compiler="gnu" category="pr_mom"/>
+    </machines>
+    <options>
+      <option name="wallclock">01:00:00</option>
+    </options>
+  </test>
+  <test name="ERS" grid="TL319_t233" compset="GW_JRA">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_mom"/>
+      <machine name="derecho" compiler="intel" category="pr_mom"/>
+      <machine name="derecho" compiler="intel" category="prealpha"/>
+      <machine name="derecho" compiler="intel" category="prebeta"/>
+    </machines>
+    <options>
+      <option name="wallclock">01:30:00</option>
+    </options>
+  </test>
+  <test name="ERI" grid="TL319_t233" compset="G_JRA" testmods="mom/debug">
+    <machines>
+      <machine name="derecho" compiler="intel" category="pr_mom"/>
+      <machine name="derecho" compiler="intel" category="aux_mom"/>
+      <machine name="derecho" compiler="intel" category="prealpha"/>
+    </machines>
+    <options>
+      <option name="wallclock">02:00:00</option>
+    </options>
+  </test>
+  <test name="SMS_Ld2" grid="ne30pg3_t233" compset="B1850C_LTso">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_mom"/>
+      <machine name="derecho" compiler="intel" category="pr_mom"/>
+      <machine name="derecho" compiler="intel" category="prebeta"/>
+    </machines>
+    <options>
+      <option name="wallclock">01:00:00</option>
+    </options>
+  </test>
   <!-- fast_mom: a test suite with coarse grids for fast feedback. -->
   <test name="SMS_D" grid="TL319_t232" compset="G_JRA_RYF" testmods="mom/tx3deg">
     <machines>
diff --git a/param_templates/diag_table.yaml b/param_templates/diag_table.yaml
index a8b258e..252aa2c 100644
--- a/param_templates/diag_table.yaml
+++ b/param_templates/diag_table.yaml
@@ -320,9 +320,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "20.1 20.1 -69.8 -34.6 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_u ]
@@ -342,9 +342,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-5.75 19.0  78.93 78.93 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -364,9 +364,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-174.5 -172.3 66.6 66.6 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -386,9 +386,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "28.3 29.0 42.9 42.9 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -408,9 +408,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-53.1 -46.2 69.5 69.5 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -430,9 +430,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-38.0 -22.5 65.0 65.0 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -452,9 +452,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-67.0 -67.0 -67.2 -55.1 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_u ]
@@ -474,9 +474,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-0.333 -0.333 51.1 51.7 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_u ]
@@ -496,9 +496,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-21.0 -10.4 80.5 80.5 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -518,9 +518,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-80.26 -78.24 25.5 25.5 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-80.26 -78.24 25.5 25.5 -1 -1"
         fields:
-            $OCN_GRID = "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True:
+            $OCN_GRID[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -540,9 +540,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-78.0 -72.0 24.5 24.5 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -562,9 +562,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-80.75 -80.75 23.0 25.5 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_u ]
@@ -584,9 +584,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-6.3 -6.3 35.7 36.4 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_u ]
@@ -606,9 +606,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-17.0 1.5 65.0 65.0 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-17.0 1.5 65.0 65.0 -1 -1"
         fields:
-            $OCN_GRID in = "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True:
+            $OCN_GRID[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -628,9 +628,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-246.5 -220.8 -7.0 -7.0 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -650,9 +650,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "39.9 44.7 -16.25 -16.25 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -672,9 +672,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-155.0 -155.0 -2.0 2.0 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-155.0 -155.0 -2.0 2.0 -1 -1"
         fields:
-            $OCN_GRID "tx2_3v2" and $TEST == False and $OCN_DIAG_SECTIONS == True:
+            $OCN_GRID[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_u ]
@@ -694,9 +694,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-34.8 -34.8 83.07 83.70 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_u ]
@@ -716,9 +716,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-239.0 -239.0 18.5 22.45 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_u ]
@@ -738,9 +738,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-74.35 -73.0 19.92 19.92 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" and $TEST == False and $OCN_DIAG_SECTIONS == True:
                 module:   "ocean_model_z"  # z_space
                 packing: = 1 if $TEST else 2
                 lists:    [ *vert_sections_v ]
@@ -760,9 +760,9 @@ Files:
             else: "months"
         reduction_method: ".true."  # time average
         regional_section:
-            $OCN_GRID == "tx2_3v2": "-87.0 -85.0 21.785 21.785 -1 -1"
+            $OCN_GRID[:6] == "tx2_3v": "-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[:6] == "tx2_3v" 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_nml.yaml b/param_templates/input_nml.yaml
index 36442a2..467ceef 100644
--- a/param_templates/input_nml.yaml
+++ b/param_templates/input_nml.yaml
@@ -36,11 +36,11 @@ diag_manager_nml:
     max_output_fields:
         values:
             $MARBL_CONFIG != "off" and $TEST != True:
-                900
+                1000
             $MARBL_CONFIG != "off" and $TEST == True:
-                1200
+                1300
             else:
-                300
+                400
     max_num_axis_sets:
         values:
             $MARBL_CONFIG != "off": 35
diff --git a/param_templates/json/diag_table.json b/param_templates/json/diag_table.json
index e20caa0..5fd10bf 100644
--- a/param_templates/json/diag_table.json
+++ b/param_templates/json/diag_table.json
@@ -954,10 +954,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "20.1 20.1 -69.8 -34.6 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -990,10 +990,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-5.75 19.0  78.93 78.93 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1026,10 +1026,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-174.5 -172.3 66.6 66.6 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1062,10 +1062,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "28.3 29.0 42.9 42.9 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1098,10 +1098,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-53.1 -46.2 69.5 69.5 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1134,10 +1134,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-38.0 -22.5 65.0 65.0 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1170,10 +1170,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-67.0 -67.0 -67.2 -55.1 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1206,10 +1206,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-0.333 -0.333 51.1 51.7 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1242,10 +1242,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-21.0 -10.4 80.5 80.5 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1278,10 +1278,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-80.26 -78.24 25.5 25.5 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-80.26 -78.24 25.5 25.5 -1 -1"
          },
          "fields": {
-            "$OCN_GRID = \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
+            "$OCN_GRID[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1314,10 +1314,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-78.0 -72.0 24.5 24.5 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1350,10 +1350,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-80.75 -80.75 23.0 25.5 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1386,10 +1386,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-6.3 -6.3 35.7 36.4 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1422,10 +1422,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-17.0 1.5 65.0 65.0 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-17.0 1.5 65.0 65.0 -1 -1"
          },
          "fields": {
-            "$OCN_GRID in = \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
+            "$OCN_GRID[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1458,10 +1458,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-246.5 -220.8 -7.0 -7.0 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1494,10 +1494,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "39.9 44.7 -16.25 -16.25 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1530,10 +1530,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-155.0 -155.0 -2.0 2.0 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-155.0 -155.0 -2.0 2.0 -1 -1"
          },
          "fields": {
-            "$OCN_GRID \"tx2_3v2\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
+            "$OCN_GRID[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1566,10 +1566,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-34.8 -34.8 83.07 83.70 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1602,10 +1602,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-239.0 -239.0 18.5 22.45 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1638,10 +1638,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-74.35 -73.0 19.92 19.92 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" and $TEST == False and $OCN_DIAG_SECTIONS == True": {
                "module": "ocean_model_z",
                "packing": "= 1 if $TEST else 2",
                "lists": [
@@ -1674,10 +1674,10 @@
          },
          "reduction_method": ".true.",
          "regional_section": {
-            "$OCN_GRID == \"tx2_3v2\"": "-87.0 -85.0 21.785 21.785 -1 -1"
+            "$OCN_GRID[:6] == \"tx2_3v\"": "-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[:6] == \"tx2_3v\" 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_nml.json b/param_templates/json/input_nml.json
index 08157cd..6e36b3c 100644
--- a/param_templates/json/input_nml.json
+++ b/param_templates/json/input_nml.json
@@ -42,9 +42,9 @@
       },
       "max_output_fields": {
          "values": {
-            "$MARBL_CONFIG != \"off\" and $TEST != True": 900,
-            "$MARBL_CONFIG != \"off\" and $TEST == True": 1200,
-            "else": 300
+            "$MARBL_CONFIG != \"off\" and $TEST != True": 1000,
+            "$MARBL_CONFIG != \"off\" and $TEST == True": 1300,
+            "else": 400
          }
       },
       "max_num_axis_sets": {