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

[ketan at ci.uchicago.edu]

Author: ketan
Date: 2015-01-17 16:49:01 -0600 (Sat, 17 Jan 2015)
New Revision: 8362

Modified:
   SwiftApps/dsp-swift/apps
   SwiftApps/dsp-swift/dsp.blues.swift
   SwiftApps/dsp-swift/swiftjumpdsp.py
   SwiftApps/dsp-swift/swiftjumpdsp.xml
Log:
changed path to DSP exec

Modified: SwiftApps/dsp-swift/apps
===================================================================
--- SwiftApps/dsp-swift/apps	2015-01-13 22:04:17 UTC (rev 8361)
+++ SwiftApps/dsp-swift/apps	2015-01-17 22:49:01 UTC (rev 8362)
@@ -5,7 +5,7 @@
 cluster bgsh /home/ketan/SwiftApps/subjobs/bg.sh null null null
 cluster2 bgsh /home/ketan/SwiftApps/subjobs/bg.sh null null null
 #
-blues dsp /lcrc/project/NEXTGENOPT/DSP/Dsp null null null
+blues dsp /lcrc/project/NEXTGENOPT/Packages/bin/Dsp null null null
 blues plotme /home/ketan/SwiftApps/dsp-swift/plotme null null null
 #
 blues lammps lmp_blues null null null
@@ -21,3 +21,4 @@
 localblues bash /bin/bash null null null
 localblues python /soft/python/2.7.6/bin/python null null null
 localblues dsp /lcrc/project/NEXTGENOPT/DSP/Dsp null null null
+localblues plotme /home/ketan/SwiftApps/dsp-swift/plotme null null null

Modified: SwiftApps/dsp-swift/dsp.blues.swift
===================================================================
--- SwiftApps/dsp-swift/dsp.blues.swift	2015-01-13 22:04:17 UTC (rev 8361)
+++ SwiftApps/dsp-swift/dsp.blues.swift	2015-01-17 22:49:01 UTC (rev 8362)
@@ -26,9 +26,9 @@
 }
 
 /* == 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");
+string inloc=arg("loc","/lcrc/project/NEXTGENOPT/Packages/examples/smps");
 
-file stofiles[]<filesys_mapper; location=inloc, pattern="*.sto">;
+file stofiles[] <filesys_mapper; location=inloc, pattern="*.sto">;
 file corfiles[] <structured_regexp_mapper; source=stofiles, match="^(.*)sto$", transform="\\1cor">;
 file timfiles[] <structured_regexp_mapper; source=stofiles, match="^(.*)sto$", transform="\\1tim">;
 
@@ -48,15 +48,14 @@
   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]));
+  //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">;
+file img<single_file_mapper; file=arg("plotimg", "img.png")>;
 
-//img=plot_app(outs);
+img=plot_app(outs);
 
-                

Modified: SwiftApps/dsp-swift/swiftjumpdsp.py
===================================================================
--- SwiftApps/dsp-swift/swiftjumpdsp.py	2015-01-13 22:04:17 UTC (rev 8361)
+++ SwiftApps/dsp-swift/swiftjumpdsp.py	2015-01-17 22:49:01 UTC (rev 8362)
@@ -44,6 +44,7 @@
         outloc = next(myargs)
         outlistfile = next(myargs)
         logfile=next(myargs)
+        plotimg=next(myargs)
     except:
         traceback.print_exc()
         sys.exit(1)
@@ -56,7 +57,7 @@
     #which swift
     baseloc = homedir+"/SwiftApps/dsp-swift"
     swift = homedir+"/swift-0.95/cog/modules/swift/dist/swift-svn/bin/swift"
-    swiftargs="-loc="+inloc+" -a="+a+" -n="+n+"  -pval="+p+" -I="+I+" -outloc="+outloc
+    swiftargs="-loc="+inloc+" -a="+a+" -n="+n+"  -pval="+p+" -I="+I+" -outloc="+outloc+" -plotimg="+plotimg
     siteval=baseloc+"/sites.local.xml"
 
     if local_or_compute == "compute":

Modified: SwiftApps/dsp-swift/swiftjumpdsp.xml
===================================================================
--- SwiftApps/dsp-swift/swiftjumpdsp.xml	2015-01-13 22:04:17 UTC (rev 8361)
+++ SwiftApps/dsp-swift/swiftjumpdsp.xml	2015-01-17 22:49:01 UTC (rev 8362)
@@ -21,9 +21,10 @@
         "${resloc}"
         "${outlist}"
         "${outlogfile}"
+        "${plotimg}"
     </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" />
+        <param name="inlocation" size="60" type="file" label="inlocation" value="/home/ketan/SwiftApps/dsp-swift/dcap" help="Enter the path of the directory containing input data, eg. /home/ketan/farmer" />
         <param name="a" size="30" type="text" label="aval" value="1" help="Enter the value of a" />
         <param name="n" size="30" type="text" label="nval" value="1" help="Enter the value of n" />
         <param name="p" size="30" type="text" label="pval" value="1" help="Enter the value of p" />
@@ -37,6 +38,7 @@
     <outputs>
         <data format="txt" name="outlist" type="data" label="Output List" />
         <data format="txt" name="outlogfile" type="data" label="Swift Progress" />
+        <data format="png" name="plotimg" type="data" label="Output Plot" />
     </outputs>
 <help>
 **What is this?**