[Swift-commit] r6750 - in SwiftTutorials/ATPESC_2013-08-06: . modis modis/modis01 modis/modis02 modis/modis03 modis/modis04 modis/modis05 part10

davidk at ci.uchicago.edu davidk at ci.uchicago.edu
Mon Aug 5 12:46:15 CDT 2013


Author: davidk
Date: 2013-08-05 12:46:14 -0500 (Mon, 05 Aug 2013)
New Revision: 6750

Added:
   SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.xml
   SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.xml
   SwiftTutorials/ATPESC_2013-08-06/part10/apps
Removed:
   SwiftTutorials/ATPESC_2013-08-06/modis/data/
   SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.tukey.xml
   SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.xml
   SwiftTutorials/ATPESC_2013-08-06/modis/modis01/tc.data
   SwiftTutorials/ATPESC_2013-08-06/modis/modis02/sites.tukey.xml
   SwiftTutorials/ATPESC_2013-08-06/modis/modis02/tc.data
   SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.tukey.xml
   SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.xml
   SwiftTutorials/ATPESC_2013-08-06/modis/modis03/tc.data
   SwiftTutorials/ATPESC_2013-08-06/modis/modis04/sites.tukey.xml
   SwiftTutorials/ATPESC_2013-08-06/modis/modis04/tc.data
   SwiftTutorials/ATPESC_2013-08-06/modis/modis05/sites.tukey.xml
   SwiftTutorials/ATPESC_2013-08-06/part10/tc.data
Modified:
   SwiftTutorials/ATPESC_2013-08-06/modis/modis01/apps
   SwiftTutorials/ATPESC_2013-08-06/modis/modis01/data
   SwiftTutorials/ATPESC_2013-08-06/modis/modis02/apps
   SwiftTutorials/ATPESC_2013-08-06/modis/modis02/data
   SwiftTutorials/ATPESC_2013-08-06/modis/modis02/sites.xml
   SwiftTutorials/ATPESC_2013-08-06/modis/modis03/apps
   SwiftTutorials/ATPESC_2013-08-06/modis/modis03/data
   SwiftTutorials/ATPESC_2013-08-06/modis/modis04/apps
   SwiftTutorials/ATPESC_2013-08-06/modis/modis04/data
   SwiftTutorials/ATPESC_2013-08-06/modis/modis04/sites.xml
   SwiftTutorials/ATPESC_2013-08-06/modis/modis05/apps
   SwiftTutorials/ATPESC_2013-08-06/modis/modis05/data
   SwiftTutorials/ATPESC_2013-08-06/modis/modis05/sites.xml
   SwiftTutorials/ATPESC_2013-08-06/part10/sites.xml
   SwiftTutorials/ATPESC_2013-08-06/setup.sh
Log:
Working versions of modis01-modis05 using tukey+reservation
Everything using new project paths


Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis01/apps
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis01/apps	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis01/apps	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1 +1 @@
-tukey getlanduse getlanduse.sh
+tukey getlanduse /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/getlanduse.sh

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis01/data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis01/data	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis01/data	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1 +1 @@
-link ../data
\ No newline at end of file
+link /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/data
\ No newline at end of file

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.tukey.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.tukey.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.tukey.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +0,0 @@
-<config>
-  <pool handle="midway-westmere">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">12</profile>
-    <profile namespace="globus" key="maxWalltime">00:02:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">westmere</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}/work</workdirectory>
-  </pool>
-</config>

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +0,0 @@
-<config>
-  <pool handle="tukey">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">16</profile>
-    <profile namespace="globus" key="maxWalltime">00:05:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">sandyb</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}</workdirectory>
-  </pool>
-</config>

Copied: SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.xml (from rev 6746, SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.tukey.xml)
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.xml	                        (rev 0)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis01/sites.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -0,0 +1,15 @@
+<config>
+  <pool handle="tukey">
+    <filesystem provider="local" />
+    <execution provider="coaster" jobmanager="local:cobalt"/>
+    <profile namespace="karajan" key="jobthrottle">5.11</profile>
+    <profile namespace="karajan" key="initialScore">10000</profile>
+    <profile namespace="globus"  key="jobsPerNode">8</profile>
+    <profile namespace="globus"  key="slots">1</profile>
+    <profile namespace="globus"  key="maxNodes">1</profile>
+    <profile namespace="globus"  key="nodeGranularity">1</profile>
+    <profile namespace="globus"  key="maxTime">900</profile> 
+    <profile namespace="globus"  key="queue">R.ATPESC2013</profile>
+    <workdirectory>/home/{env.USER}/swiftwork</workdirectory>
+  </pool>
+</config>

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis01/tc.data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis01/tc.data	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis01/tc.data	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,8 +0,0 @@
-midway-westmere getlanduse /scratch/midway/davidkelly999/modis/bin/getlanduse.sh
-midway-westmere analyzelanduse /scratch/midway/davidkelly999/modis/bin/analyzelanduse.sh
-midway-westmere colormodis /scratch/midway/davidkelly999/modis/bin/colormodis.sh
-midway-westmere assemble /scratch/midway/davidkelly999/modis/bin/assemble.sh
-midway-westmere markmap /scratch/midway/davidkelly999/modis/bin/markmap.sh
-midway-westmere echo /bin/echo
-
-

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis02/apps
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis02/apps	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis02/apps	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1 +1 @@
-tukey getlanduse getlanduse.sh
+tukey getlanduse /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/getlanduse.sh

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis02/data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis02/data	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis02/data	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1 +1 @@
-link ../data
\ No newline at end of file
+link /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/data
\ No newline at end of file

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis02/sites.tukey.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis02/sites.tukey.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis02/sites.tukey.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +0,0 @@
-<config>
-  <pool handle="midway-westmere">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">12</profile>
-    <profile namespace="globus" key="maxWalltime">00:02:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">westmere</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}/work</workdirectory>
-  </pool>
-</config>

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis02/sites.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis02/sites.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis02/sites.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +1,15 @@
 <config>
   <pool handle="tukey">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">16</profile>
-    <profile namespace="globus" key="maxWalltime">00:05:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">sandyb</profile>
+    <filesystem provider="local" />
+    <execution provider="coaster" jobmanager="local:cobalt"/>
+    <profile namespace="karajan" key="jobthrottle">5.11</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}</workdirectory>
+    <profile namespace="globus"  key="jobsPerNode">8</profile>
+    <profile namespace="globus"  key="slots">1</profile>
+    <profile namespace="globus"  key="maxNodes">1</profile>
+    <profile namespace="globus"  key="nodeGranularity">1</profile>
+    <profile namespace="globus"  key="maxTime">900</profile> 
+    <profile namespace="globus"  key="queue">R.ATPESC2013</profile>
+    <workdirectory>/home/{env.USER}/swiftwork</workdirectory>
   </pool>
 </config>

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis02/tc.data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis02/tc.data	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis02/tc.data	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,8 +0,0 @@
-midway-westmere getlanduse /scratch/midway/davidkelly999/modis/bin/getlanduse.sh
-midway-westmere analyzelanduse /scratch/midway/davidkelly999/modis/bin/analyzelanduse.sh
-midway-westmere colormodis /scratch/midway/davidkelly999/modis/bin/colormodis.sh
-midway-westmere assemble /scratch/midway/davidkelly999/modis/bin/assemble.sh
-midway-westmere markmap /scratch/midway/davidkelly999/modis/bin/markmap.sh
-midway-westmere echo /bin/echo
-
-

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis03/apps
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis03/apps	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis03/apps	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,2 +1,2 @@
-tukey getlanduse getlanduse.sh
-tukey analyzelanduse analyzelanduse.sh
+tukey getlanduse /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/getlanduse.sh
+tukey analyzelanduse /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/analyzelanduse.sh

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis03/data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis03/data	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis03/data	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1 +1 @@
-link ../data
\ No newline at end of file
+link /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/data
\ No newline at end of file

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.tukey.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.tukey.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.tukey.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +0,0 @@
-<config>
-  <pool handle="midway-westmere">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">12</profile>
-    <profile namespace="globus" key="maxWalltime">00:02:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">westmere</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}/work</workdirectory>
-  </pool>
-</config>

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +0,0 @@
-<config>
-  <pool handle="tukey">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">16</profile>
-    <profile namespace="globus" key="maxWalltime">00:05:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">sandyb</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}</workdirectory>
-  </pool>
-</config>

Copied: SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.xml (from rev 6746, SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.tukey.xml)
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.xml	                        (rev 0)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis03/sites.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -0,0 +1,15 @@
+<config>
+  <pool handle="tukey">
+    <filesystem provider="local" />
+    <execution provider="coaster" jobmanager="local:cobalt"/>
+    <profile namespace="karajan" key="jobthrottle">5.11</profile>
+    <profile namespace="karajan" key="initialScore">10000</profile>
+    <profile namespace="globus"  key="jobsPerNode">8</profile>
+    <profile namespace="globus"  key="slots">1</profile>
+    <profile namespace="globus"  key="maxNodes">1</profile>
+    <profile namespace="globus"  key="nodeGranularity">1</profile>
+    <profile namespace="globus"  key="maxTime">900</profile> 
+    <profile namespace="globus"  key="queue">R.ATPESC2013</profile>
+    <workdirectory>/home/{env.USER}/swiftwork</workdirectory>
+  </pool>
+</config>

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis03/tc.data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis03/tc.data	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis03/tc.data	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,8 +0,0 @@
-midway-westmere getlanduse /scratch/midway/davidkelly999/modis/bin/getlanduse.sh
-midway-westmere analyzelanduse /scratch/midway/davidkelly999/modis/bin/analyzelanduse.sh
-midway-westmere colormodis /scratch/midway/davidkelly999/modis/bin/colormodis.sh
-midway-westmere assemble /scratch/midway/davidkelly999/modis/bin/assemble.sh
-midway-westmere markmap /scratch/midway/davidkelly999/modis/bin/markmap.sh
-midway-westmere echo /bin/echo
-
-

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis04/apps
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis04/apps	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis04/apps	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,3 +1,3 @@
-tukey getlanduse getlanduse.sh
-tukey analyzelanduse analyzelanduse.sh
-tukey markmap markmap.sh
+tukey getlanduse /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/getlanduse.sh
+tukey analyzelanduse /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/analyzelanduse.sh
+tukey markmap /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/markmap.sh

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis04/data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis04/data	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis04/data	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1 +1 @@
-link ../data
\ No newline at end of file
+link /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/data
\ No newline at end of file

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis04/sites.tukey.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis04/sites.tukey.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis04/sites.tukey.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +0,0 @@
-<config>
-  <pool handle="midway-westmere">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">12</profile>
-    <profile namespace="globus" key="maxWalltime">00:02:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">westmere</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}/work</workdirectory>
-  </pool>
-</config>

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis04/sites.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis04/sites.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis04/sites.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +1,15 @@
 <config>
   <pool handle="tukey">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">16</profile>
-    <profile namespace="globus" key="maxWalltime">00:05:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">sandyb</profile>
+    <filesystem provider="local" />
+    <execution provider="coaster" jobmanager="local:cobalt"/>
+    <profile namespace="karajan" key="jobthrottle">5.11</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}</workdirectory>
+    <profile namespace="globus"  key="jobsPerNode">8</profile>
+    <profile namespace="globus"  key="slots">1</profile>
+    <profile namespace="globus"  key="maxNodes">1</profile>
+    <profile namespace="globus"  key="nodeGranularity">1</profile>
+    <profile namespace="globus"  key="maxTime">900</profile> 
+    <profile namespace="globus"  key="queue">R.ATPESC2013</profile>
+    <workdirectory>/home/{env.USER}/swiftwork</workdirectory>
   </pool>
 </config>

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis04/tc.data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis04/tc.data	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis04/tc.data	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,8 +0,0 @@
-midway-westmere getlanduse /scratch/midway/davidkelly999/modis/bin/getlanduse.sh
-midway-westmere analyzelanduse /scratch/midway/davidkelly999/modis/bin/analyzelanduse.sh
-midway-westmere colormodis /scratch/midway/davidkelly999/modis/bin/colormodis.sh
-midway-westmere assemble /scratch/midway/davidkelly999/modis/bin/assemble.sh
-midway-westmere markmap /scratch/midway/davidkelly999/modis/bin/markmap.sh
-midway-westmere echo /bin/echo
-
-

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis05/apps
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis05/apps	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis05/apps	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,4 +1,4 @@
-tukey getlanduse getlanduse.sh
-tukey analyzelanduse analyzelanduse.sh
-tukey markmap markmap.sh
-tukey colormodis colormodis.sh
+tukey getlanduse /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/getlanduse.sh
+tukey analyzelanduse /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/analyzelanduse.sh
+tukey markmap /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/markmap.sh
+tukey colormodis /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/bin/colormodis.sh

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis05/data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis05/data	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis05/data	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1 +1 @@
-link ../data
\ No newline at end of file
+link /projects/ATPESC2013/workflow/ATPESC_2013-08-06/modis/data
\ No newline at end of file

Deleted: SwiftTutorials/ATPESC_2013-08-06/modis/modis05/sites.tukey.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis05/sites.tukey.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis05/sites.tukey.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +0,0 @@
-<config>
-  <pool handle="midway-westmere">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">12</profile>
-    <profile namespace="globus" key="maxWalltime">00:02:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">westmere</profile>
-    <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}/work</workdirectory>
-  </pool>
-</config>

Modified: SwiftTutorials/ATPESC_2013-08-06/modis/modis05/sites.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/modis/modis05/sites.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/modis/modis05/sites.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +1,15 @@
 <config>
   <pool handle="tukey">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">16</profile>
-    <profile namespace="globus" key="maxWalltime">00:05:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">sandyb</profile>
+    <filesystem provider="local" />
+    <execution provider="coaster" jobmanager="local:cobalt"/>
+    <profile namespace="karajan" key="jobthrottle">5.11</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}</workdirectory>
+    <profile namespace="globus"  key="jobsPerNode">8</profile>
+    <profile namespace="globus"  key="slots">1</profile>
+    <profile namespace="globus"  key="maxNodes">1</profile>
+    <profile namespace="globus"  key="nodeGranularity">1</profile>
+    <profile namespace="globus"  key="maxTime">900</profile> 
+    <profile namespace="globus"  key="queue">R.ATPESC2013</profile>
+    <workdirectory>/home/{env.USER}/swiftwork</workdirectory>
   </pool>
 </config>

Copied: SwiftTutorials/ATPESC_2013-08-06/part10/apps (from rev 6715, SwiftTutorials/ATPESC_2013-08-06/part10/tc.data)
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/part10/apps	                        (rev 0)
+++ SwiftTutorials/ATPESC_2013-08-06/part10/apps	2013-08-05 17:46:14 UTC (rev 6750)
@@ -0,0 +1,8 @@
+tukey getlanduse /home/davidk/ATPESC_2013-08-06/modis/bin/getlanduse.sh
+tukey analyzelanduse /home/davidk/ATPESC_2013-08-06/modis/bin/analyzelanduse.sh
+tukey colormodis /home/davidk/ATPESC_2013-08-06/modis/bin/colormodis.sh
+tukey assemble /home/davidk/ATPESC_2013-08-06/modis/bin/assemble.sh
+tukey markmap /home/davidk/ATPESC_2013-08-06/modis/bin/markmap.sh
+tukey echo /bin/echo
+
+

Modified: SwiftTutorials/ATPESC_2013-08-06/part10/sites.xml
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/part10/sites.xml	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/part10/sites.xml	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,13 +1,14 @@
 <config>
-  <pool handle="midway-westmere">
-    <execution provider="coaster" jobmanager="local:slurm"/>
-    <profile namespace="globus" key="jobsPerNode">12</profile>
-    <profile namespace="globus" key="maxWalltime">00:02:00</profile>
-    <profile namespace="globus" key="highOverAllocation">100</profile>
-    <profile namespace="globus" key="lowOverAllocation">100</profile>
-    <profile namespace="globus" key="queue">westmere</profile>
+  <pool handle="tukey">
+    <filesystem provider="local" />
+    <execution provider="coaster" jobmanager="local:cobalt"/>
+    <profile namespace="karajan" key="jobthrottle">5.11</profile>
     <profile namespace="karajan" key="initialScore">10000</profile>
-    <filesystem provider="local"/>
-    <workdirectory>/scratch/midway/{env.USER}/work</workdirectory>
+    <profile namespace="globus"  key="jobsPerNode">8</profile>
+    <profile namespace="globus"  key="slots">1</profile>
+    <profile namespace="globus"  key="maxNodes">1</profile>
+    <profile namespace="globus"  key="nodeGranularity">1</profile>
+    <profile namespace="globus"  key="maxTime">900</profile> 
+    <workdirectory>/home/{env.USER}/swiftwork</workdirectory>
   </pool>
 </config>

Deleted: SwiftTutorials/ATPESC_2013-08-06/part10/tc.data
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/part10/tc.data	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/part10/tc.data	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,8 +0,0 @@
-midway-westmere getlanduse /scratch/midway/davidkelly999/modis/bin/getlanduse.sh
-midway-westmere analyzelanduse /scratch/midway/davidkelly999/modis/bin/analyzelanduse.sh
-midway-westmere colormodis /scratch/midway/davidkelly999/modis/bin/colormodis.sh
-midway-westmere assemble /scratch/midway/davidkelly999/modis/bin/assemble.sh
-midway-westmere markmap /scratch/midway/davidkelly999/modis/bin/markmap.sh
-midway-westmere echo /bin/echo
-
-

Modified: SwiftTutorials/ATPESC_2013-08-06/setup.sh
===================================================================
--- SwiftTutorials/ATPESC_2013-08-06/setup.sh	2013-08-05 17:39:22 UTC (rev 6749)
+++ SwiftTutorials/ATPESC_2013-08-06/setup.sh	2013-08-05 17:46:14 UTC (rev 6750)
@@ -1,7 +1,7 @@
 export SWIFT_HEAP_MAX=4G
 
 # Add Swift and java to PATH
-export PATH=~wilde/jdk1.7.0_25/bin:~wilde/swift/rev/swift-0.94.1/bin:$PATH
+export PATH=/projects/ATPESC2013/workflow/jdk1.7.0_25/bin:/projects/ATPESC2013/workflow/swift-0.94.1/bin:$PATH
 
 echo -e "\\nUsing swift release from: \\c"
 which swift




More information about the Swift-commit mailing list