[Swift-commit] r7419 - SwiftApps/swiftrun-demo/01-full-site-definition

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-12-13 10:07:33 -0600 (Fri, 13 Dec 2013)
New Revision: 7419

Modified:
   SwiftApps/swiftrun-demo/01-full-site-definition/swift.properties
Log:
Use new site property names


Modified: SwiftApps/swiftrun-demo/01-full-site-definition/swift.properties
===================================================================
--- SwiftApps/swiftrun-demo/01-full-site-definition/swift.properties	2013-12-13 15:58:47 UTC (rev 7418)
+++ SwiftApps/swiftrun-demo/01-full-site-definition/swift.properties	2013-12-13 16:07:33 UTC (rev 7419)
@@ -1,20 +1,18 @@
-site.sandyb.filesystem=local
-site.sandyb.initialScore=10000
-site.sandyb.jobspernode=16
-site.sandyb.maxWalltime=00:05:00
-site.sandyb.provider=local:slurm
-site.sandyb.queue=sandyb
-site.sandyb.slots=1
+site.sandyb.tasksPerWorker=16
+site.sandyb.taskWalltime=00:05:00
+site.sandyb.jobmanager=slurm
+site.sandyb.jobQueue=sandyb
+site.sandyb.maxJobs=1
 site.sandyb.workdirectory=/scratch/midway/$USER/work
+site.sandyb.filesystem=local
 
 site.westmere {
    filesystem=local
-   initialScore=10000
-   jobsPerNode=12
-   maxWalltime=00:05:00
-   provider=local:slurm
+   tasksPerWorker=12
+   taskWalltime=00:05:00
+   jobmanager=slurm
    queue=westmere
-   slots=1
+   maxJobs=1
    workdirectory=/scratch/midway/$USER/work
 }