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

[tan2 at geodynamics.org]

Author: tan2
Date: 2008-04-16 16:39:51 -0700 (Wed, 16 Apr 2008)
New Revision: 11820

Modified:
   cs/pythia/trunk/pyre/schedulers/SchedulerLSF.py
   cs/pythia/trunk/pyre/schedulers/SchedulerPBS.py
   cs/pythia/trunk/pyre/schedulers/SchedulerSGE.py
Log:
Replaced the script name with a variable. This makes subclassing easier.

Modified: cs/pythia/trunk/pyre/schedulers/SchedulerLSF.py
===================================================================
--- cs/pythia/trunk/pyre/schedulers/SchedulerLSF.py	2008-04-16 15:39:49 UTC (rev 11819)
+++ cs/pythia/trunk/pyre/schedulers/SchedulerLSF.py	2008-04-16 23:39:51 UTC (rev 11820)
@@ -40,7 +40,7 @@
         job.arguments = ' '.join(job.arguments)
         
         # Generate the main LSF batch script.
-        script = self.retrieveTemplate('batch.sh', ['schedulers', 'scripts', 'lsf'])
+        script = self.retrieveTemplate('batch.sh', ['schedulers', 'scripts', self.name])
         script.scheduler = self
         script.job = job
         

Modified: cs/pythia/trunk/pyre/schedulers/SchedulerPBS.py
===================================================================
--- cs/pythia/trunk/pyre/schedulers/SchedulerPBS.py	2008-04-16 15:39:49 UTC (rev 11819)
+++ cs/pythia/trunk/pyre/schedulers/SchedulerPBS.py	2008-04-16 23:39:51 UTC (rev 11820)
@@ -39,7 +39,7 @@
         job.resourceList = self.buildResourceList(job)
         
         # Generate the main PBS batch script.
-        script = self.retrieveTemplate('batch.sh', ['schedulers', 'scripts', 'pbs'])
+        script = self.retrieveTemplate('batch.sh', ['schedulers', 'scripts', self.name])
         script.scheduler = self
         script.job = job
         

Modified: cs/pythia/trunk/pyre/schedulers/SchedulerSGE.py
===================================================================
--- cs/pythia/trunk/pyre/schedulers/SchedulerSGE.py	2008-04-16 15:39:49 UTC (rev 11819)
+++ cs/pythia/trunk/pyre/schedulers/SchedulerSGE.py	2008-04-16 23:39:51 UTC (rev 11820)
@@ -39,7 +39,7 @@
         job.arguments = ' '.join(job.arguments)
         
         # Generate the main SGE batch script.
-        script = self.retrieveTemplate('batch.sh', ['schedulers', 'scripts', 'sge'])
+        script = self.retrieveTemplate('batch.sh', ['schedulers', 'scripts', self.name])
         script.scheduler = self
         script.job = job