[Swift-commit] r8167 - in SwiftTutorials/ATPESC_2014-08-14/swift-k: . app part04 part05 part06 part07
wilde at ci.uchicago.edu
wilde at ci.uchicago.edu
Wed Aug 13 23:28:18 CDT 2014
Author: wilde
Date: 2014-08-13 23:28:18 -0500 (Wed, 13 Aug 2014)
New Revision: 8167
Modified:
SwiftTutorials/ATPESC_2014-08-14/swift-k/app/renderframe
SwiftTutorials/ATPESC_2014-08-14/swift-k/part04/swift.properties
SwiftTutorials/ATPESC_2014-08-14/swift-k/part05/swift.properties
SwiftTutorials/ATPESC_2014-08-14/swift-k/part06/swift.properties
SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/swift.properties
SwiftTutorials/ATPESC_2014-08-14/swift-k/setup.tukey.sh
Log:
Adjust setup for tukey and ATPESC. Correct issues with apps in swift.properties. Point to correct c-ray in renderframe.
Modified: SwiftTutorials/ATPESC_2014-08-14/swift-k/app/renderframe
===================================================================
--- SwiftTutorials/ATPESC_2014-08-14/swift-k/app/renderframe 2014-08-13 23:39:59 UTC (rev 8166)
+++ SwiftTutorials/ATPESC_2014-08-14/swift-k/app/renderframe 2014-08-14 04:28:18 UTC (rev 8167)
@@ -5,6 +5,7 @@
frame=$3
APPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+BINDIR="$( cd $APPDIR/../bin && pwd )"
cat <<END >c-ray-trailer
# walls
@@ -20,9 +21,8 @@
(
awk "\$1 == $frame {for (i=2; i<NF; i++) printf \$i \" \"; print \$NF}" <$mdtrj | sed -e 's/^[0-9]\+ //'
-
cat c-ray-trailer
-) | $APPDIR/c-ray >t.ppm
+) | $BINDIR/c-ray >t.ppm
convert t.ppm $vzout
Modified: SwiftTutorials/ATPESC_2014-08-14/swift-k/part04/swift.properties
===================================================================
--- SwiftTutorials/ATPESC_2014-08-14/swift-k/part04/swift.properties 2014-08-13 23:39:59 UTC (rev 8166)
+++ SwiftTutorials/ATPESC_2014-08-14/swift-k/part04/swift.properties 2014-08-14 04:28:18 UTC (rev 8167)
@@ -1,2 +1,25 @@
-site=midway-westmere
-site.westmere.slurm.exclusive=false
+site=tukey
+
+site.tukey {
+ jobmanager=localhost:cobalt
+ taskWalltime=00:15:00
+ workdir=/home/$USER/swiftwork
+ filesystem=local
+ maxJobs=4
+ tasksPerWorker=8
+ taskThrottle=300
+ initialscore=10000
+}
+
+
+app.tukey.simulate=$PWD/../app/simulate
+app.tukey.stats=$PWD/../app/stats
+app.tukey.md=$PWD/../bin/md
+app.tukey.mdstats=$PWD/../app/mdstats
+app.tukey.mdmaxk=$PWD/../app/mdmaxk
+app.tukey.renderframe=$PWD/../app/renderframe
+app.tukey.convert=/usr/bin/convert
+
+# site=midway-sandyb
+
+site.midway-sandyb.slurm.exclusive=false
Modified: SwiftTutorials/ATPESC_2014-08-14/swift-k/part05/swift.properties
===================================================================
--- SwiftTutorials/ATPESC_2014-08-14/swift-k/part05/swift.properties 2014-08-13 23:39:59 UTC (rev 8166)
+++ SwiftTutorials/ATPESC_2014-08-14/swift-k/part05/swift.properties 2014-08-14 04:28:18 UTC (rev 8167)
@@ -1,2 +1,25 @@
-site=westmere
-site.westmere.slurm.exclusive=false
+site=tukey
+
+site.tukey {
+ jobmanager=localhost:cobalt
+ taskWalltime=00:15:00
+ workdir=/home/$USER/swiftwork
+ filesystem=local
+ maxJobs=4
+ tasksPerWorker=8
+ taskThrottle=300
+ initialscore=10000
+}
+
+
+app.tukey.simulate=$PWD/../app/simulate
+app.tukey.stats=$PWD/../app/stats
+app.tukey.md=$PWD/../bin/md
+app.tukey.mdstats=$PWD/../app/mdstats
+app.tukey.mdmaxk=$PWD/../app/mdmaxk
+app.tukey.renderframe=$PWD/../app/renderframe
+app.tukey.convert=/usr/bin/convert
+
+# site=midway-sandyb
+
+site.midway-sandyb.slurm.exclusive=false
Modified: SwiftTutorials/ATPESC_2014-08-14/swift-k/part06/swift.properties
===================================================================
--- SwiftTutorials/ATPESC_2014-08-14/swift-k/part06/swift.properties 2014-08-13 23:39:59 UTC (rev 8166)
+++ SwiftTutorials/ATPESC_2014-08-14/swift-k/part06/swift.properties 2014-08-14 04:28:18 UTC (rev 8167)
@@ -1,2 +1,25 @@
-site=westmere
-site.westmere.slurm.exclusive=false
+site=tukey
+
+site.tukey {
+ jobmanager=localhost:cobalt
+ taskWalltime=00:15:00
+ workdir=/home/$USER/swiftwork
+ filesystem=local
+ maxJobs=4
+ tasksPerWorker=8
+ taskThrottle=300
+ initialscore=10000
+}
+
+
+app.tukey.simulate=$PWD/../app/simulate
+app.tukey.stats=$PWD/../app/stats
+app.tukey.md=$PWD/../bin/md
+app.tukey.mdstats=$PWD/../app/mdstats
+app.tukey.mdmaxk=$PWD/../app/mdmaxk
+app.tukey.renderframe=$PWD/../app/renderframe
+app.tukey.convert=/usr/bin/convert
+
+# site=midway-sandyb
+
+site.midway-sandyb.slurm.exclusive=false
Modified: SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/swift.properties
===================================================================
--- SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/swift.properties 2014-08-13 23:39:59 UTC (rev 8166)
+++ SwiftTutorials/ATPESC_2014-08-14/swift-k/part07/swift.properties 2014-08-14 04:28:18 UTC (rev 8167)
@@ -5,13 +5,16 @@
taskWalltime=00:15:00
workdir=/home/$USER/swiftwork
filesystem=local
- maxJobs=10
+ maxJobs=4
tasksPerWorker=8
taskThrottle=300
initialscore=10000
}
-app.tukey.md=$PWD/../app/md
+
+app.tukey.simulate=$PWD/../app/simulate
+app.tukey.stats=$PWD/../app/stats
+app.tukey.md=$PWD/../bin/md
app.tukey.mdstats=$PWD/../app/mdstats
app.tukey.mdmaxk=$PWD/../app/mdmaxk
app.tukey.renderframe=$PWD/../app/renderframe
Modified: SwiftTutorials/ATPESC_2014-08-14/swift-k/setup.tukey.sh
===================================================================
--- SwiftTutorials/ATPESC_2014-08-14/swift-k/setup.tukey.sh 2014-08-13 23:39:59 UTC (rev 8166)
+++ SwiftTutorials/ATPESC_2014-08-14/swift-k/setup.tukey.sh 2014-08-14 04:28:18 UTC (rev 8167)
@@ -13,10 +13,3 @@
( cd src/c-ray; make; make install )
-: <<END
-[8/13/14, 5:22:21 PM] Yadu Nand B: /home/yadunand/xsede_new/part04m
-[8/13/14, 5:23:21 PM] Yadu Nand B: SWIFT path = /home/yadunand/bin/swift-0.95-main/bin
-[8/13/14, 5:23:41 PM] Yadu Nand B: JAVA
-[8/13/14, 5:23:43 PM] Yadu Nand B: /home/yadunand/bin/jdk1.7.0_25/bin
-END
-
More information about the Swift-commit
mailing list