[Swift-commit] r4193 - in text/parco10submission: . code

noreply at svn.ci.uchicago.edu noreply at svn.ci.uchicago.edu
Thu Mar 17 14:15:40 CDT 2011


Author: wozniak
Date: 2011-03-17 14:15:40 -0500 (Thu, 17 Mar 2011)
New Revision: 4193

Added:
   text/parco10submission/glass.swift
   text/parco10submission/glassRunCavities.swift.ORIG
   text/parco10submission/modis.list
   text/parco10submission/modis.swift
Removed:
   text/parco10submission/code/glass.swift
   text/parco10submission/code/glassRunCavities.swift.ORIG
   text/parco10submission/code/modis.list
   text/parco10submission/code/modis.swift
Modified:
   text/parco10submission/paper.tex
Log:
Flatten code directory and update paths in tex file


Deleted: text/parco10submission/code/glass.swift
===================================================================
--- text/parco10submission/code/glass.swift	2011-03-17 19:12:52 UTC (rev 4192)
+++ text/parco10submission/code/glass.swift	2011-03-17 19:15:40 UTC (rev 4193)
@@ -1,80 +0,0 @@
-type Text;
-type Arc;
-type Restart;
-type Log;
-type Active;
-
-type GlassIn{
-    Restart startfile;
-    Active activefile;
-}
-
-type GlassOut{
-    Arc arcfile;
-    Active activefile;
-    Restart restartfile;
-    Restart startfile;
-    Restart final;
-    Log logfile;
-}
-
-app (GlassOut o) glassCavityRun
-    (GlassIn i, string rad, string temp, string steps, string volume, string fraca,
-     string energyfunction, string centerstring, string arctimestring)
-{   glassRun
-      "-a" @filename(o.final) "--lf" @filename(i.startfile) stdout=@filename(o.logfile)
-      "--temp" temp "--stepsperparticle" steps "--energy_function" energyfunction
-      "--volume" volume "--fraca" fraca
-      "--cradius" rad "--ccoord" centerstring arctimestring;
-}
-
-GlassRun()
-{
-  string temp=@arg("temp","2.0");
-  string steps=@arg("steps","10");
-  string esteps=@arg("esteps","100");
-  string ceqsteps=@arg("ceqsteps","100");
-  string natoms=@arg("natoms","200");
-  string volume=@arg("volume","200");
-  string rlist=@arg("rlist","rlist");
-  string clist=@arg("clist","clist");
-  string fraca=@arg("fraca","0.5");
-  string radii[] = readData(rlist);
-  string centers[] = readData(clist);
-  int nmodels=@toint( @arg("n","1") );
-  int nsub=@toint( @arg("nsub","1") );
-  string savearc=@arg("savearc","FALSE");
-  string arctimestring;
-  string energyfunction=@arg("energyfunction","softsphereratiosmooth");
-
-  if(savearc=="FALSE") {
-    arctimestring="--arc_time=10000000";
-  }
-  else{
-    arctimestring="";
-  }
-
-  GlassIn modelIn[][][] <ext; exec="GlassCavityOutArray.map",
-    rlist=rlist, clist=clist, steps=ceqsteps, n=nmodels, esteps=esteps, temp=temp,
-    volume=volume, e=energyfunction, natoms=natoms, i="true">;
-
-  GlassOut modelOut[][][][] <ext; exec="GlassCavityContinueOutArray.map",
-    n=nmodels, nsub=nsub, rlist=rlist, clist=clist, ceqsteps=ceqsteps, esteps=esteps,
-    steps=steps, temp=temp, volume=volume, e=energyfunction, natoms=natoms>;
-
-  foreach rad,rindex in radii {
-    foreach centerstring,cindex in centers {
-      foreach model in [0:nmodels-1] {
-        foreach job in [0:nsub-1] {
-          if( !(@filename(modelOut[rindex][cindex][model][job].final)=="NULL") ) {
-            modelOut[rindex][cindex][model][job] = glassCavityRun(
-              modelIn[rindex][cindex][model], rad, temp, steps, volume, fraca,
-              energyfunction, centerstring, arctimestring);
-          }
-        }
-      }
-    }
-  }
-}
-
-GlassRun();
\ No newline at end of file

Deleted: text/parco10submission/code/glassRunCavities.swift.ORIG
===================================================================
--- text/parco10submission/code/glassRunCavities.swift.ORIG	2011-03-17 19:12:52 UTC (rev 4192)
+++ text/parco10submission/code/glassRunCavities.swift.ORIG	2011-03-17 19:15:40 UTC (rev 4193)
@@ -1,123 +0,0 @@
-type file;
-type Text;
-
-type Arc;
-type Restart;
-type Log;
-type Active;
-
-type GlassOut{
-    Arc arcfile;
-    Active activefile;
-    Restart restartfile;
-    Restart startfile;
-    Restart final;
-    Log logfile;
-}
-
-type GlassIn{
-    Restart startfile;
-    Active activefile;
-}
-
-// Lib functions (to be moved to imported file
-
-app (file o) echoi (int i)     { echo i stdout=@o;}
-app (file o) echof (float f)   { echo f stdout=@o;}
-app (file o) echob (boolean b) { echo b stdout=@o;}
-app (file o) echos (string s)  { echo s stdout=@o;}
-
-(string s) itostr (int i)
-{
-  file f;
-  f = echoi(i);
-  s = readData(f);
-}
-
-(string s) ftostr (float n)
-{
-  file f;
-  f = echof(n);
-  s = readData(f);
-}
-
-(int n) strtoi (string s)
-{
-  file f;
-  f = echos(s);
-  n = readData(f);
-}
-
-(float n) strtof (string s)
-{
-  file f;
-  f = echos(s);
-  n = readData(f);
-}
-
-app (file o) sprintfsApp (string fmt, string e[])
-{
-  sprintfs fmt e stdout=@o;
-}
-
-(string s) sprintfs (string fmt, string e[])
-{
-  file f;
-  f = sprintfsApp(fmt,e);
-  s = readData(f);
-}
-
-//glassSim app declarations
-//app (int result) multiply(int a,int b)
-//{
-//    file f;
-//    multiply a b stdout=@filename(f);
-//    result=readData(f);
-//}
-
-app (GlassOut o) glassCavityRun(GlassIn i,string rad,string temp,string steps,string volume,string fraca,string energyfunction,string centerstring,string arctimestring)
-{
-    glassRun "-a" @filename(o.final) "--lf" @filename(i.startfile) "--temp" temp "--stepsperparticle" steps "--volume" volume "--fraca" fraca "--energy_function" energyfunction "--cradius" rad "--ccoord" centerstring arctimestring stdout=@filename(o.logfile);
-}
-
-CreateGlassSystem()
-{
-    string temp=@arg("temp","2.0");
-    string steps=@arg("steps","10");
-    string esteps=@arg("esteps","100");
-    string ceqsteps=@arg("ceqsteps","100");
-    string natoms=@arg("natoms","200");
-    string volume=@arg("volume","200");
-    string rlist=@arg("rlist","rlist");
-    string clist=@arg("clist","clist");
-    string fraca=@arg("fraca","0.5");
-    string radii[] = readData(rlist);
-    string centers[] = readData(clist);
-    int nmodels=strtoi( @arg("n","1") );
-    int nsub=strtoi( @arg("nsub","1") );
-//    int njobs=nsub*nmodels;
-    string savearc=@arg("savearc","FALSE");
-    string arctimestring;
-    if(savearc=="FALSE") {
-        arctimestring="--arc_time=10000000";
-    }
-    else{
-        arctimestring="";
-    }
-    string energyfunction=@arg("energyfunction","softsphereratiosmooth");
-    GlassIn modelIn[][][] <ext;exec="GlassCavityOutArray.map",rlist=rlist,clist=clist,steps=ceqsteps,n=nmodels,esteps=esteps,temp=temp,volume=volume,e=energyfunction,natoms=natoms,i="true">; 
-    GlassOut modelOut[][][][] <ext;exec="GlassCavityContinueOutArray.map",n=nmodels,nsub=nsub,rlist=rlist,clist=clist,ceqsteps=ceqsteps,esteps=esteps,steps=steps,temp=temp,volume=volume,e=energyfunction,natoms=natoms>;
-    foreach rad,rindex in radii {
-        foreach centerstring,cindex in centers {
-            foreach model in [0:nmodels-1] {
-                foreach job in [0:nsub-1] {
-                    if( !(@filename(modelOut[rindex][cindex][model][job].final)=="NULL") ){
-                        modelOut[rindex][cindex][model][job]=glassCavityRun(modelIn[rindex][cindex][model],rad,temp,steps,volume,fraca,energyfunction,centerstring,arctimestring);
-                    }
-                }
-            }
-        }
-    }
-}
-
-CreateGlassSystem();

Deleted: text/parco10submission/code/modis.list
===================================================================
--- text/parco10submission/code/modis.list	2011-03-17 19:12:52 UTC (rev 4192)
+++ text/parco10submission/code/modis.list	2011-03-17 19:15:40 UTC (rev 4193)
@@ -1,6 +0,0 @@
-$ ./modis.mapper -location /home/wilde/modis/2002/ -suffix .tif -n 5
-[0] /home/wilde/modis/2002/h00v08.tif
-[1] /home/wilde/modis/2002/h00v09.tif
-[2] /home/wilde/modis/2002/h00v10.tif
-[3] /home/wilde/modis/2002/h01v07.tif
-[4] /home/wilde/modis/2002/h01v08.tif

Deleted: text/parco10submission/code/modis.swift
===================================================================
--- text/parco10submission/code/modis.swift	2011-03-17 19:12:52 UTC (rev 4192)
+++ text/parco10submission/code/modis.swift	2011-03-17 19:15:40 UTC (rev 4193)
@@ -1,83 +0,0 @@
-type file;
-type MODIS; type image;
-type landuse;
-
-# Define application program interfaces
-
-app (landuse output) getLandUse (imagefile input, int sortfield)
-{
-  getlanduse @input sortfield stdout=@output;
-}
-
-app (file output, file tilelist) analyzeLandUse
-    (MODIS input[], string usetype, int maxnum)
-{
-  analyzelanduse @output @tilelist usetype maxnum @filenames(input);
-}
-
-app (image output) colorMODIS (MODIS input)
-{
-  colormodis @input @output;
-}
-
-app (image output) assemble
-    (file selected, image img[], string webdir)
-{
-  assemble @output @selected @filename(img[0]) webdir;
-}
-
-app (image grid) markMap (file tilelist) 
-{
-  markmap @tilelist @grid;
-}
-
-# Constants and command line arguments
-
-int nFiles =      @toint(@arg("nfiles","1000"));
-int nSelect =     @toint(@arg("nselect","12"));
-string landType = @arg("landtype","urban");
-string runID =    @arg("runid","modis-run");
-string MODISdir=  @arg("modisdir","/home/wilde/bigdata/data/modis/2002");
-string webDir =   @arg("webdir","/home/wilde/public_html/geo/");
-
-
-
-# Input Dataset
-
-image geos[] <ext; exec="modis.mapper",
-  location=MODISdir, suffix=".tif", n=nFiles >;
-
-# Compute the land use summary of each MODIS tile
-
-landuse land[] <structured_regexp_mapper; source=geos, match="(h..v..)",
-  transform=@strcat(runID,"/\\1.landuse.byfreq")>;
-
-foreach g,i in geos {
-    land[i] = getLandUse(g,1);
-}
-
-# Find the top N tiles (by total area of selected landuse types)
-
-file topSelected <"topselected.txt">;
-file selectedTiles <"selectedtiles.txt">;
-(topSelected, selectedTiles) = analyzeLandUse(land, landType, nSelect);
-
-# Mark the top N tiles on a sinusoidal gridded map
-
-image gridMap <"markedGrid.gif">;
-gridMap = markMap(topSelected);
-
-# Create multi-color images for all tiles
-
-image colorImage[] <structured_regexp_mapper;
-          source=geos, match="(h..v..)",
-          transform="landuse/\\1.color.png">;
-
-foreach g, i in geos {
-  colorImage[i] = colorMODIS(g);
-}
-
-# Assemble a montage of the top selected areas
-
-image montage <single_file_mapper; file=@strcat(runID,"/","map.png") >; # @arg
-montage = assemble(selectedTiles,colorImage,webDir);
\ No newline at end of file

Copied: text/parco10submission/glass.swift (from rev 4189, text/parco10submission/code/glass.swift)
===================================================================
--- text/parco10submission/glass.swift	                        (rev 0)
+++ text/parco10submission/glass.swift	2011-03-17 19:15:40 UTC (rev 4193)
@@ -0,0 +1,80 @@
+type Text;
+type Arc;
+type Restart;
+type Log;
+type Active;
+
+type GlassIn{
+    Restart startfile;
+    Active activefile;
+}
+
+type GlassOut{
+    Arc arcfile;
+    Active activefile;
+    Restart restartfile;
+    Restart startfile;
+    Restart final;
+    Log logfile;
+}
+
+app (GlassOut o) glassCavityRun
+    (GlassIn i, string rad, string temp, string steps, string volume, string fraca,
+     string energyfunction, string centerstring, string arctimestring)
+{   glassRun
+      "-a" @filename(o.final) "--lf" @filename(i.startfile) stdout=@filename(o.logfile)
+      "--temp" temp "--stepsperparticle" steps "--energy_function" energyfunction
+      "--volume" volume "--fraca" fraca
+      "--cradius" rad "--ccoord" centerstring arctimestring;
+}
+
+GlassRun()
+{
+  string temp=@arg("temp","2.0");
+  string steps=@arg("steps","10");
+  string esteps=@arg("esteps","100");
+  string ceqsteps=@arg("ceqsteps","100");
+  string natoms=@arg("natoms","200");
+  string volume=@arg("volume","200");
+  string rlist=@arg("rlist","rlist");
+  string clist=@arg("clist","clist");
+  string fraca=@arg("fraca","0.5");
+  string radii[] = readData(rlist);
+  string centers[] = readData(clist);
+  int nmodels=@toint( @arg("n","1") );
+  int nsub=@toint( @arg("nsub","1") );
+  string savearc=@arg("savearc","FALSE");
+  string arctimestring;
+  string energyfunction=@arg("energyfunction","softsphereratiosmooth");
+
+  if(savearc=="FALSE") {
+    arctimestring="--arc_time=10000000";
+  }
+  else{
+    arctimestring="";
+  }
+
+  GlassIn modelIn[][][] <ext; exec="GlassCavityOutArray.map",
+    rlist=rlist, clist=clist, steps=ceqsteps, n=nmodels, esteps=esteps, temp=temp,
+    volume=volume, e=energyfunction, natoms=natoms, i="true">;
+
+  GlassOut modelOut[][][][] <ext; exec="GlassCavityContinueOutArray.map",
+    n=nmodels, nsub=nsub, rlist=rlist, clist=clist, ceqsteps=ceqsteps, esteps=esteps,
+    steps=steps, temp=temp, volume=volume, e=energyfunction, natoms=natoms>;
+
+  foreach rad,rindex in radii {
+    foreach centerstring,cindex in centers {
+      foreach model in [0:nmodels-1] {
+        foreach job in [0:nsub-1] {
+          if( !(@filename(modelOut[rindex][cindex][model][job].final)=="NULL") ) {
+            modelOut[rindex][cindex][model][job] = glassCavityRun(
+              modelIn[rindex][cindex][model], rad, temp, steps, volume, fraca,
+              energyfunction, centerstring, arctimestring);
+          }
+        }
+      }
+    }
+  }
+}
+
+GlassRun();
\ No newline at end of file

Copied: text/parco10submission/glassRunCavities.swift.ORIG (from rev 4189, text/parco10submission/code/glassRunCavities.swift.ORIG)
===================================================================
--- text/parco10submission/glassRunCavities.swift.ORIG	                        (rev 0)
+++ text/parco10submission/glassRunCavities.swift.ORIG	2011-03-17 19:15:40 UTC (rev 4193)
@@ -0,0 +1,123 @@
+type file;
+type Text;
+
+type Arc;
+type Restart;
+type Log;
+type Active;
+
+type GlassOut{
+    Arc arcfile;
+    Active activefile;
+    Restart restartfile;
+    Restart startfile;
+    Restart final;
+    Log logfile;
+}
+
+type GlassIn{
+    Restart startfile;
+    Active activefile;
+}
+
+// Lib functions (to be moved to imported file
+
+app (file o) echoi (int i)     { echo i stdout=@o;}
+app (file o) echof (float f)   { echo f stdout=@o;}
+app (file o) echob (boolean b) { echo b stdout=@o;}
+app (file o) echos (string s)  { echo s stdout=@o;}
+
+(string s) itostr (int i)
+{
+  file f;
+  f = echoi(i);
+  s = readData(f);
+}
+
+(string s) ftostr (float n)
+{
+  file f;
+  f = echof(n);
+  s = readData(f);
+}
+
+(int n) strtoi (string s)
+{
+  file f;
+  f = echos(s);
+  n = readData(f);
+}
+
+(float n) strtof (string s)
+{
+  file f;
+  f = echos(s);
+  n = readData(f);
+}
+
+app (file o) sprintfsApp (string fmt, string e[])
+{
+  sprintfs fmt e stdout=@o;
+}
+
+(string s) sprintfs (string fmt, string e[])
+{
+  file f;
+  f = sprintfsApp(fmt,e);
+  s = readData(f);
+}
+
+//glassSim app declarations
+//app (int result) multiply(int a,int b)
+//{
+//    file f;
+//    multiply a b stdout=@filename(f);
+//    result=readData(f);
+//}
+
+app (GlassOut o) glassCavityRun(GlassIn i,string rad,string temp,string steps,string volume,string fraca,string energyfunction,string centerstring,string arctimestring)
+{
+    glassRun "-a" @filename(o.final) "--lf" @filename(i.startfile) "--temp" temp "--stepsperparticle" steps "--volume" volume "--fraca" fraca "--energy_function" energyfunction "--cradius" rad "--ccoord" centerstring arctimestring stdout=@filename(o.logfile);
+}
+
+CreateGlassSystem()
+{
+    string temp=@arg("temp","2.0");
+    string steps=@arg("steps","10");
+    string esteps=@arg("esteps","100");
+    string ceqsteps=@arg("ceqsteps","100");
+    string natoms=@arg("natoms","200");
+    string volume=@arg("volume","200");
+    string rlist=@arg("rlist","rlist");
+    string clist=@arg("clist","clist");
+    string fraca=@arg("fraca","0.5");
+    string radii[] = readData(rlist);
+    string centers[] = readData(clist);
+    int nmodels=strtoi( @arg("n","1") );
+    int nsub=strtoi( @arg("nsub","1") );
+//    int njobs=nsub*nmodels;
+    string savearc=@arg("savearc","FALSE");
+    string arctimestring;
+    if(savearc=="FALSE") {
+        arctimestring="--arc_time=10000000";
+    }
+    else{
+        arctimestring="";
+    }
+    string energyfunction=@arg("energyfunction","softsphereratiosmooth");
+    GlassIn modelIn[][][] <ext;exec="GlassCavityOutArray.map",rlist=rlist,clist=clist,steps=ceqsteps,n=nmodels,esteps=esteps,temp=temp,volume=volume,e=energyfunction,natoms=natoms,i="true">; 
+    GlassOut modelOut[][][][] <ext;exec="GlassCavityContinueOutArray.map",n=nmodels,nsub=nsub,rlist=rlist,clist=clist,ceqsteps=ceqsteps,esteps=esteps,steps=steps,temp=temp,volume=volume,e=energyfunction,natoms=natoms>;
+    foreach rad,rindex in radii {
+        foreach centerstring,cindex in centers {
+            foreach model in [0:nmodels-1] {
+                foreach job in [0:nsub-1] {
+                    if( !(@filename(modelOut[rindex][cindex][model][job].final)=="NULL") ){
+                        modelOut[rindex][cindex][model][job]=glassCavityRun(modelIn[rindex][cindex][model],rad,temp,steps,volume,fraca,energyfunction,centerstring,arctimestring);
+                    }
+                }
+            }
+        }
+    }
+}
+
+CreateGlassSystem();

Copied: text/parco10submission/modis.list (from rev 4189, text/parco10submission/code/modis.list)
===================================================================
--- text/parco10submission/modis.list	                        (rev 0)
+++ text/parco10submission/modis.list	2011-03-17 19:15:40 UTC (rev 4193)
@@ -0,0 +1,6 @@
+$ ./modis.mapper -location /home/wilde/modis/2002/ -suffix .tif -n 5
+[0] /home/wilde/modis/2002/h00v08.tif
+[1] /home/wilde/modis/2002/h00v09.tif
+[2] /home/wilde/modis/2002/h00v10.tif
+[3] /home/wilde/modis/2002/h01v07.tif
+[4] /home/wilde/modis/2002/h01v08.tif

Copied: text/parco10submission/modis.swift (from rev 4189, text/parco10submission/code/modis.swift)
===================================================================
--- text/parco10submission/modis.swift	                        (rev 0)
+++ text/parco10submission/modis.swift	2011-03-17 19:15:40 UTC (rev 4193)
@@ -0,0 +1,83 @@
+type file;
+type MODIS; type image;
+type landuse;
+
+# Define application program interfaces
+
+app (landuse output) getLandUse (imagefile input, int sortfield)
+{
+  getlanduse @input sortfield stdout=@output;
+}
+
+app (file output, file tilelist) analyzeLandUse
+    (MODIS input[], string usetype, int maxnum)
+{
+  analyzelanduse @output @tilelist usetype maxnum @filenames(input);
+}
+
+app (image output) colorMODIS (MODIS input)
+{
+  colormodis @input @output;
+}
+
+app (image output) assemble
+    (file selected, image img[], string webdir)
+{
+  assemble @output @selected @filename(img[0]) webdir;
+}
+
+app (image grid) markMap (file tilelist) 
+{
+  markmap @tilelist @grid;
+}
+
+# Constants and command line arguments
+
+int nFiles =      @toint(@arg("nfiles","1000"));
+int nSelect =     @toint(@arg("nselect","12"));
+string landType = @arg("landtype","urban");
+string runID =    @arg("runid","modis-run");
+string MODISdir=  @arg("modisdir","/home/wilde/bigdata/data/modis/2002");
+string webDir =   @arg("webdir","/home/wilde/public_html/geo/");
+
+
+
+# Input Dataset
+
+image geos[] <ext; exec="modis.mapper",
+  location=MODISdir, suffix=".tif", n=nFiles >;
+
+# Compute the land use summary of each MODIS tile
+
+landuse land[] <structured_regexp_mapper; source=geos, match="(h..v..)",
+  transform=@strcat(runID,"/\\1.landuse.byfreq")>;
+
+foreach g,i in geos {
+    land[i] = getLandUse(g,1);
+}
+
+# Find the top N tiles (by total area of selected landuse types)
+
+file topSelected <"topselected.txt">;
+file selectedTiles <"selectedtiles.txt">;
+(topSelected, selectedTiles) = analyzeLandUse(land, landType, nSelect);
+
+# Mark the top N tiles on a sinusoidal gridded map
+
+image gridMap <"markedGrid.gif">;
+gridMap = markMap(topSelected);
+
+# Create multi-color images for all tiles
+
+image colorImage[] <structured_regexp_mapper;
+          source=geos, match="(h..v..)",
+          transform="landuse/\\1.color.png">;
+
+foreach g, i in geos {
+  colorImage[i] = colorMODIS(g);
+}
+
+# Assemble a montage of the top selected areas
+
+image montage <single_file_mapper; file=@strcat(runID,"/","map.png") >; # @arg
+montage = assemble(selectedTiles,colorImage,webDir);
\ No newline at end of file

Modified: text/parco10submission/paper.tex
===================================================================
--- text/parco10submission/paper.tex	2011-03-17 19:12:52 UTC (rev 4192)
+++ text/parco10submission/paper.tex	2011-03-17 19:15:40 UTC (rev 4193)
@@ -846,7 +846,7 @@
 
 \begin{figure*}[htbp]
   \begin{center}
-    \includegraphics{img/swift-model}
+    \includegraphics{swift-model}
     \caption{Swift site model (CoG = Commodity Grid~\cite{Karajan},
       OSG = Open Science Grid, AWS = Amazon Web Services, HPC =
       high-performance computing system, BG/P = Blue Gene/P).}
@@ -1110,7 +1110,7 @@
 name being mapped.  For example, if this mapper invocation were called
 from the Swift script at lines 47--48:
 
-\VerbatimInput[fontsize=\scriptsize] {code/modis.list}
+\VerbatimInput[fontsize=\scriptsize] {modis.list}
 
 it would cause the first five elements of the array {\tt geos} to be mapped to the first five files of the modis dataset in the specified directory.
 
@@ -1152,7 +1152,7 @@
 \\
 {\bf \small Swift example 1: MODIS satellite image processing script}
 \VerbatimInput[fontsize=\scriptsize,frame=single,framesep=2mm,
-  numbers=left] {code/modis.swift}
+  numbers=left] {modis.swift}
 
 \subsection{Simulation of glass cavity dynamics and thermodynamics}
 
@@ -1230,7 +1230,7 @@
 resources would be prohibitive.
 
 {\bf \small Swift example 2: Monte-Carlo simulation of glass cavity dynamics}
-\VerbatimInput[fontsize=\scriptsize,frame=single,framesep=2mm, numbers=left] {code/glass.swift}
+\VerbatimInput[fontsize=\scriptsize,frame=single,framesep=2mm, numbers=left] {glass.swift}
 
 \section{Performance characteristics\label{Performance}}
 
@@ -1269,8 +1269,8 @@
   \begin{center}
   {\footnotesize
     \begin{tabular}{p{7cm}p{7cm}}
-     \includegraphics[scale=\plotscale]{plots/multicore} &
-     \includegraphics[scale=\plotscale]{plots/sleep} \\
+     \includegraphics[scale=\plotscale]{multicore} &
+     \includegraphics[scale=\plotscale]{sleep} \\
       Test A.
       Application CPU utilization for 3 task durations
       (in seconds) with up to 200 concurrent processes on an 16-core
@@ -1313,7 +1313,7 @@
   \begin{center}
   {\footnotesize
     \begin{tabular}{p{14 cm}}
-      \includegraphics[scale=.4]{plots/SEM_IO}
+      \includegraphics[scale=.4]{SEM_IO}
     \end{tabular}
     }
     \caption{128K-job SEM fMRI application execution on the Ranger Constellation (from \cite{CNARI_2009}). Red=active compute jobs, blue=data stage in, green=stage out. }
@@ -1331,10 +1331,10 @@
   \begin{center}
   {\footnotesize
     \begin{tabular}{p{7cm}p{7cm}}
-      \includegraphics[scale=.3]{plots/PTMap_top} &
-      \includegraphics[scale=.3]{plots/SEM_top} \\
-      \includegraphics[scale=.3]{plots/PTMap_bottom} &
-      \includegraphics[scale=.3]{plots/SEM_bottom} \\
+      \includegraphics[scale=.3]{PTMap_top} &
+      \includegraphics[scale=.3]{SEM_top} \\
+      \includegraphics[scale=.3]{PTMap_bottom} &
+      \includegraphics[scale=.3]{SEM_bottom} \\
       A. PTMap application on 2,048 nodes of the Blue Gene/P &
       B. SEM application on varying-size processing allocations on Ranger\\
     \end{tabular}




More information about the Swift-commit mailing list