[Swift-commit] r8321 - SwiftApps/dsp-swift

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-12-10 18:54:00 -0600 (Wed, 10 Dec 2014)
New Revision: 8321

Modified:
   SwiftApps/dsp-swift/dsp.blues.swift
   SwiftApps/dsp-swift/sites.local.xml
Log:
args

Modified: SwiftApps/dsp-swift/dsp.blues.swift
===================================================================
--- SwiftApps/dsp-swift/dsp.blues.swift	2014-12-10 21:40:07 UTC (rev 8320)
+++ SwiftApps/dsp-swift/dsp.blues.swift	2014-12-11 00:54:00 UTC (rev 8321)
@@ -19,27 +19,24 @@
 }
 
 /* == Input files definitions: Make sure these files are available in the current directory == */
-file farmer_sto <"/lcrc/project/NEXTGENOPT/DSP/examples/smps/farmer/farmer.sto">;
-file farmer_cor <"/lcrc/project/NEXTGENOPT/DSP/examples/smps/farmer/farmer.cor">;
-file farmer_tim <"/lcrc/project/NEXTGENOPT/DSP/examples/smps/farmer/farmer.tim">;
+string inloc=arg("loc","/lcrc/project/NEXTGENOPT/DSP_old/examples/smps/dcap");
 
-file timfiles[]<filesys_mapper; location="./dcap", pattern="*.tim">;
+file stofiles[]<filesys_mapper; location=inloc, pattern="*.sto">;
+file corfiles[]<filesys_mapper; location=inloc, pattern="*.cor">;
+file timfiles[]<filesys_mapper; location=inloc, pattern="*.tim">;
 
+int a=toInt(arg("a","1"));
+int n=toInt(arg("n","1"));
+int p=toInt(arg("p","1"));
+int I=toInt(arg("I","10"));
 
-int a=1;
-int n=1;
-int p=1;
-int I=10;
-
 foreach in_tim,i in timfiles{
 
   /* == Output files definitions == */
   file out <single_file_mapper; file=strcat("outdir/std_", i, ".out")>;
   file err <single_file_mapper; file=strcat("outdir/std_", i, ".err")>;
   string filespath[]=strsplit(filename(in_tim),"\\.");
-  file in_sto <single_file_mapper; file=regexp(filename(in_tim), "tim", "sto")>;
-  file in_cor <single_file_mapper; file=regexp(filename(in_tim), "tim", "cor")>;
 
   /* == App invocation == */
-  (out, err) = dsp_app (filespath[0], in_sto, in_cor, in_tim, a, n, p, I);
+  (out, err) = dsp_app (filespath[0], stofiles[i], corfiles[i], timfiles[i], a, n, p, I);
 }                             

Modified: SwiftApps/dsp-swift/sites.local.xml
===================================================================
--- SwiftApps/dsp-swift/sites.local.xml	2014-12-10 21:40:07 UTC (rev 8320)
+++ SwiftApps/dsp-swift/sites.local.xml	2014-12-11 00:54:00 UTC (rev 8321)
@@ -5,7 +5,7 @@
 -->
 <config xmlns="http://www.ci.uchicago.edu/swift/SwiftSites">
 <pool handle="localblues">
-<execution provider="coaster" url="none" jobmanager="local:local" />
+<execution provider="local" url="none" />
 <profile namespace="globus" key="maxwalltime">09:55:00</profile>
 <profile namespace="globus" key="walltime">35000</profile>
 <profile namespace="globus" key="maxTime">36000</profile>