Changeset 6296

Timestamp:

Apr 30, 2016 12:10:41 PM (8 years ago)

Author:

ldelgass

Message:

merge uq fix from release branch

Location:

trunk

Files:

• . (modified) (1 prop)
• gui/apps/launcher.tcl (modified) (1 diff)
• gui/scripts/responseviewer.tcl (modified) (2 diffs)
• lang/tcl/scripts/library.tcl (modified) (3 diffs)
• lang/tcl/scripts/task.tcl (modified) (2 diffs)
• puq/puq.sh.in (modified) (1 diff)

trunk/gui/apps/launcher.tcl

@@ -42 +42 @@
 set params(execute) ""
 set params(input) ""
+
+set rapptureInfo(cwd) [pwd]
 
 if {[info exists env(TOOL_PARAMETERS)]} {

trunk/gui/scripts/responseviewer.tcl

@@ -147 +147 @@
 
 itcl::body Rappture::ResponseViewer::_plot_response {var1 var2} {
-    #puts "plotting $var1 vs $var2"
-
-    set fname response_result.xml
-
-    set rs $_response
-    if {[catch {exec puq get_response $fname $rs $var1 $var2 $_label} res]} {
+    #puts stderr "plotting $var1 vs $var2"
+    global rapptureInfo 
+    set fname [file join $rapptureInfo(cwd) "response_result.xml"]
+    if { [catch {
+        exec puq.sh get_response $fname $_response $var1 $var2 $_label
+    } res] != 0 } {
         set fp [open "response.err" r]
         set rdata [read $fp]
         close $fp
-        puts "Surrogate Model failed: $res\n$rdata"
+        puts stderr "Surrogate Model failed: $res\n$rdata"
         error "Sampling of Surrogate Model failed: $res\n$rdata"
         # FIXME: Maybe put in text box instead of error()?
@@ -163 +163 @@
 
     set xmlobj [Rappture::library $fname]
-    #puts "xmlobj=$xmlobj"
+    #puts stderr "xmlobj=$xmlobj"
     set w $itk_component(frame).field
 

trunk/lang/tcl/scripts/library.tcl

@@ -75 +75 @@
             close $fid
         } errs] != 0 } {
+            global errorInfo
             puts stderr "can't open \"$fname\": errs=$errs errorInfo=$errorInfo"
         }
@@ -90 +91 @@
             close $fid
         } errs] != 0 } {
+            global errorInfo
             puts stderr "can't open \"$fname\": errs=$errs errorInfo=$errorInfo"
         }
@@ -1067 +1069 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::LibraryObj::uq_get_vars {{tfile ""}} {
-    set varout \[
-    set varlist []
+    set varout "\["
+    set varlist {}
 
     if {$tfile == ""} {

trunk/lang/tcl/scripts/task.tcl

@@ -218 +218 @@
 
     # write out the driver.xml file for the tool
-    set file "driver[pid].xml"
+    global rapptureInfo
+    set file [file join $rapptureInfo(cwd) "driver[pid].xml"]
     set status [catch {
         set fid [open $file w]
@@ -578 +579 @@
                 set rdir $_resources(-resultdir)
             } else {
-                set rdir "."
+                global rapptureInfo
+                set rdir $rapptureInfo(cwd)
             }
         } elseif {$resultdir ne ""} {

trunk/puq/puq.sh.in

@@ -21 +21 @@
 script=$1
 shift
-exec ${python} ${puq_exec_prefix}/${script}.py $*
+exec ${python} ${puq_exec_prefix}/${script}.py "$@"