rebase and update based on pr review

E3SM-Project · Aug 23, 2016 · fc081a8 · fc081a8
1 parent 8974922
commit fc081a8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/cime_config/config_tests.xml b/cime_config/config_tests.xml
@@ -348,9 +348,12 @@ LII    CLM initial condition interpolation test
   <test NAME="PEA">
     <DESC>single pe bfb test (default length)</DESC>
     <INFO_DBUG>1</INFO_DBUG>
-    <REST_OPTION>never</REST_OPTION>
     <CCSM_TCOST>1</CCSM_TCOST>
     <DOUT_S>FALSE</DOUT_S>
+    <CONTINUE_RUN>FALSE</CONTINUE_RUN>
+    <REST_OPTION>never</REST_OPTION>
+    <HIST_OPTION>$STOP_OPTION</HIST_OPTION>
+    <HIST_N>$STOP_N</HIST_N>
   </test>
 
   <test NAME="PEM">

diff --git a/utils/python/CIME/SystemTests/pea.py b/utils/python/CIME/SystemTests/pea.py
@@ -33,5 +33,6 @@ def _case_one_setup(self):
         pass
     def _case_two_setup(self):
         self._case.set_value("MPILIB","mpi-serial")
-        os.remove("Macros")
+        if os.path.isfile("Macros"):
+            os.remove("Macros")
         case_setup(self._case, reset=True, test_mode=True)
diff --git a/utils/python/CIME/SystemTests/system_tests_compare_two.py b/utils/python/CIME/SystemTests/system_tests_compare_two.py
@@ -21,14 +21,6 @@
     that's needed in both cases. This is called before _case_one_setup or
     _case_two_setup.
 
-(2) _case_one_build
-    This method will be called to build case one when separate_builds is True
-
-(2) _case_two_build
-    This method will be called to build case two when separate_builds is True
-
-
-
 """
 
 from CIME.XML.standard_module_setup import *
@@ -142,18 +134,13 @@ def _common_setup(self):
     # ========================================================================
     # Main public methods
     # ========================================================================
-    def _case_one_build(self, sharedlib_only=False, model_only=False):
-        self.build_indv(sharedlib_only=sharedlib_only, model_only=model_only)
-
-    def _case_two_build(self, sharedlib_only=False, model_only=False):
-        self.build_indv(sharedlib_only=sharedlib_only, model_only=model_only)
 
     def build_phase(self, sharedlib_only=False, model_only=False):
         if self._separate_builds:
             self._activate_case1()
-            self._case_one_build(sharedlib_only, model_only)
+            self.build_indv(sharedlib_only=sharedlib_only, model_only=model_only)
             self._activate_case2()
-            self._case_two_build(sharedlib_only, model_only)
+            self.build_indv(sharedlib_only=sharedlib_only, model_only=model_only)
         else:
             self._activate_case1()
             self.build_indv(sharedlib_only=sharedlib_only, model_only=model_only)