[Swift-commit] r6425 - in SwiftTutorials/UofC_2013-04-09: . bin part06

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2013-04-09 11:47:44 -0500 (Tue, 09 Apr 2013)
New Revision: 6425

Added:
   SwiftTutorials/UofC_2013-04-09/setup.sh
Removed:
   SwiftTutorials/UofC_2013-04-09/bin/setup.sh
Modified:
   SwiftTutorials/UofC_2013-04-09/README
   SwiftTutorials/UofC_2013-04-09/part06/README
Log:
Moved setup to base dir; updated main README; fixed README type in part06.

Modified: SwiftTutorials/UofC_2013-04-09/README
===================================================================
--- SwiftTutorials/UofC_2013-04-09/README	2013-04-09 15:37:02 UTC (rev 6424)
+++ SwiftTutorials/UofC_2013-04-09/README	2013-04-09 16:47:44 UTC (rev 6425)
@@ -12,14 +12,12 @@
 bin:     script tools for the tutorial
 scripts: Swift scripts for the tutorial
 
-Use bin/setup.sh to add tutorial programs to your PATH
+TO START, do:
 
-Run:
+$ source setup.sh # to add tutorial programs to your PATH
 
-source bin/setup.sh
+...and then verify:
 
-verify:
-
 $ random.sh # should be found in your PATH now
 
 

Deleted: SwiftTutorials/UofC_2013-04-09/bin/setup.sh
===================================================================
--- SwiftTutorials/UofC_2013-04-09/bin/setup.sh	2013-04-09 15:37:02 UTC (rev 6424)
+++ SwiftTutorials/UofC_2013-04-09/bin/setup.sh	2013-04-09 16:47:44 UTC (rev 6425)
@@ -1,9 +0,0 @@
-module load swift
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-echo Adding DIR=$DIR to PATH:
-
-PATH=$DIR:$PATH
-
-echo $PATH

Modified: SwiftTutorials/UofC_2013-04-09/part06/README
===================================================================
--- SwiftTutorials/UofC_2013-04-09/part06/README	2013-04-09 15:37:02 UTC (rev 6424)
+++ SwiftTutorials/UofC_2013-04-09/part06/README	2013-04-09 16:47:44 UTC (rev 6425)
@@ -14,7 +14,7 @@
 
 Run the program:
 
-$ swift -tc.file tc p6.swift -steps 3  # each simulation takes 3 seconds
+$ swift -tc.file tc p6.swift -steps=3  # each simulation takes 3 seconds
 
 Next we need to use the parallel cluster for our simulations!
 

Copied: SwiftTutorials/UofC_2013-04-09/setup.sh (from rev 6423, SwiftTutorials/UofC_2013-04-09/bin/setup.sh)
===================================================================
--- SwiftTutorials/UofC_2013-04-09/setup.sh	                        (rev 0)
+++ SwiftTutorials/UofC_2013-04-09/setup.sh	2013-04-09 16:47:44 UTC (rev 6425)
@@ -0,0 +1,33 @@
+module load swift
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+echo Adding $DIR/bin to PATH:
+
+PATH=$DIR/bin:$PATH
+
+echo $PATH
+
+mkdir -p $HOME/.swift
+
+if [ -f $HOME/.swift/swift.properties ]; then
+  echo Adding properties to end of $HOME/.swift/swift.properties
+else
+  echo creating $HOME/.swift/swift.properties
+fi
+
+cat >>$HOME/.swift/swift.properties <<END
+
+# Properties for Swift Tutorial 
+
+status.mode=provider
+use.provider.staging=false
+use.wrapper.staging=false
+wrapperlog.always.transfer=true
+execution.retries=0
+lazy.errors=false
+provider.staging.pin.swiftfiles=false
+sitedir.keep=true
+file.gc.enabled=false
+tcp.port.range=50000,51000
+END