[Swift-commit] r5590 - SwiftApps/SciColSim

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2012-02-12 15:20:04 -0600 (Sun, 12 Feb 2012)
New Revision: 5590

Modified:
   SwiftApps/SciColSim/swiftopt.sh
Log:
Restore use of swift/ symlink. Added note about that. Remove commented-out swift invocation line causing error in param passing.

Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-02-12 21:09:41 UTC (rev 5589)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-02-12 21:20:04 UTC (rev 5590)
@@ -3,6 +3,11 @@
 #TODO: Fix espcape code nonense, seems to be passing in -n -e to swift
 
 # Usage: swiftopt.sh [-s sitename] [-p paramfile] [-n # for dryrun ]
+# 
+# NOTE: this command expects symlink "swift" in the cur dir to point
+# to relese installed by setup.sh If you want to run with a different
+# swift release, replace symlink "swift" with a link to your swift
+# release dir.
 
 usage="$0 [-s sitename] [-p paramfile] [-n] # -n for dryrun: just print params and time estimates"
 
@@ -54,8 +59,7 @@
 sed -e '/^[[:space:]]*\(#.*\)*$/d' -e 's/#.*//' -e 's/  */=/' -e 's/^/export /' <params/$paramfile >$rundir/params.annealing
 source $rundir/params.annealing
 
-#swift=../swift/bin/swift # relative to runNNN/ dirs
-swift=swift
+swift=../swift/bin/swift # relative to runNNN/ dirs
 
 echo Optimization run $runid: site=$execsite paramfile=$paramfile
 
@@ -84,7 +88,6 @@
 # Do the run
 
 cd $rundir
-#SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift 2>&1 -tc.file tc -sites.file $execsite.xml -config cf ../annealing.swift -e33="$escapecode"\
 
 SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc -sites.file $execsite.xml -config cf ../annealing.swift -e33="$escapecode" \
                                          \