Handle same file error

.git-blame-ignore-revs

@@ -53,3 +53,4 @@ aa04d1f7d86cc2503b98b7e2b2d84dbfff6c316b
 753fda3ff0147837231a73c9c728dd9ce47b5997
 f112ba0bbf96a61d5a4d354dc0dcbd8b0c68145c
 bd535c710db78420b8e8b9d71d88d8339e899c59
+4b20bbd7003e6f77dab4e3268cc4a43f9b5a3b5d

cime_config/SystemTests/ssp.py

@@ -81,7 +81,7 @@ def run_phase(self):
         )
         refsec = "00000"
 
-        # obtain rpointer files and necessary restart files from short term archiving directory
+        # obtain necessary restart files from short term archiving directory
         rundir = self._case.get_value("RUNDIR")
 
         rest_path = os.path.join(dout_sr, "rest", "{}-{}".format(refdate, refsec))
@@ -96,9 +96,6 @@ def run_phase(self):
             else:
                 os.symlink(item, link_name)
 
-        for item in glob.glob("{}/*rpointer*".format(rest_path)):
-            shutil.copy(item, rundir)
-
         self._case.set_value("CLM_ACCELERATED_SPINUP", "off")
         self._case.set_value("RUN_TYPE", "hybrid")
         self._case.set_value("GET_REFCASE", False)

cime_config/SystemTests/sspmatrixcn.py

@@ -13,6 +13,7 @@
 Step 4: matrix Spinup off
 """
 import shutil, glob, os, sys
+from datetime import datetime
 
 if __name__ == "__main__":
     CIMEROOT = os.environ.get("CIMEROOT")
@@ -225,6 +226,7 @@ def run_phase(self):
                 self.append_user_nl(clone_path, n)
 
             dout_sr = clone.get_value("DOUT_S_ROOT")
+            ninst = self._case.get_value("NINST")
 
             self._skip_pnl = False
             #
@@ -247,9 +249,19 @@ def run_phase(self):
                             os.makedirs(rundir)
                         os.symlink(item, linkfile)
 
-                    for item in glob.glob("{}/*rpointer*".format(rest_path)):
-                        shutil.copy(item, rundir)
-
+                    # For a branch the cpl rpointer file needs to be handled
+                    if self.runtyp[n] is "branch":
+
+                        drvrest = "rpointer.cpl"
+                        if ninst > 1:
+                            drvrest += "_0001"
+                        drvrest += rest_time
+
+                        self._set_drv_restart_pointer(drvrest)
+                        try:
+                            shutil.copy(drvrest, rundir)
+                        except shutil.SameFileError:
+                            pass
             #
             # Run the case (Archiving on)
             #
@@ -267,6 +279,7 @@ def run_phase(self):
             )
             refsec = "00000"
             rest_path = os.path.join(dout_sr, "rest", "{}-{}".format(refdate, refsec))
+            rest_time = "." + refdate + "-" + refsec
 
         #
         # Last step in original case
@@ -294,8 +307,19 @@ def run_phase(self):
                 os.remove(linkfile)
             os.symlink(item, linkfile)
 
-        for item in glob.glob("{}/*rpointer*".format(rest_path)):
-            shutil.copy(item, rundir)
+        # For a branch the cpl rpointer file needs to be handled
+        if self.runtyp[n] is "branch":
+
+            drvrest = "rpointer.cpl"
+            if ninst > 1:
+                drvrest += "_0001"
+            drvrest += rest_time
+
+            self._set_drv_restart_pointer(drvrest)
+            try:
+                shutil.copy(os.path.join( rest_path, drvrest), rundir)
+            except shutil.SameFileError:
+                pass
 
         self.append_user_nl(clone_path, n)
         #