Merge branch 'mkstratos/tests/add-mpaso-mvk-test' into next (PR #6207)

Add climate reproducibility test for MPAS Ocean Based on experiments conducted for Mahajan (2021). Because the test is specific to the MPAS-Ocean component, it's placed in the components/mpas-ocean/cime_config/SystemTests directory. This is initialized with a restart file from a 400+ year run with the GMPAS-NYF compset. [BFB] for all current E3SM tests
E3SM-Project · Apr 17, 2024 · b4c805a · b4c805a
2 parents 660b31a + 483f57c
commit b4c805a
Show file tree

Hide file tree

Showing 5 changed files with 463 additions and 0 deletions.
diff --git a/cime_config/config_files.xml b/cime_config/config_files.xml
@@ -98,6 +98,7 @@
     <type>char</type>
     <values>
       <value>$CIMEROOT/CIME/data/config/config_tests.xml</value>
+      <value component="mpaso">$COMP_ROOT_DIR_OCN/cime_config/config_tests.xml</value>
     </values>
     <group>test</group>
     <file>env_test.xml</file>
@@ -321,6 +322,7 @@
     <type>char</type>
     <values>
       <value component="any">$CIMEROOT/CIME/SystemTests</value>
+      <value component="mpaso">$COMP_ROOT_DIR_OCN/cime_config/SystemTests</value>
     </values>
     <group>test</group>
     <file>env_test.xml</file>

diff --git a/cime_config/testmods_dirs/config_pes_tests.xml b/cime_config/testmods_dirs/config_pes_tests.xml
@@ -284,4 +284,34 @@
       </pes>
     </mach>
   </grid>
+  <!-- MPASO -->
+    <grid name="oi%oQU240.*">
+      <mach name="chrysalis">
+        <pes compset="any" pesize="S">
+          <comment>tests+chrysalis: any compset on oQU240 grid, 1x32x2 NODESxMPIxOMP</comment>
+          <MAX_MPITASKS_PER_NODE>32</MAX_MPITASKS_PER_NODE>
+          <MAX_TASKS_PER_NODE>64</MAX_TASKS_PER_NODE>
+          <ntasks>
+            <ntasks_atm>32</ntasks_atm>
+            <ntasks_ice>32</ntasks_ice>
+            <ntasks_cpl>32</ntasks_cpl>
+            <ntasks_lnd>32</ntasks_lnd>
+            <ntasks_rof>32</ntasks_rof>
+            <ntasks_ocn>32</ntasks_ocn>
+            <ntasks_glc>32</ntasks_glc>
+            <ntasks_wav>32</ntasks_wav>
+          </ntasks>
+          <nthrds>
+            <nthrds_atm>2</nthrds_atm>
+            <nthrds_ice>2</nthrds_ice>
+            <nthrds_cpl>2</nthrds_cpl>
+            <nthrds_lnd>2</nthrds_lnd>
+            <nthrds_rof>2</nthrds_rof>
+            <nthrds_ocn>2</nthrds_ocn>
+            <nthrds_glc>2</nthrds_glc>
+            <nthrds_wav>2</nthrds_wav>
+          </nthrds>
+        </pes>
+      </mach>
+    </grid>
 </config_pes>
diff --git a/cime_config/tests.py b/cime_config/tests.py
@@ -226,6 +226,17 @@
             )
         },
 
+    #ocean non bit-for-bit test
+    "e3sm_ocn_nbfb": {
+        "tests": (
+            "MVKO_PS.T62_oQU240.GMPAS-NYF",
+            )
+        },
+
+    "e3sm_nbfb": {
+        "inherit": ("e3sm_atm_nbfb", "e3sm_ocn_nbfb")
+    },
+
     "e3sm_ocnice_stealth_features" : {
         "tests" : (
             "SMS_D_Ld1.T62_oQU240wLI.GMPAS-IAF-PISMF.mpaso-impl_top_drag",