[Swift-commit] r4537 - SwiftApps/Montage/exec

[jonmon at ci.uchicago.edu]

Author: jonmon
Date: 2011-06-01 09:52:55 -0500 (Wed, 01 Jun 2011)
New Revision: 4537

Modified:
   SwiftApps/Montage/exec/montage.sh
Log:
o SwiftApps/Montage/exec/montage.sh
  -- Modified run script to accept a different number of workers at each stage


Modified: SwiftApps/Montage/exec/montage.sh
===================================================================
--- SwiftApps/Montage/exec/montage.sh	2011-06-01 14:20:10 UTC (rev 4536)
+++ SwiftApps/Montage/exec/montage.sh	2011-06-01 14:52:55 UTC (rev 4537)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-EXPECTED_ARGS=2
+EXPECTED_ARGS=4
 
 if [ $# -ne $EXPECTED_ARGS ]
 then
@@ -28,21 +28,25 @@
 echo "#site pads-proj-coasters.xml slots=$1"                               >> sites.properties
 
 echo "#site pads-diff-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties
-echo "#site pads-diff-coasters.xml slots=$1"                               >> sites.properties
+echo "#site pads-diff-coasters.xml slots=$2"                               >> sites.properties
 
 echo "#site pads-fit-coasters.xml work=/gpfs/pads/jonmon/Swift/work/pads" >> sites.properties
-echo "#site pads-fit-coasters.xml slots=$1"                               >> sites.properties
+echo "#site pads-fit-coasters.xml slots=$3"                               >> sites.properties
 
-gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-proj-coasters.xml >  sites.xml
+echo "#site local.xml work=/gpfs/pads/jonmon/Swift/work/local"            >> sites.properties
+
+echo "<config>"                                                                   >  sites.xml
+gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-proj-coasters.xml >> sites.xml
 gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-diff-coasters.xml >> sites.xml
 gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties pads-fit-coasters.xml  >> sites.xml
 gensites -L ${SWIFT_MONTAGE}/templates -p sites.properties local.xml              >> sites.xml
+echo "</config>"                                                                  >> sites.xml
 
 rm -f sites.properties
 
 mv sites.xml ${WORK_DIRECTORY}
-mv tc.data ${WORK_DIRECTORY}
-cp $2 ${WORK_DIRECTORY}
+cp tc.data ${WORK_DIRECTORY}
+cp $4 ${WORK_DIRECTORY}
 cd ${WORK_DIRECTORY}
 #swift -tc.file tc.data -sites.file sites.xml -config ${SWIFT_MONTAGE}/etc swift_montage.properties