Changeset 6205 for branches/1.6/lang

Timestamp:

Mar 24, 2016, 3:55:41 AM (8 years ago)

Author:

gah

Message:

fix new puq handling routine in task.tcl

File:

• branches/1.6/lang/tcl/scripts/task.tcl (modified) (10 diffs)

branches/1.6/lang/tcl/scripts/task.tcl

@@ -235 +235 @@
     }
     if { !$cached } {
-puts stderr "1._uq(type)=$_uq(type)"
         if { $_uq(type) != "" } {
             set _uq(tfile) [GetUQTemplateFile]
@@ -244 +243 @@
             set cmd [GetUQSimulationCommand $driverFile]
         }
-puts stderr "2. cmd=$cmd"
         if { $cmd == "" } {
             puts stderr "cmd is empty"
@@ -254 +252 @@
         }
         Rappture::rusage mark
-puts stderr "3. _uq(type)=$_uq(type)"
         if { ![ExecuteSimulationCommand $cmd] } {
-puts stderr "4. job(mesg)=$_job(mesg)"
             return [list 1 $_job(mesg)]
         }
-puts stderr "5. _uq(type)=$_uq(type)"
         if { [resources -jobprotocol] == "submit" } {
             LogSubmittedSimulationUsage
@@ -489 +484 @@
         exec puq.sh get_params $pid $_uq(varlist) $_uq(type) $_uq(args)
     } errs] != 0 } {
-        set fp [open "uq_debug.err" r]
-        set contents [read $fp]
-        close $fp
+        set contents {}
+        if { [file exists "uq_debug.err"] } {
+            set f [open "uq_debug.err" r]
+            set contents [read $f]
+            close $f
+        }
         puts stderr "get_params.py failed: $contents"
-        error "get_params.py: $errs\n$contents"
+        error "get_params.py failed: $errs\n$contents"
     }
     return "params[pid].csv"
@@ -574 +572 @@
     global rapptureInfo
     # Copy xml into a new file
-    set templateFile [file join $rapptureInfo(cwd) "template[pid].xml"]
-    set fid [open $templateFile w]
-    puts $fid "<?xml version=\"1.0\"?>"
-    puts $fid [$_xmlobj xml]
-    close $fid
+    set templateFile "template[pid].xml"
+    set f [open $templateFile w]
+    puts $f "<?xml version=\"1.0\"?>"
+    puts $f [$_xmlobj xml]
+    close $f
 
     # Return a list of the UQ variables and their PDFs.
@@ -617 +615 @@
             $cmd
     } result
-puts stderr "stderr=$_job(stderr) stdout=$_job(stdout)"
+
     # Step 4. Check the token and the exit code.
     set logmesg $result
@@ -651 +649 @@
         return 0;                       # Fail
     }
-        if { $_uq(type) != "" } {
-            CollectUQResults
-        }
-    puts stderr "_job(stdout)=$_job(stdout) _job(stderr)=$_job(stderr)"
+    if { $_uq(type) != "" } {
+        CollectUQResults
+    }
+
     # Step 5. Look in stdout for the name of the run file.
     set pattern {=RAPPTURE-RUN=>([^\n]+)}
@@ -871 +869 @@
         http::geturl $url -query $query -timeout 60000 -binary yes
     } token] != 0 } {
-        puts stderr "can't get query: token=$token"
+        puts stderr "error performing cache query: token=$token"
         return 0
     }
@@ -883 +881 @@
         return 0
     }
+
     # Create a new run.xml file and write the results into it. 
     set secs [clock seconds]
@@ -902 +901 @@
 # UQ. Collect data from all jobs and put it in one xml run file.
 itcl::body Rappture::Task::CollectUQResults {} {
-   puts stderr "CollectUQResult"
     file delete -force -- "run_uq.xml"
-    global rapptureInfo
-    set puqFileName [file join $rapptureInfo(cwd) puq_[pid].hdf5]
-    if {[catch {
-        exec puq.sh analyze $puqFileName
-    } fileName] != 0 } {
-   puts stderr "puq.sh analyze failed: $fileName"
-        set f [open "uq_debug.err" r]
-        set rdata [read $f]
-        close $f
-        puts "PUQ analysis failed: $fileName\n$rdata"
-        error "UQ analysis failed: $fileName\n$rdata"
+    set hdfFile puq_[pid].hdf5
+    if { [catch {
+        exec puq.sh analyze $hdfFile
+    } results] != 0 } {
+        set rdata {}
+        if { [file exists "uq_debug.err" ] } {
+            set f [open "uq_debug.err" r]
+            set rdata [read $f]
+            close $f
+        }
+        puts stderr "UQ analysis failed: $results\n$rdata"
+        error "UQ analysis failed: $results\n$rdata"
     } else {
-        set _job(runfile) $fileName
-    }
-   puts stderr "runfile=$_job(runfile)"
-}
+        set _job(stdout) $results
+    }
+}