get st_archive working on mira

ESMCI · Jul 19, 2016 · 037d253 · 037d253
1 parent acb6008
commit 037d253
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/utils/python/CIME/XML/env_batch.py b/utils/python/CIME/XML/env_batch.py
@@ -432,12 +432,12 @@ def submit_single_job(self, case, job, depid=None, no_batch=False):
             if  string is not None:
                 submitcmd += string + " "
 
-        if case.get_value("MACH") == "mira":
-            if job in ("case.test", "case.run"):
-                if os.path.isfile(".original_host"):
-                    with open(".original_host", "r") as fd:
-                        sshhost = fd.read()
-                        submitcmd = "ssh %s `%s`"%(sshhost, submitcmd)
+#        if case.get_value("MACH") == "mira":
+#            if job in ("case.test", "case.run"):
+#                if os.path.isfile(".original_host"):
+#                    with open(".original_host", "r") as fd:
+#                        sshhost = fd.read()
+#                        submitcmd = "ssh %s `%s`"%(sshhost, submitcmd)
 
 
         logger.info("Submitting job script %s"%submitcmd)

diff --git a/utils/python/CIME/case_st_archive.py b/utils/python/CIME/case_st_archive.py
@@ -373,6 +373,13 @@ def case_st_archive(case):
         append_status("resubmitting from st_archive",
                       caseroot=caseroot, sfile="CaseStatus")
         logger.info("resubmitting from st_archive, resubmit=%d"%resubmit)
-        submit(case, resubmit=True)
+        if case.get_value("MACH") == "mira":
+            expect(os.path.isfile(".original_host"), "ERROR alcf host file not found")
+            with open(".original_host", "r") as fd:
+                sshhost = fd.read()
+            run_cmd("ssh %s `cd %s; CIMEROOT=%s ./case.submit --resubmit' "\
+                        %(sshhost, caseroot, case.get_value("CIMEROOT")))
+        else:
+            submit(case, resubmit=True)
 
     return True
diff --git a/utils/python/CIME/utils.py b/utils/python/CIME/utils.py
@@ -21,8 +21,8 @@ def expect(condition, error_msg, exc_type=SystemExit):
     """
     if (not condition):
         # Uncomment these to bring up a debugger when an expect fails
-        import pdb
-        pdb.set_trace()
+        #import pdb
+        #pdb.set_trace()
         raise exc_type("ERROR: %s" % error_msg)
 
 # Should only be called from get_cime_config()