[Swift-commit] r6565 - in SwiftTutorials/CMTS_2013-06-17/basic_swift: part01 part02 part04 part07

[davidk at ci.uchicago.edu]

Author: davidk
Date: 2013-06-17 10:25:18 -0500 (Mon, 17 Jun 2013)
New Revision: 6565

Modified:
   SwiftTutorials/CMTS_2013-06-17/basic_swift/part01/README
   SwiftTutorials/CMTS_2013-06-17/basic_swift/part02/README
   SwiftTutorials/CMTS_2013-06-17/basic_swift/part04/README
   SwiftTutorials/CMTS_2013-06-17/basic_swift/part07/README
   SwiftTutorials/CMTS_2013-06-17/basic_swift/part07/p7.swift
Log:
Fix some inconsistencies with tc/app files, fix scope warning in p7.swift


Modified: SwiftTutorials/CMTS_2013-06-17/basic_swift/part01/README
===================================================================
--- SwiftTutorials/CMTS_2013-06-17/basic_swift/part01/README	2013-06-16 18:15:26 UTC (rev 6564)
+++ SwiftTutorials/CMTS_2013-06-17/basic_swift/part01/README	2013-06-17 15:25:18 UTC (rev 6565)
@@ -37,8 +37,8 @@
 
 Then test the sript a few more times:
 
-  $ swift -tc.file tc p1.swift; cat _concurrent/*
+  $ swift p1.swift; cat _concurrent/*
 
-  $ swift -tc.file tc p1.swift; cat _concurrent/*
+  $ swift p1.swift; cat _concurrent/*
 
-  $ swift -tc.file tc p1.swift; cat _concurrent/*
+  $ swift p1.swift; cat _concurrent/*

Modified: SwiftTutorials/CMTS_2013-06-17/basic_swift/part02/README
===================================================================
--- SwiftTutorials/CMTS_2013-06-17/basic_swift/part02/README	2013-06-16 18:15:26 UTC (rev 6564)
+++ SwiftTutorials/CMTS_2013-06-17/basic_swift/part02/README	2013-06-17 15:25:18 UTC (rev 6565)
@@ -8,11 +8,11 @@
 
 Examine the tool catalog file:
 
-  $ cat tc
+  $ cat apps
 
 Run the program:
 
-  $ swift -tc.file tc p2.swift
+  $ swift p2.swift
 
 Look at the output:
 
@@ -20,11 +20,11 @@
 
 Then test the sript a few more times.
 
-  $ swift -tc.file tc p1.swift; cat sim.out
+  $ swift p2.swift; cat sim.out
 
-  $ swift -tc.file tc p1.swift; cat sim.out
+  $ swift p2.swift; cat sim.out
 
-  $ swift -tc.file tc p1.swift; cat sim.out
+  $ swift p2.swift; cat sim.out
 
 Things to try:
 

Modified: SwiftTutorials/CMTS_2013-06-17/basic_swift/part04/README
===================================================================
--- SwiftTutorials/CMTS_2013-06-17/basic_swift/part04/README	2013-06-16 18:15:26 UTC (rev 6564)
+++ SwiftTutorials/CMTS_2013-06-17/basic_swift/part04/README	2013-06-17 15:25:18 UTC (rev 6565)
@@ -13,7 +13,7 @@
 
 Run the program:
 
-  $ swift -tc.file tc p4.swift
+  $ swift p4.swift
 
 Look at the output:
 

Modified: SwiftTutorials/CMTS_2013-06-17/basic_swift/part07/README
===================================================================
--- SwiftTutorials/CMTS_2013-06-17/basic_swift/part07/README	2013-06-16 18:15:26 UTC (rev 6564)
+++ SwiftTutorials/CMTS_2013-06-17/basic_swift/part07/README	2013-06-17 15:25:18 UTC (rev 6565)
@@ -9,7 +9,7 @@
 indicate that our "simulation app" (random4.sh) should be run on the
 "westmere" partition of the Midway cluster using the "slurm" scheduler:
 
-We changed file "tc" from:
+We changed file "apps" from:
 
   localhost random4  random4.sh
   localhost average  avg.sh

Modified: SwiftTutorials/CMTS_2013-06-17/basic_swift/part07/p7.swift
===================================================================
--- SwiftTutorials/CMTS_2013-06-17/basic_swift/part07/p7.swift	2013-06-16 18:15:26 UTC (rev 6564)
+++ SwiftTutorials/CMTS_2013-06-17/basic_swift/part07/p7.swift	2013-06-17 15:25:18 UTC (rev 6565)
@@ -1,8 +1,8 @@
 type file;
 
-app (file o) mysim4 (int timesteps, int range, int count)
+app (file o) mysim4 (int timesteps, int range_value, int count_value)
 {
-  random4 timesteps range count stdout=@filename(o);
+  random4 timesteps range_value count_value stdout=@filename(o);
 }
 
 app (file o) analyze (file s[])
@@ -12,7 +12,6 @@
 
 file sims[];
 int  nsim  = @toInt(@arg("nsim",  "10"));
-
 int  steps = @toInt(@arg("steps", "1"));
 int  range = @toInt(@arg("range", "100"));
 int  count = @toInt(@arg("count", "10"));