Merge pull request #4890 from ESMCI/jgfouca/cleanup_force_smp

Set FORCE_BUILD_SMP in the python, not in the XML

Author: jgfouca

CIME/SystemTests/erp.py

@@ -41,6 +41,11 @@ def _case_two_setup(self):
                 self._case.set_value("NTASKS_{}".format(comp), int(ntasks / 2))
                 self._case.set_value("ROOTPE_{}".format(comp), int(rootpe / 2))
 
+        if self._case1.get_build_threaded():
+            self._case.set_value(
+                "FORCE_BUILD_SMP", True
+            )  # We want SMP on even if threads==1
+
         RestartTest._case_two_setup(self)
 
     def _case_one_custom_postrun_action(self):

CIME/SystemTests/pet.py

@@ -38,3 +38,7 @@ def _case_two_setup(self):
         # Do a run with all threads set to 1
         for comp in self._case.get_values("COMP_CLASSES"):
             self._case.set_value("NTHRDS_{}".format(comp), 1)
+
+        self._case.set_value(
+            "FORCE_BUILD_SMP", True
+        )  # We want SMP on even if threads==1

CIME/data/config/config_tests.xml

@@ -253,7 +253,6 @@ NODEFAIL          Tests restart upon detected node failure. Generates fake failu
     <STOP_OPTION>ndays</STOP_OPTION>
     <STOP_N>11</STOP_N>
     <DOUT_S>FALSE</DOUT_S>
-    <FORCE_BUILD_SMP>TRUE</FORCE_BUILD_SMP>
     <REST_OPTION>$STOP_OPTION</REST_OPTION>
     <HIST_OPTION>$STOP_OPTION</HIST_OPTION>
     <HIST_N>$STOP_N</HIST_N>
@@ -560,7 +559,6 @@ NODEFAIL          Tests restart upon detected node failure. Generates fake failu
     <DESC>openmp bfb test (seq tests; default length)</DESC>
     <INFO_DBUG>1</INFO_DBUG>
     <BFBFLAG>TRUE</BFBFLAG>
-    <FORCE_BUILD_SMP>TRUE</FORCE_BUILD_SMP>
     <CONTINUE_RUN>FALSE</CONTINUE_RUN>
     <REST_OPTION>none</REST_OPTION>
     <HIST_OPTION>$STOP_OPTION</HIST_OPTION>

CIME/tests/test_sys_cime_case.py

@@ -11,6 +11,7 @@
 from CIME.tests import base
 from CIME.case.case import Case
 from CIME.XML.env_run import EnvRun
+from CIME.utils import find_system_test
 
 try:
     collectionsAbc = collections.abc
@@ -260,6 +261,46 @@ def test_cime_case_build_threaded_2(self):
             build_threaded = case.get_build_threaded()
             self.assertTrue(build_threaded)
 
+    def test_cime_case_build_threaded_3(self):
+        casedir = self._create_test(
+            ["--no-run", "ERP_P1x2.f19_g16.A"],
+            test_id=self._baseline_name,
+        )
+
+        with Case(casedir, read_only=False) as case:
+            build_threaded = case.get_value("BUILD_THREADED")
+            self.assertTrue(build_threaded)
+
+            build_threaded = case.get_build_threaded()
+            self.assertTrue(build_threaded)
+
+            testname = case.get_value("TESTCASE")
+            self.assertTrue(testname is not None)
+
+            test = find_system_test(testname, case)(case)
+            case2 = test._case2
+            self.assertTrue(case2.get_build_threaded())
+
+    def test_cime_case_build_threaded_4(self):
+        casedir = self._create_test(
+            ["--no-run", "ERP_P1x1.f19_g16.A"],
+            test_id=self._baseline_name,
+        )
+
+        with Case(casedir, read_only=False) as case:
+            build_threaded = case.get_value("BUILD_THREADED")
+            self.assertFalse(build_threaded)
+
+            build_threaded = case.get_build_threaded()
+            self.assertFalse(build_threaded)
+
+            testname = case.get_value("TESTCASE")
+            self.assertTrue(testname is not None)
+
+            test = find_system_test(testname, case)(case)
+            case2 = test._case2
+            self.assertFalse(case2.get_build_threaded())
+
     def test_cime_case_mpi_serial(self):
         casedir = self._create_test(
             ["--no-build", "TESTRUNPASS_Mmpi-serial_P10.f19_g16.A"],