Merge branch 'azamat/tests/superbfb-elm' (PR #5666)

Add initial superBFB tests for ELM and MOSART [BFB]
E3SM-Project · Jul 5, 2023 · 33ce8ce · 33ce8ce
2 parents 88ee186 + a5561df
commit 33ce8ce
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 1 deletion.
diff --git a/cime_config/tests.py b/cime_config/tests.py
@@ -776,8 +776,93 @@
                      "e3sm_superbfb_ice_dbg_thrd", "e3sm_superbfb_ice_opt_thrd"),
     },
 
+    # super-BFB LND
+    "e3sm_superbfb_lnd_opt" : { # opt + pureMPI
+        #"share"   : True,
+        "time"    : "00:30:00",
+        "tests"   : (
+            "ERS_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp1",
+            "PEM_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp1",
+        )
+    },
+
+    "e3sm_superbfb_lnd_dbg" : { # dbg + pureMPI
+        #"share"   : True,
+        "time"    : "01:00:00",
+        "tests"   : (
+            "ERS_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp1",
+            "PEM_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp1",
+        )
+    },
+
+    "e3sm_superbfb_lnd_opt_thrd" : { # opt + threads
+        #"share"   : True,
+        "time"    : "00:30:00",
+        "tests"   : (
+            "PET_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-omp2",
+            "ERS_Lh3.ne30pg2_ne30pg2.IELMTEST.pemod-ompfull",
+        )
+    },
+
+    "e3sm_superbfb_lnd_dbg_thrd" : { # dbg + threads
+        #"share"   : True,
+        "time"    : "01:00:00",
+        "tests"   : (
+            "PET_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-omp2",
+            "ERS_Lh3_D.ne30pg2_ne30pg2.IELMTEST.pemod-ompfull",
+        )
+    },
+
+    "e3sm_superbfb_lnd" : {
+        "inherit" : ("e3sm_superbfb_lnd_dbg", "e3sm_superbfb_lnd_opt",
+                     "e3sm_superbfb_lnd_dbg_thrd", "e3sm_superbfb_lnd_opt_thrd"),
+    },
+
+    # super-BFB ROF
+    "e3sm_superbfb_rof_opt" : { # opt + pureMPI
+        #"share"   : True,
+        "time"    : "00:30:00",
+        "tests"   : (
+            "ERS_Ld3.r05_r05.RMOSGPCC.pemod-omp1",
+            "PEM_Ld3.r05_r05.RMOSGPCC.pemod-omp1",
+        )
+    },
+
+    "e3sm_superbfb_rof_dbg" : { # dbg + pureMPI
+        #"share"   : True,
+        "time"    : "01:00:00",
+        "tests"   : (
+            "ERS_Ld3_D.r05_r05.RMOSGPCC.pemod-omp1",
+            "PEM_Ld3_D.r05_r05.RMOSGPCC.pemod-omp1",
+        )
+    },
+
+    "e3sm_superbfb_rof_opt_thrd" : { # opt + threads
+        #"share"   : True,
+        "time"    : "00:30:00",
+        "tests"   : (
+            "PET_Ld3.r05_r05.RMOSGPCC.pemod-omp2",
+            "ERS_Ld3.r05_r05.RMOSGPCC.pemod-ompfull",
+        )
+    },
+
+    "e3sm_superbfb_rof_dbg_thrd" : { # dbg + threads
+        #"share"   : True,
+        "time"    : "01:00:00",
+        "tests"   : (
+            "PET_Ld3_D.r05_r05.RMOSGPCC.pemod-omp2",
+            "ERS_Ld3_D.r05_r05.RMOSGPCC.pemod-ompfull",
+        )
+    },
+
+    "e3sm_superbfb_rof" : {
+        "inherit" : ("e3sm_superbfb_rof_dbg", "e3sm_superbfb_rof_opt",
+                     "e3sm_superbfb_rof_dbg_thrd", "e3sm_superbfb_rof_opt_thrd"),
+    },
+
     "e3sm_superbfb" : {
-        "inherit" : ("e3sm_superbfb_ocn", "e3sm_superbfb_ice"),
+        "inherit" : ("e3sm_superbfb_ocn", "e3sm_superbfb_ice",
+                     "e3sm_superbfb_lnd", "e3sm_superbfb_rof"),
     },
 }
 
diff --git a/components/elm/cime_config/config_compsets.xml b/components/elm/cime_config/config_compsets.xml
@@ -29,6 +29,11 @@
     <lname>2000_DATM%QIA_ELM%SP_SICE_SOCN_MOSART_SGLC_SWAV</lname>
   </compset>
 
+  <compset>
+    <alias>IELMTEST</alias>
+    <lname>2000_DATM%QIA_ELM%SPBC_SICE_SOCN_SROF_SGLC_SWAV_TEST</lname>
+  </compset>
+
   <compset>
     <alias>IELMBC</alias>
     <lname>2000_DATM%QIA_ELM%SPBC_SICE_SOCN_MOSART_SGLC_SWAV</lname>