Changeset 19335 for issm/trunk-jpl/src/m/solve/solve.py

Timestamp:

04/30/15 16:34:55 (10 years ago)

Author:

schlegel

Message:

CHG: need to pass restart to clusters so they have the correct launch command

File:

• issm/trunk-jpl/src/m/solve/solve.py (modified) (2 diffs)

issm/trunk-jpl/src/m/solve/solve.py

@@ -62 +62 @@
 
         #First, build a runtime name that is unique
-        if options.getfieldvalue('runtimename',True):
-                c=datetime.datetime.now()
-                md.private.runtimename="%s-%02i-%02i-%04i-%02i-%02i-%02i-%i" % (md.miscellaneous.name,c.month,c.day,c.year,c.hour,c.minute,c.second,os.getpid())
+        restart=options.getfieldvalue('restart','')
+        if restart == 1:
+                pass #do nothing
         else:
-                md.private.runtimename=md.miscellaneous.name 
-        
-        #If we are restarting, actually use the provided runtime name:
-        restart=options.getfieldvalue('restart','')
-        if restart:
-                md.private.runtimename=restart
-                
+                if restart:
+                        md.private.runtimename=restart
+                else:
+                        if options.getfieldvalue('runtimename',True):
+                                c=datetime.datetime.now()
+                                md.private.runtimename="%s-%02i-%02i-%04i-%02i-%02i-%02i-%i" % (md.miscellaneous.name,c.month,c.day,c.year,c.hour,c.minute,c.second,os.getpid())
+                        else:
+                                md.private.runtimename=md.miscellaneous.name 
+
         #if running qmu analysis, some preprocessing of dakota files using models
         #fields needs to be carried out. 
@@ -102 +104 @@
 
         #Upload all required files: 
+        modelname = md.miscellaneous.name
+        filelist  = [modelname+'.bin ',modelname+'.toolkits ',modelname+'.queue ']
+        if md.qmu.isdakota:
+                filelist.append(modelname+'.qmu.in')
+
         if not restart:
-                modelname = md.miscellaneous.name
-                filelist  = [modelname+'.bin ',modelname+'.toolkits ',modelname+'.queue ']
-                if md.qmu.isdakota:
-                        filelist.append(modelname+'.qmu.in')
                 cluster.UploadQueueJob(md.miscellaneous.name,md.private.runtimename,filelist)
         
         #Launch job
-        cluster.LaunchQueueJob(md.miscellaneous.name,md.private.runtimename,filelist)
+        cluster.LaunchQueueJob(md.miscellaneous.name,md.private.runtimename,filelist,restart)
 
         #wait on lock