[Swift-commit] r6278 - in SwiftApps/modis: . tutorial

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-02-15 05:33:21 -0600 (Fri, 15 Feb 2013)
New Revision: 6278

Modified:
   SwiftApps/modis/README
   SwiftApps/modis/tutorial/modis04.swift
Log:
Use defaults arg values for all scripts


Modified: SwiftApps/modis/README
===================================================================
--- SwiftApps/modis/README	2013-02-15 10:58:22 UTC (rev 6277)
+++ SwiftApps/modis/README	2013-02-15 11:33:21 UTC (rev 6278)
@@ -58,6 +58,12 @@
 
 $ swiftrun -site midway tutorial/modis03.swift
 
-tutorial/modis04.swift
------
-Also creates a map with top section selected
+modis04.swift
+-------------
+The fourth modis example adds another app called markMap that looks at selectedtiles.txt
+and highlights the selected areas on a map. It will create a new image called 
+markedGrid.ppm.
+
+To run modis04.swift:
+
+$ swiftrun -site midway tutorial/modis04.swift

Modified: SwiftApps/modis/tutorial/modis04.swift
===================================================================
--- SwiftApps/modis/tutorial/modis04.swift	2013-02-15 10:58:22 UTC (rev 6277)
+++ SwiftApps/modis/tutorial/modis04.swift	2013-02-15 11:33:21 UTC (rev 6278)
@@ -18,10 +18,10 @@
 }
 
 # Constants and command line arguments
-int nFiles       = @toInt(@arg("nfiles"));
-int nSelect      = @toInt(@arg("nselect"));
-string landType  = @arg("landtype");
-string MODISdir  = @arg("modisdir");
+int nFiles       = @toInt(@arg("nfiles", "1000"));
+int nSelect      = @toInt(@arg("nselect", "10"));
+string landType  = @arg("landtype", "urban");
+string MODISdir  = @arg("modisdir", "../data/modis/2002");
 
 # Input Dataset
 imagefile geos[] <ext; exec="../bin/modis.mapper", location=MODISdir, suffix=".pgm.gz", n=nFiles>;