Changeset 6021 for trunk/gui/scripts/analyzer.tcl

Timestamp:

Feb 18, 2016, 4:13:14 PM (9 years ago)

Author:

ldelgass

Message:

Merge UQ and fixes from 1.4 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• gui/scripts/analyzer.tcl (modified) (17 diffs)

trunk/gui/scripts/analyzer.tcl

@@ -79 +79 @@
     protected method _lammpsToSequence {xmlobj path id child data}
     protected method _trajToSequence {xmlobj {path ""}}
+    protected method _pop_uq_dialog {win}
+    protected method _setWaitVariable {state}
+    protected method _adjust_level {win}
 
     private variable _tool ""          ;# belongs to this tool
@@ -92 +95 @@
     private variable _lastPlot
     private common job                 ;# array var used for blt::bgexec jobs
+    private variable _uq_active 0      ;# a UQ variables has been used
+    private variable _wait_uq 0
 }
 
@@ -328 +333 @@
     }
     pack $itk_component(resultpages) -expand yes -fill both
-
-    set f [$itk_component(results) insert end -fraction 0.1]
+   set f [$itk_component(results) insert end -fraction 0.1]
     itk_component add resultselector {
         Rappture::ResultSelector $f.rsel -resultset $_resultset \
@@ -395 +399 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Analyzer::simulate {args} {
-    if {$args == "-ifneeded"} {
+    #puts "simulate args='$args'"
+
+    set uq [$_tool get_uq -uq_type smolyak -uq_args 2]
+
+    # pop up UQ window
+    if {[$uq num_runs] > 1} {
+        set _uq_active 1
+        set status [$uq run_dialog $itk_component(simulate)]
+        if {$status == 0} {
+            # cancelled
+            return
+        }
+        lappend args -uq_type [$uq type]
+        lappend args -uq_args [$uq args]
+        # Need to put these UQ values into the driver file
+        # so the call to resultset::contains will be correct.
+        set _xml [$_tool xml object]
+        $_xml put uq.type.current [$uq type]
+        $_xml put uq.args.current [$uq args]
+        $_xml put uq.args.about.label "level"
+        $_xml put uq.args.about.description "Polynomial Degree of Smolyak GPC method."
+    }
+    #puts "simulate args=$args"
+
+    if {[lindex $args 0] == "-ifneeded"} {
         # check to see if simulation is really needed
         $_tool sync
@@ -404 +432 @@
             return
         }
-        set args ""
+        set args [lreplace $args 0 0]
     }
 
@@ -427 +455 @@
 
     # execute the job
+    #puts "$_tool run $args"
+
     foreach {status result} [eval $_tool run $args] break
 
@@ -470 +500 @@
 }
 
+
 # ----------------------------------------------------------------------
 # USAGE: reset ?-eventually|-now?
@@ -515 +546 @@
         clear
     }
+    #puts "Analyzer::load"
     $_resultset add $xmlobj
 
@@ -652 +684 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Analyzer::_plot {args} {
+    #puts "analyzer::_plot"
     set _plotlist $args
 
@@ -755 +788 @@
     } elseif {$page != ""} {
         set _lastlabel $name
-        set win [winfo toplevel $itk_component(hull)]
         $itk_component(resultpages) current $page
         set f [$itk_component(resultpages) page $page]
-
         # We don't want to replot if we're using an existing viewer with the
         # the same list of objects to plot.  So track the viewer and the list.
         if { ![info exists _lastPlot($f)] || $_plotlist != $_lastPlot($f) } {
             set _lastPlot($f) $_plotlist
+            set win [winfo toplevel $itk_component(hull)]
             blt::busy hold $win
+            #puts "rviewer = $f.rviewer"
+            #puts "_plotlist = $_plotlist"
             $f.rviewer plot clear
             eval $f.rviewer plot add $_plotlist
-            blt::busy release [winfo toplevel $itk_component(hull)]
+            blt::busy release $win
         }
         Rappture::Logger::log output $_label2item($name)
@@ -782 +816 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Analyzer::_fixResultSet {args} {
+    #puts "Analyzer::_fixResultSet $args"
     array set eventData $args
     switch -- $eventData(op) {
@@ -794 +829 @@
             set haveresults 0
             foreach item [_reorder [$xmlobj children output]] {
-                switch -glob -- $item {
-                    log* {
-                        _autoLabel $xmlobj output.$item "Output Log" counters
-                    }
-                    number* {
-                        _autoLabel $xmlobj output.$item "Number" counters
-                    }
-                    integer* {
-                        _autoLabel $xmlobj output.$item "Integer" counters
-                    }
-                    mesh* {
-                        _autoLabel $xmlobj output.$item "Mesh" counters
-                    }
-                    string* {
-                        _autoLabel $xmlobj output.$item "String" counters
-                    }
-                    histogram* - curve* - field* {
-                        _autoLabel $xmlobj output.$item "Plot" counters
-                    }
-                    map* {
-                        _autoLabel $xmlobj output.$item "Map" counters
-                    }
-                    drawing* {
-                        _autoLabel $xmlobj output.$item "Drawing" counters
-                    }
-                    structure* {
-                        _autoLabel $xmlobj output.$item "Structure" counters
-                    }
-                    table* {
-                        _autoLabel $xmlobj output.$item "Energy Levels" counters
-                    }
-                    sequence* {
-                        _autoLabel $xmlobj output.$item "Sequence" counters
+                if {[$xmlobj get output.$item.about.uqtype] == ""} {
+                    switch -glob -- $item {
+                        log* {
+                            _autoLabel $xmlobj output.$item "Output Log" counters
+                        }
+                        number* {
+                            _autoLabel $xmlobj output.$item "Number" counters
+                        }
+                        integer* {
+                            _autoLabel $xmlobj output.$item "Integer" counters
+                        }
+                        mesh* {
+                            _autoLabel $xmlobj output.$item "Mesh" counters
+                        }
+                        string* {
+                            _autoLabel $xmlobj output.$item "String" counters
+                        }
+                        histogram* - curve* - field* {
+                            _autoLabel $xmlobj output.$item "Plot" counters
+                        }
+                        drawing* {
+                            _autoLabel $xmlobj output.$item "Drawing" counters
+                        }
+                        structure* {
+                            _autoLabel $xmlobj output.$item "Structure" counters
+                        }
+                        table* {
+                            _autoLabel $xmlobj output.$item "Energy Levels" counters
+                        }
+                        sequence* {
+                            _autoLabel $xmlobj output.$item "Sequence" counters
+                        }
                     }
                 }
@@ -853 +887 @@
                     }
                     set hidden [$xmlobj get output.$item.hide]
-                    if { $hidden == "" } {
+                    if {$hidden == ""} {
                         set hidden 0
                     }
                     if {"" != $label && !$hidden} {
+                        set uq_part [$xmlobj get output.$item.about.uqtype]
+
+                        #puts "label=$label uq_part=$uq_part"
+
                         if {![info exists _label2page($label)]} {
+                            #puts "Adding label: '$label'"
                             set name "page[incr _pages]"
+                            #puts "Inserting $name into resultpages"
                             set page [$itk_component(resultpages) \
                                 insert end $name]
@@ -884 +924 @@
                             set reset($page) 1
                         }
-                        $page.rviewer add $index $xmlobj output.$item
+                        $page.rviewer add $index $xmlobj output.$item $label $uq_part
                     }
                 }
@@ -1037 +1077 @@
         configure -simcontrolcolor $simcbg
 
-        $itk_component(simulate) configure -state disabled
+        if {$_uq_active == 0} {
+            $itk_component(simulate) configure -state disabled
+        }
         $itk_component(abort) configure -state normal
 
@@ -1065 +1107 @@
     # Scan through and pick out any =RAPPTURE-PROGRESS=> messages first.
     #
+
     while {[regexp -indices \
                {=RAPPTURE-PROGRESS=> *([-+]?[0-9]+) +([^\n]*)(\n|$)} $message \
@@ -1080 +1123 @@
         foreach {i0 i1} $match break
         set message [string replace $message $i0 $i1]
+    }
+
+    #
+    # Now handle SUBMIT-PROGRESS
+    #
+    while {[regexp -indices {=SUBMIT-PROGRESS=> aborted=([0-9]+) finished=([0-9]+) failed=([0-9]+) executing=([0-9]+)\
+        waiting=([0-9]+) setting_up=([0-9]+) setup=([0-9]+) %done=([0-9.]+) timestamp=([0-9.]+)(\n|$)} $message \
+        match aborted finished failed executing waiting setting_up setup percent ts mesg]} {
+
+        set mesg ""
+        foreach {i0 i1} $percent break
+        set percent [string range $message $i0 $i1]
+        foreach {i0 i1} $failed break
+        set failed [string range $message $i0 $i1]
+        foreach {i0 i1} $match break
+        set message [string replace $message $i0 $i1]
+
+        if {$failed != 0} {set mesg "$failed jobs failed!"}
+        if {$percent >= 100} { set mesg "Jobs finished.  Analyzing results..."}
+
+        pack $itk_component(progress) -fill x -padx 10 -pady 10
+        $itk_component(progress) settings -percent $percent -message $mesg
     }