[Swift-commit] r5642 - SwiftApps/SciColSim

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2012-02-16 16:03:18 -0600 (Thu, 16 Feb 2012)
New Revision: 5642

Modified:
   SwiftApps/SciColSim/swiftopt.sh
Log:
o SciColSim/swiftopt.sh
  -- commented out total job lines(for now)
  -- copy swift source into rundir



Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-02-16 21:41:13 UTC (rev 5641)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-02-16 22:03:18 UTC (rev 5642)
@@ -13,7 +13,7 @@
 
 # Function to run Swift
 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" \
+   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         \
    -maxrange=$max_target_innovation         \
@@ -109,9 +109,13 @@
 echo
 
 # Echo runtime estimates
-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 * $fixed_params * $annealing_cycles * ($evolve_reruns/$reruns_per_opt_invocation) * $nworkers)"`
-echo Total jobs = $total_jobs
+#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 * $fixed_params * $annealing_cycles * ($evolve_reruns/$reruns_per_opt_invocation) * $nworkers)"`
+#echo Total jobs = $total_jobs
 
+cp annealing.swift $rundir
+cp math.swift $rundir
+cp colortext.swift $rundir
+
 cd $rundir
 
 # Do the run
@@ -133,7 +137,7 @@
 
 echo "Run dir=$rundir" >> ABOUT
 echo "Work dir=$WORK" >> ABOUT
-echo "Total jobs=$total_jobs" >> ABOUT
+#echo "Total jobs=$total_jobs" >> ABOUT
 
 if [ _$dryrun != _ ]; then
   exit 0