[Swift-commit] r6194 - in SwiftApps/modis: . bin

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-01-30 19:12:30 -0600 (Wed, 30 Jan 2013)
New Revision: 6194

Modified:
   SwiftApps/modis/bin/modis.mapper
   SwiftApps/modis/modis.swift
Log:


Modified: SwiftApps/modis/bin/modis.mapper
===================================================================
--- SwiftApps/modis/bin/modis.mapper	2013-01-30 21:51:41 UTC (rev 6193)
+++ SwiftApps/modis/bin/modis.mapper	2013-01-31 01:12:30 UTC (rev 6194)
@@ -14,7 +14,6 @@
   shift 2
 done
 
-find $location -type f -name 'h??v??'${suffix} -print | head -$n | 
-awk '{printf "[%d] %s\n", NR-1, $1}'
+find $location -type f -name 'h??v??'${suffix} -print | sort | head -$n | 
+awk '{printf "[%d] %s\n", NR-1, $1}' 
 
-

Modified: SwiftApps/modis/modis.swift
===================================================================
--- SwiftApps/modis/modis.swift	2013-01-30 21:51:41 UTC (rev 6193)
+++ SwiftApps/modis/modis.swift	2013-01-31 01:12:30 UTC (rev 6194)
@@ -50,7 +50,7 @@
 # Compute the land use summary of each MODIS tile
 
 landuse land[] <structured_regexp_mapper; source=geos, match="(h..v..)",
-  transform=@strcat("landuse\\1.landuse.byfreq")>;
+  transform=@strcat("landuse/\\1.landuse.byfreq")>;
 
 foreach g,i in geos {
     land[i] = getLandUse(g,1);