cpu_free was not set correctly due usage of two different keywords for the...

cpu_free was not set correctly due usage of two different keywords for the same: cpu_free and cpu_free_min.

launch.py

@@ -328,7 +328,7 @@ class Scheduler:
 
     def __init__(self, nr_cpus, path_pbs_files=None, search_crit_re=r'\.p$',
                  dryrun=False, tsleep=5.00, logfile=None, cache=False,
-                 cpu_free_min=48, qsub_cmd='qsub %s', sort=False):
+                 cpu_free=48, qsub_cmd='qsub %s', sort=False):
         """
         Regular expression examples:
             --re .veer-0\\.89_.
@@ -358,8 +358,11 @@ class Scheduler:
 
         cache : boolean, default=False
 
-        cpu_free_min : int, default=48
-            Minimum defined number of free cpu's that the cluster should have.
+        cpu_free : int, default=48
+            Minimum defined number of free cpu's that the cluster should have
+            before another job is launched for the user. This will prevent
+            more jobs being launced even if the user occupies less than the
+            number of cpu's defined with nr_cpus.
 
         qsub_cmd : str, default='qsub %s'
             When launching from a node on Gorm, ssh to g-000 to bypass the
@@ -406,7 +409,7 @@ class Scheduler:
 
         self.uid = os.getenv('USER')
         self.nr_cpus = nr_cpus
-        self.cpu_free_min = cpu_free_min
+        self.cpu_free = cpu_free
         self.tsleep = tsleep
         self.dryrun = dryrun
         self.tsleep_short = 0.1
@@ -464,7 +467,7 @@ class Scheduler:
         queueing system with jobs that will only queue intstead of run.
         """
         print '      tsleep_short ; %6.2f' % self.tsleep_short
-        print 'min cpu to be free ; %3i' % self.cpu_free_min
+        print 'min cpu to be free ; %3i' % self.cpu_free
         # we can only ask for confirmation when stdout is not going to the log
         if self.logfile is None:
             print 'Is this ok? You have 5 sec to abort (press CTRL-C to abort)'
@@ -485,7 +488,7 @@ class Scheduler:
             # we only launch a new job when we are not using more than our
             # quota (nr_cpus), or when there is still some room for others
             # to breath
-            if self.nr_cpus > cpu_user and cpu_free > self.cpu_free_min:
+            if self.nr_cpus > cpu_user and cpu_free > self.cpu_free:
                 fname = self.pbsflist[ii]
                 # read the PBS file
                 f = open(fname)
@@ -734,6 +737,6 @@ if __name__ == '__main__':
     ss = Scheduler(options.nr_cpus, path_pbs_files=options.path_pbs_files,
                    search_crit_re=options.search_crit_re, dryrun=options.dry,
                    tsleep=options.tsleep, logfile=path_log,
-                   cache=options.cache, cpu_free_min=options.cpu_free,
+                   cache=options.cache, cpu_free=options.cpu_free,
                    qsub_cmd=options.qsub_cmd, sort=options.sort)
     ss(options.depend)