[Swift-commit] r5637 - SwiftApps/SciColSim

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2012-02-16 14:12:04 -0600 (Thu, 16 Feb 2012)
New Revision: 5637

Modified:
   SwiftApps/SciColSim/getboost.sh
   SwiftApps/SciColSim/getswift.sh
   SwiftApps/SciColSim/swiftopt.sh
Log:
o swiftopt.sh
  -- fixed run000 error, small amount of information goes to the ABOUT file in the rundir

o getboost.sh
  -- getboost.sh checks to make sure that the boost directory does not exist before downloading.
  -- download boost tar ball from ~jonmon/public_html/SciColSim/boost_1_47_0.tar.gz

o getswift.sh
  -- gets the stable gensites version for mac from trunk r5636



Modified: SwiftApps/SciColSim/getboost.sh
===================================================================
--- SwiftApps/SciColSim/getboost.sh	2012-02-16 19:50:34 UTC (rev 5636)
+++ SwiftApps/SciColSim/getboost.sh	2012-02-16 20:12:04 UTC (rev 5637)
@@ -2,10 +2,16 @@
 
 tarfile=boost_1_47_0.tar.gz
 release=$(basename $tarfile .tar.gz)
-boostrel=http://sourceforge.net/projects/boost/files/boost/1.47.0/boost_1_47_0.tar.gz/download
+boostrel=http://www.ci.uchicago.edu/~jonmon/SciColSim/$tarfile
 
+if [ -d boost_1_47_0 ];
+then
+    echo "Boost directory already created!"
+    exit 0
+fi
+
 echo
-echo Downloading $release from $boostrel 
+echo Downloading $release from $boostrel
 echo
 
 rm -rf $tarfile $release

Modified: SwiftApps/SciColSim/getswift.sh
===================================================================
--- SwiftApps/SciColSim/getswift.sh	2012-02-16 19:50:34 UTC (rev 5636)
+++ SwiftApps/SciColSim/getswift.sh	2012-02-16 20:12:04 UTC (rev 5637)
@@ -22,7 +22,7 @@
 
 tar zxf $tarfile
 
-svn cat --revision 5580 https://svn.ci.uchicago.edu/svn/vdl2/trunk/bin/gensites > swift-0.93/bin/gensites
+svn cat --revision 5636 https://svn.ci.uchicago.edu/svn/vdl2/trunk/bin/gensites > swift-0.93/bin/gensites
 
 echo
 echo Swift installed at $PWD/$release

Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-02-16 19:50:34 UTC (rev 5636)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-02-16 20:12:04 UTC (rev 5637)
@@ -12,7 +12,7 @@
 usage="$0 [-s sitename] [-p paramfile] [-n] # -n for dryrun: just print params and time estimates"
 
 # Function to run Swift
-runswift() { 
+runswift() {
    SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc.data -sites.file $1 -config cf ../annealing.swift -e33="$escapecode" \
                                             \
    -minrange=$min_target_innovation         \
@@ -30,7 +30,7 @@
    -delta=$delta                            \
                                             \
    -nworkers=$nworkers                      \
-   -rerunsperapp=$reruns_per_opt_invocation 
+   -rerunsperapp=$reruns_per_opt_invocation
 }
 
 # Default settings
@@ -54,7 +54,7 @@
 
 # Create next unique run id and run directory
 if [ ! -f nextrun ]; then
-  echo 000 >nextrun
+  echo 000 >newrun
 else
   cat nextrun | awk '{ printf("%03d\n", $1+1)}' >newrun
 fi
@@ -83,7 +83,7 @@
    exit 1
 fi
 
-# Use start-coaster-service if site is a .conf file      
+# Use start-coaster-service if site is a .conf file
 if [ -f "conf/$execsite.conf" ]; then
    USE_SCS=1
 fi
@@ -124,6 +124,10 @@
    SWIFT_HOME=../swift/bin ../swift/bin/gensites -p ../conf/$execsite.cf ../conf/$execsite.xml > $execsite.xml
 fi
 
+echo "Run dir=$rundir" > ABOUT
+echo "Work dir=$WORK" > ABOUT
+echo "Total jobs=$toal_jobs" > ABOUT
+
 if [ _$dryrun != _ ]; then
   exit 0
 fi