[Swift-commit] r7755 - in trunk: bin docs/userguide

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2014-04-03 23:11:45 -0500 (Thu, 03 Apr 2014)
New Revision: 7755

Modified:
   trunk/bin/swiftrun
   trunk/docs/userguide/configuration
Log:
Add pe to config option


Modified: trunk/bin/swiftrun
===================================================================
--- trunk/bin/swiftrun	2014-04-03 21:32:18 UTC (rev 7754)
+++ trunk/bin/swiftrun	2014-04-04 04:11:45 UTC (rev 7755)
@@ -47,6 +47,7 @@
                    'maxnodesperjob'            => 'globus.maxNodes',
                    'maxsubmitrate'             => 'karajan.maxSubmitRate',
                    'overallocationdecayfactor' => 'globus.overallocationDecayFactor',
+		   'pe'                        => 'globus.pe',
                    'providerattributes'        => 'globus.providerAttributes',
                    'remotemonitorenabled'      => 'globus.remoteMonitorEnabled',
                    'slurm'                     => 'globus.slurm',

Modified: trunk/docs/userguide/configuration
===================================================================
--- trunk/docs/userguide/configuration	2014-04-03 21:32:18 UTC (rev 7754)
+++ trunk/docs/userguide/configuration	2014-04-04 04:11:45 UTC (rev 7755)
@@ -212,15 +212,20 @@
 The maximum number of nodes to request per scheduler job.
 |site.westmere.maxNodesPerJob=2
 
+|pe
+|The parallel environment to use for SGE schedulers
+|site.sunhpc.pe=mpi
+
 |providerAttributes|
 Allows user to pass attributes through directly to scheduler submit script. Currently
 only implemented for sites that use PBS.
 |site.beagle.providerAttributes=pbs.aprun;pbs.mpp;depth=24
 
-|slurm|
-Pass parameters directly through to the submit script generated for the slurm
+|slurm
+|Pass parameters directly through to the submit script generated for the slurm
 scheduler. For example, the setting "site.midway.slurm.mail-user=username" generates
 the line "#SBATCH --mail-user=username".
+|site.midway.slurm.mail-user=username
 
 |taskDir|
 Tasks will be run from this directory. In the absence of a taskDir definition,