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

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2014-12-12 16:56:21 -0600 (Fri, 12 Dec 2014)
New Revision: 8344

Modified:
   SwiftApps/dsp-swift/apps
   SwiftApps/dsp-swift/dsp.blues.swift
   SwiftApps/dsp-swift/swiftjumpdsp.py
   SwiftApps/dsp-swift/swiftjumpdsp.xml
Log:
more refinements

Modified: SwiftApps/dsp-swift/apps
===================================================================
--- SwiftApps/dsp-swift/apps	2014-12-12 21:48:06 UTC (rev 8343)
+++ SwiftApps/dsp-swift/apps	2014-12-12 22:56:21 UTC (rev 8344)
@@ -6,6 +6,7 @@
 cluster2 bgsh /home/ketan/SwiftApps/subjobs/bg.sh null null null
 #
 blues dsp /lcrc/project/NEXTGENOPT/DSP/Dsp null null null
+blues plotme /home/ketan/SwiftApps/dsp-swift/plotme null null null
 #
 blues lammps lmp_blues null null null
 blues smeagol /home/heinonen/smeagol-1.2-Feb-2014/smeagol-1.2_blues/Src/smeagol-1.2_csg null null null

Modified: SwiftApps/dsp-swift/dsp.blues.swift
===================================================================
--- SwiftApps/dsp-swift/dsp.blues.swift	2014-12-12 21:48:06 UTC (rev 8343)
+++ SwiftApps/dsp-swift/dsp.blues.swift	2014-12-12 22:56:21 UTC (rev 8344)
@@ -18,6 +18,13 @@
    dsp "-f" _filespath "-a" _a "-n" _n "-p" _p "-I" _I stdout=@_out stderr=@_err; 
 }
 
+
+/* == Plot app definition == */
+app (file _img) plot_app (file[] _fromdsp)
+{
+   plotme @_img @_fromdsp; 
+}
+
 /* == Input files definitions: Make sure these files are available in the current directory == */
 string inloc=arg("loc","/lcrc/project/NEXTGENOPT/DSP_old/examples/smps/dcap");
 
@@ -32,6 +39,8 @@
 
 string outdir=arg("outloc","outdir");
 
+file outs[];
+
 foreach in_tim,i in timfiles{
 
   /* == Output files definitions == */
@@ -39,6 +48,15 @@
   file err <single_file_mapper; file=strcat(outdir, "/std_", i, ".err")>;
   string filespath[]=strsplit(filename(in_tim),"\\.");
 
+  //tracef(" stofiles[%i] = %s\ncorfiles[%i] = %s\ntimfiles[%i] = %s\n", i, filename(stofiles[i]), i, filename(corfiles[i]), i, filename(timfiles[i]));
+
   /* == App invocation == */
   (out, err) = dsp_app (filespath[0], stofiles[i], corfiles[i], timfiles[i], a, n, p, I);
-}                             
+  outs[i]=out;
+}             
+
+file img<"img.png">;
+
+//img=plot_app(outs);
+
+                

Modified: SwiftApps/dsp-swift/swiftjumpdsp.py
===================================================================
--- SwiftApps/dsp-swift/swiftjumpdsp.py	2014-12-12 21:48:06 UTC (rev 8343)
+++ SwiftApps/dsp-swift/swiftjumpdsp.py	2014-12-12 22:56:21 UTC (rev 8344)
@@ -43,6 +43,7 @@
         local_or_compute = next(myargs)
         outloc = next(myargs)
         outlistfile = next(myargs)
+        logfile=next(myargs)
     except:
         traceback.print_exc()
         sys.exit(1)
@@ -57,10 +58,9 @@
         siteval=baseloc+"/sites.blues.xml"
 
     #Invocation
-    logfile="/tmp/std.err"
     with open(logfile,"wb") as errfile:
         exitcode=subprocess.check_call([swift, "-sites.file", siteval, "-tc.file", baseloc+"/apps", "-config", baseloc+"/cf", baseloc+"/dsp.blues.swift", swiftargs],stderr=errfile)
-    print exitcode
+    #print exitcode
 
     #Populate output file
     outlist=subprocess.check_output(["find", outloc, "-type", "f", "-iname", "*.out"])

Modified: SwiftApps/dsp-swift/swiftjumpdsp.xml
===================================================================
--- SwiftApps/dsp-swift/swiftjumpdsp.xml	2014-12-12 21:48:06 UTC (rev 8343)
+++ SwiftApps/dsp-swift/swiftjumpdsp.xml	2014-12-12 22:56:21 UTC (rev 8344)
@@ -20,6 +20,7 @@
         "${local_or_compute}"
         "${resloc}"
         "${outlist}"
+        "${outlogfile}"
     </command>
     <inputs>
         <param name="inlocation" size="60" type="text" label="inlocation" value="/home/ketan/SwiftApps/dsp-swift/dcap" help="Enter the path of the directory containing input data, eg. /home/ketan/farmer" />
@@ -35,6 +36,7 @@
     </inputs>
     <outputs>
         <data format="txt" name="outlist" type="data" label="Output List" />
+        <data format="txt" name="outlogfile" type="data" label="Swift Progress" />
     </outputs>
 <help>
     **What is this?**