Changeset 6283

Timestamp:

Apr 20, 2016 3:48:42 PM (8 years ago)

Author:

gah

Message:

fixes for uq responseviewer

Location:

branches/1.7

Files:

• gui/scripts/responseviewer.tcl (modified) (2 diffs)
• lang/tcl/scripts/library.tcl (modified) (2 diffs)
• puq/puq.sh.in (modified) (1 diff)

branches/1.7/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
 

branches/1.7/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"
         }

branches/1.7/puq/puq.sh.in

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