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

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2012-02-12 18:34:52 -0600 (Sun, 12 Feb 2012)
New Revision: 5593

Modified:
   SwiftApps/SciColSim/getswift.sh
   SwiftApps/SciColSim/params/Fast01
   SwiftApps/SciColSim/swiftopt.sh
Log:
o updated getswift.sh to get the appropriate gensites version from trunk to allow it to work on mac os x
o swiftopt.sh now uses gensites, params/Fast01 works with for a local.xml sites file with gensites



Modified: SwiftApps/SciColSim/getswift.sh
===================================================================
--- SwiftApps/SciColSim/getswift.sh	2012-02-12 22:05:56 UTC (rev 5592)
+++ SwiftApps/SciColSim/getswift.sh	2012-02-13 00:34:52 UTC (rev 5593)
@@ -5,7 +5,7 @@
 release=$(basename $swiftrel .tar.gz)
 
 echo
-echo Downloading $release from $swiftrel 
+echo Downloading $release from $swiftrel
 echo
 
 rm -rf $tarfile $release
@@ -17,11 +17,13 @@
 fi
 
 echo
-echo Extracting $release from $swiftrel 
+echo Extracting $release from $swiftrel
 echo
 
 tar zxf $tarfile
 
+svn cat --revision 5580 https://svn.ci.uchicago.edu/svn/vdl2/trunk/bin/gensites > swift-0.93/bin/gensites
+
 echo
 echo Swift installed at $PWD/$release
 echo

Modified: SwiftApps/SciColSim/params/Fast01
===================================================================
--- SwiftApps/SciColSim/params/Fast01	2012-02-12 22:05:56 UTC (rev 5592)
+++ SwiftApps/SciColSim/params/Fast01	2012-02-13 00:34:52 UTC (rev 5593)
@@ -1,7 +1,7 @@
 
 min_target_innovation         58     # starting target innovation value to try
 max_target_innovation         109    # stops before this target innovation value
-target_innovation_increment   50     # increment target innovation by this amount 
+target_innovation_increment   50     # increment target innovation by this amount
 
 annealing_repeats             1      # times to repeate the entire optimization process for each target_innovation
 annealing_cycles              10     # times to perform the simulated annealing loop for all non-fixed parameters
@@ -14,6 +14,8 @@
 alpha_m                       0.0    # alpha_i and alpha_m are fixed for now
 beta                          4.0    # rest are varied by the optimization process
 gamma                         50.0
-delta                         -1.0 
-  
-   
\ No newline at end of file
+delta                         -1.0
+
+
+WORK                          $PWD/swiftwork
+JOB_THROTTLE                      .05

Modified: SwiftApps/SciColSim/swiftopt.sh
===================================================================
--- SwiftApps/SciColSim/swiftopt.sh	2012-02-12 22:05:56 UTC (rev 5592)
+++ SwiftApps/SciColSim/swiftopt.sh	2012-02-13 00:34:52 UTC (rev 5593)
@@ -59,6 +59,7 @@
 sed -e '/^[[:space:]]*\(#.*\)*$/d' -e 's/#.*//' -e 's/  */=/' -e 's/^/export /' <params/$paramfile >$rundir/params.annealing
 source $rundir/params.annealing
 
+gensites=swift/bin/gensites
 swift=../swift/bin/swift # relative to runNNN/ dirs
 
 echo Optimization run $runid: site=$execsite paramfile=$paramfile
@@ -66,7 +67,7 @@
 # generate swift config files       # FIXME: replace this logic using gensites
 conf/gen.tc $execsite > $rundir/tc
 conf/gen.cf $execsite > $rundir/cf
-conf/gen.$execsite    > $rundir/$execsite.xml
+$gensites conf/$execsite.xml    > $rundir/$execsite.xml
 
 cp movie_graph.txt $rundir