[Swift-commit] r5600 - in SwiftApps/SciColSim: . params

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2012-02-13 15:41:03 -0600 (Mon, 13 Feb 2012)
New Revision: 5600

Modified:
   SwiftApps/SciColSim/params/Fast01
   SwiftApps/SciColSim/swiftopt.sh
Log:
o No longer necessary to set WORK in the parameter file
o the swiftwork directory is now a subdirectory of the run directory



Modified: SwiftApps/SciColSim/params/Fast01
===================================================================
--- SwiftApps/SciColSim/params/Fast01	2012-02-13 21:01:51 UTC (rev 5599)
+++ SwiftApps/SciColSim/params/Fast01	2012-02-13 21:41:03 UTC (rev 5600)
@@ -17,5 +17,4 @@
 delta                         -1.0
 
 
-WORK                          $PWD/swiftwork
 JOB_THROTTLE                      .05

Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-02-13 21:01:51 UTC (rev 5599)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-02-13 21:41:03 UTC (rev 5600)
@@ -69,8 +69,6 @@
 conf/gen.tc $execsite           > $rundir/tc
 conf/gen.cf $execsite           > $rundir/cf
 
-SWIFT_HOME=swift/bin swift/bin/gensites conf/$execsite.xml > $rundir/$execsite.xml
-
 cp movie_graph.txt $rundir
 
 # Echo parameters
@@ -85,14 +83,18 @@
 total_jobs=`python -c "from math import ceil; print int(ceil(($max_target_innovation.00 - $min_target_innovation.00)/$target_innovation_increment.00) * $annealing_repeats * 2 * $annealing_cycles * ($evolve_reruns/$reruns_per_opt_invocation) * $nworkers)"`
 echo Total jobs = $total_jobs
 
+cd $rundir
+
 if [ _$dryrun != _ ]; then
   exit 0
 fi
 
 # Do the run
 
-cd $rundir
+export WORK=$PWD/swiftwork
 
+SWIFT_HOME=../swift/bin ../swift/bin/gensites ../conf/$execsite.xml > $execsite.xml
+
 SWIFT_HEAP_MAX=$ram SWIFT_LIB=.. $swift >> swift.out 2>&1 -tc.file tc -sites.file $execsite.xml -config cf ../annealing.swift -e33="$escapecode" \
                                          \
 -minrange=$min_target_innovation         \