[Swift-commit] r6923 - in SwiftTutorials/CIC_2013-08-09: . OLD bin part02 part04 part06

[wilde at ci.uchicago.edu]

Author: wilde
Date: 2013-08-21 16:53:21 -0500 (Wed, 21 Aug 2013)
New Revision: 6923

Added:
   SwiftTutorials/CIC_2013-08-09/OLD/part03/
   SwiftTutorials/CIC_2013-08-09/OLD/part05/
Removed:
   SwiftTutorials/CIC_2013-08-09/part03/
   SwiftTutorials/CIC_2013-08-09/part05/
Modified:
   SwiftTutorials/CIC_2013-08-09/bin/cleanup
   SwiftTutorials/CIC_2013-08-09/part02/sites.xml
   SwiftTutorials/CIC_2013-08-09/part04/p4.swift
   SwiftTutorials/CIC_2013-08-09/part04/sites.xml
   SwiftTutorials/CIC_2013-08-09/part06/p6.swift
Log:
Changes for CIC

Modified: SwiftTutorials/CIC_2013-08-09/bin/cleanup
===================================================================
--- SwiftTutorials/CIC_2013-08-09/bin/cleanup	2013-08-21 20:44:20 UTC (rev 6922)
+++ SwiftTutorials/CIC_2013-08-09/bin/cleanup	2013-08-21 21:53:21 UTC (rev 6923)
@@ -1,2 +1,2 @@
-rm -rf *.log *.rlog *.d *.kml *.swiftx *.out output outdir logs hi.* _concurrent swiftwork
+rm -rf *.log *.rlog *.d p?-*-*-* *.kml *.swiftx *.out output outdir logs hi.* _concurrent swiftwork swifttmp
 

Modified: SwiftTutorials/CIC_2013-08-09/part02/sites.xml
===================================================================
--- SwiftTutorials/CIC_2013-08-09/part02/sites.xml	2013-08-21 20:44:20 UTC (rev 6922)
+++ SwiftTutorials/CIC_2013-08-09/part02/sites.xml	2013-08-21 21:53:21 UTC (rev 6923)
@@ -1,4 +1,5 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
    <pool handle="localhost">
       <execution provider="coaster" jobmanager="local:local"/>
       <profile namespace="karajan" key="jobThrottle">0</profile>

Modified: SwiftTutorials/CIC_2013-08-09/part04/p4.swift
===================================================================
--- SwiftTutorials/CIC_2013-08-09/part04/p4.swift	2013-08-21 20:44:20 UTC (rev 6922)
+++ SwiftTutorials/CIC_2013-08-09/part04/p4.swift	2013-08-21 21:53:21 UTC (rev 6923)
@@ -1,12 +1,17 @@
 type file;
 
-app (file o) mysim ()
+app (file o) mysim (int steps, int values)
 {
-  simulate stdout=@filename(o);
+  simulate "--timesteps" steps "--nvalues" values stdout=@filename(o);
 }
 
-foreach i in [0:9] {
+int nsim   = @toInt(@arg("nsim","10"));
+int steps  = @toInt(@arg("steps","1"));
+int values = @toInt(@arg("values","5"));
+
+tracef("Number of sims: %i, steps: %i, values per sim: %i\n", nsim, steps, values);
+
+foreach i in [0:nsim-1] {
   file f <single_file_mapper; file=@strcat("output/sim_",i,".out")>;
-  f = mysim();
+  f = mysim(steps,values);
 }
-

Modified: SwiftTutorials/CIC_2013-08-09/part04/sites.xml
===================================================================
--- SwiftTutorials/CIC_2013-08-09/part04/sites.xml	2013-08-21 20:44:20 UTC (rev 6922)
+++ SwiftTutorials/CIC_2013-08-09/part04/sites.xml	2013-08-21 21:53:21 UTC (rev 6923)
@@ -1,9 +1,10 @@
-<config>
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
    <pool handle="localhost">
       <execution provider="coaster" jobmanager="local:local"/>
-      <profile namespace="karajan" key="jobThrottle">0</profile>
+      <profile namespace="karajan" key="jobThrottle">.04</profile>
       <profile namespace="karajan" key="initialScore">10000</profile>
       <filesystem provider="local"/>
-      <workdirectory>{env.HOME}/work</workdirectory>
+      <workdirectory>swifttmp</workdirectory>
    </pool>
 </config>

Modified: SwiftTutorials/CIC_2013-08-09/part06/p6.swift
===================================================================
--- SwiftTutorials/CIC_2013-08-09/part06/p6.swift	2013-08-21 20:44:20 UTC (rev 6922)
+++ SwiftTutorials/CIC_2013-08-09/part06/p6.swift	2013-08-21 21:53:21 UTC (rev 6923)
@@ -1,8 +1,8 @@
 type file;
 
-app (file o) mysim (int timesteps)
+app (file o) mysim (int steps, int values)
 {
-  simulate timesteps stdout=@filename(o);
+  simulate "--timesteps" steps "--nvalues" values stdout=@filename(o);
 }
 
 app (file o) analyze (file s[])
@@ -10,15 +10,18 @@
   stats @filenames(s) stdout=@filename(o);
 }
 
+int nsim   = @toInt(@arg("nsim","10"));
+int steps  = @toInt(@arg("steps","1"));
+int values = @toInt(@arg("values","5"));
+
 file sims[];
-int  nsim = @toInt(@arg("nsim","10"));
-int steps = @toInt(@arg("steps","1"));
 
 foreach i in [0:nsim-1] {
   file simout <single_file_mapper; file=@strcat("output/sim_",i,".out")>;
-  simout = mysim(steps);
+  simout = mysim(steps,values);
   sims[i] = simout;
 }
 
 file stats<"output/average.out">;
 stats = analyze(sims);
+