[cig-commits] r15888 - cs/pythia/trunk/pyre/schedulers

[leif at geodynamics.org]

Author: leif
Date: 2009-10-27 16:17:35 -0700 (Tue, 27 Oct 2009)
New Revision: 15888

Modified:
   cs/pythia/trunk/pyre/schedulers/SchedulerPBS.py
Log:
Allow users to specify additional resources for the PBS -l option.


Modified: cs/pythia/trunk/pyre/schedulers/SchedulerPBS.py
===================================================================
--- cs/pythia/trunk/pyre/schedulers/SchedulerPBS.py	2009-10-27 23:00:36 UTC (rev 15887)
+++ cs/pythia/trunk/pyre/schedulers/SchedulerPBS.py	2009-10-27 23:17:35 UTC (rev 15888)
@@ -23,9 +23,10 @@
 
     import pyre.inventory as pyre
     
-    command      = pyre.str("command", default="qsub")
-    qsubOptions  = pyre.list("qsub-options")
-    ppn          = pyre.int("ppn", default=1)
+    command       = pyre.str("command", default="qsub")
+    qsubOptions   = pyre.list("qsub-options")
+    resourceList  = pyre.list("resource-list")
+    ppn           = pyre.int("ppn", default=1)
     
     
     def schedule(self, job):
@@ -92,7 +93,7 @@
 
     def buildResourceList(self, job):
 
-        resourceList = []
+        resourceList = self.resourceList
         if self.ppn:
             resourceList.append(
                 "nodes=%d:ppn=%d" % ((job.nodes / self.ppn) + (job.nodes % self.ppn and 1 or 0), self.ppn)