Merge pull request #4714 from ESMCI/st_archive_fix

St archive fix

CIME/SystemTests/eri.py

@@ -1,6 +1,7 @@
 """
 CIME ERI test  This class inherits from SystemTestsCommon
 """
+
 from CIME.XML.standard_module_setup import *
 from CIME.utils import safe_copy
 from CIME.SystemTests.system_tests_common import SystemTestsCommon
@@ -34,8 +35,8 @@ def _helper(dout_sr, refdate, refsec, rundir):
             os.mkdir(rundir)
         elif os.path.exists(dst):
             os.remove(dst)
-
-        os.symlink(item, dst)
+        if not "rpointer" in item:
+            os.symlink(item, dst)
 
     for item in glob.glob("{}/*rpointer*".format(rest_path)):
         safe_copy(item, rundir)

CIME/case/case_st_archive.py

@@ -172,19 +172,12 @@ def _archive_rpointer_files(
         rpointers = glob.glob(
             os.path.join(rundir, "rpointer.*" + _datetime_str(datename))
         )
-        # If timestamped rpointers exist use them
-        if rpointers:
-            for rpointer in rpointers:
-                safe_copy(
-                    rpointer, os.path.join(archive_restdir, os.path.basename(rpointer))
-                )
-        else:
-            # Copy of all rpointer files for latest restart date
-            rpointers = glob.glob(os.path.join(rundir, "rpointer.*"))
-            for rpointer in rpointers:
-                safe_copy(
-                    rpointer, os.path.join(archive_restdir, os.path.basename(rpointer))
-                )
+        # Copy of all rpointer files for latest restart date
+        rpointers = glob.glob(os.path.join(rundir, "rpointer.*"))
+        for rpointer in rpointers:
+            safe_copy(
+                rpointer, os.path.join(archive_restdir, os.path.basename(rpointer))
+            )
     else:
         # Generate rpointer file(s) for interim restarts for the one datename and each
         # possible value of ninst_strings