Changeset 3684 for trunk

Timestamp:

Jun 14, 2013 12:22:12 PM (11 years ago)

Author:

gah

Message:

fixes to rlimit for unlimited

Location:

trunk/gui/scripts

Files:

• Makefile.in (modified) (1 diff)
• field.tcl (modified) (13 diffs)
• field2dresult.tcl (modified) (2 diffs)
• field3dresult.tcl (modified) (2 diffs)
• mesh.tcl (modified) (2 diffs)
• tool.tcl (modified) (1 diff)

trunk/gui/scripts/Makefile.in

@@ -131 +131 @@
                 $(srcdir)/visviewer.tcl \
                 $(srcdir)/vtkviewer.tcl \
+                $(srcdir)/vtkglyphviewer.tcl \
                 $(srcdir)/vtkisosurfaceviewer.tcl \
                 $(srcdir)/vtkstreamlinesviewer.tcl \

trunk/gui/scripts/field.tcl

@@ -75 +75 @@
     private variable _field ""
     private variable _comp2fldName ;    # cname => field names.
+    private variable _comp2type ;       # cname => type (e.g. "vector")
+    private variable _comp2size ;       # cname => # of components in element
+    private variable _comp2assoc; # cname => association (e.g. pointdata)
     private variable _fld2Components;   # field name => number of components
     private variable _fld2Label;        # field name => label
@@ -94 +97 @@
     public method controls {option args}
     public method extents {{cname -overall}}
+    public method numComponents {cname}
     public method fieldlimits {}
     public method flowhints { cname }
@@ -146 +150 @@
     private common _counter 0    ;# counter for unique vector names
 
+    private method AvsToVtk { cname contents } 
     private method BuildPointsOnMesh { cname } 
     private method ConvertToVtkData { cname } 
+    private method GetAssociation { cname } 
+    private method GetTypeAndSize { cname } 
     private method ReadVtkDataSet { cname contents } 
     private method VerifyVtkDataSet { contents } 
-    private method AvsToVtk { cname contents } 
     private variable _values ""
 }
@@ -780 +786 @@
         set _comp2extents($cname) $extents
         set _type $type
+
+        GetTypeAndSize $cname
+        GetAssociation $cname
+        if { $_comp2size($cname) > 1 } {
+            set viewer [$_field get "about.view"]
+            if { $viewer == "" } {
+                set _viewer "glyphs"
+            }
+        }
         if {$type == "1D"} {
             #
@@ -1026 +1041 @@
 itcl::body Rappture::Field::type {} {
     return $_type
+}
+
+#
+# numComponents --
+#
+# Returns if the number of components in the field component.
+#
+itcl::body Rappture::Field::numComponents {cname} {
+    set name $cname
+    regsub -all { } $name {_} name
+    if {[info exists _fld2Components($name)] } {
+        return $_fld2Components($name)
+    }
+    return 1;                           # Default to scalar.
 }
 
@@ -1256 +1285 @@
             set _fld2Units($fname) ""
             set _fld2Label($fname) $fname
+            # Let the VTK file override the <type> designated.
             set _fld2Components($fname) [$array GetNumberOfComponents]
             lappend _comp2fldName($cname) $fname
@@ -1298 +1328 @@
         append out "ASCII\n"
         append out [$mesh vtkdata]
-        append out "POINT_DATA [$vector length]\n"
-        append out "SCALARS $label double 1\n"
+
+        if { $_comp2assoc($cname) == "pointdata" } {
+            set vtkassoc "POINT_DATA"
+        } elseif { $_comp2assoc($cname) == "celldata" } {
+            set vtkassoc "CELL_DATA"
+        } elseif { $_comp2assoc($cname) == "fielddata" } {
+            set vtkassoc "FIELD_DATA"
+        } else {
+            error "unknown association \"$_comp2assoc($cname)\""
+        }
+        set elemSize [numComponents $cname]
+        set numValues [expr [$vector length] / $elemSize]
+        append out "$vtkassoc $numValues\n"
+        if { $_comp2type($cname) == "scalar" } {
+            set vtktype "SCALARS"
+        } elseif { $_comp2type($cname) == "vector" } {
+            set vtktype "VECTORS"
+        } else {
+            error "unknown element type \"$_comp2type($cname)\""
+        }
+        append out "$vtktype $label double $elemSize\n"
         append out "LOOKUP_TABLE default\n"
         append out "[$vector range 0 end]\n"
@@ -1327 +1376 @@
         return 0
     }
-    set _viewer [$_field get "about.view"]
+    set viewer [$_field get "about.view"]
+    if { $viewer != "" } {
+        set _viewer $viewer
+    }
     set element [$_xmlobj element -as type $path]
     set name $cname
@@ -1337 +1389 @@
     }
     set _fld2Units($name) [hints zunits]
-    set _fld2Components($name) 1
+    set _fld2Components($name) $_comp2size($cname)
     lappend _comp2fldName($cname) $name
 
@@ -1344 +1396 @@
         # Special case: unirect3d (should be deprecated) + flow.
         if { [$_field element $cname.extents] != "" } {
-            set extents [$_field get $cname.extents]
+            set vectorsize [$_field get $cname.extents]
         } else {
-            set extents 1 
+            set vectorsize 1 
         }
         set _dim 3
@@ -1354 +1406 @@
         set _comp2dims($cname) "3D"
         set _comp2unirect3d($cname) \
-            [Rappture::Unirect3d \#auto $_xmlobj $_field $cname $extents]
+            [Rappture::Unirect3d \#auto $_xmlobj $_field $cname $vectorsize]
         set _comp2style($cname) [$_field get $cname.style]
         if {[$_field element $cname.flow] != ""} {
@@ -1366 +1418 @@
         # Special case: unirect2d (normally deprecated) + flow.
         if { [$_field element $cname.extents] != "" } {
-            set extents [$_field get $cname.extents]
+            set vectorsize [$_field get $cname.extents]
         } else {
-            set extents 1 
+            set vectorsize 1 
         }
         set _dim 2
@@ -1533 +1585 @@
     return $vtkdata
 }
+
+itcl::body Rappture::Field::GetTypeAndSize { cname } {
+    array set type2components {
+        "colorscalar"          4
+        "scalar"               1
+        "tcoord"               2
+        "tensor"               9
+        "vector"               3 
+    }
+    set type [$_field get $cname.elemtype]
+    if { $type == "" } {
+        set type "scalar"
+    } 
+    if { ![info exists type2components($type)] } {
+        error "unknown <elemtype> \"$type\" in field"
+    }
+    set size [$_field get $cname.elemsize]
+    if { $size == "" } {
+        set size $type2components($type)
+    }
+    set _comp2type($cname) $type
+    set _comp2size($cname) $size
+}
+
+itcl::body Rappture::Field::GetAssociation { cname } {
+    set assoc [$_field get $cname.association]
+    if { $assoc == "" } {
+        set _comp2assoc($cname) "pointdata"
+        return
+    } 
+    switch -- $assoc {
+        "pointdata" - "celldata" - "fielddata" {
+            set _comp2assoc($cname) $assoc
+            return
+        }
+        default {
+            error "unknown field association \"$assoc\""
+        }
+    }
+}

trunk/gui/scripts/field2dresult.tcl

@@ -67 +67 @@
             set servers [Rappture::VisViewer::GetServerList "nanovis"]
         }
-        "auto" - "contour" - "heightmap" - "streamlines" - "vtkviewer" {
+        "auto" - "contour" - "heightmap" - "streamlines" - "vtkviewer" - "glyphs" {
             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
         }
@@ -83 +83 @@
                     Rappture::VtkHeightmapViewer $itk_interior.heightmap \
                         $servers -mode $flags(-mode)
+                }
+            }
+            "glyphs" {
+                itk_component add renderer {
+                    Rappture::VtkGlyphViewer $itk_interior.glyphs $servers
                 }
             }

trunk/gui/scripts/field3dresult.tcl

@@ -57 +57 @@
     array set flags $args 
     set servers ""
+    puts stderr "field3d: args=$args"
     switch -- $flags(-mode) {
         "auto" - "nanovis" - "flowvis" {
             set servers [Rappture::VisViewer::GetServerList "nanovis"]
         }
-        "isosurface" - "heightmap" - "streamlines" - "vtkviewer" - "vtkvolume" {
+        "isosurface" - "heightmap" - "streamlines" - "vtkviewer" - "vtkvolume" - "glyphs" {
             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
         }
@@ -81 +82 @@
                 itk_component add renderer {
                     Rappture::FlowvisViewer $itk_interior.ren $servers
+                }
+            }
+            "glyphs" {
+                itk_component add renderer {
+                    Rappture::VtkGlyphViewer $itk_interior.glyphs $servers
                 }
             }

trunk/gui/scripts/mesh.tcl

@@ -499 +499 @@
             set _dim 3
             set _numPoints [expr $xNum * $yNum * $zNum]
-            $all set $points
             if { ($_numPoints*3) != $numCoords } {
                 puts stderr "WARNING: bad grid \"$path\": invalid grid: \# of points does not match dimensions <xdim> * <ydim>"
@@ -1029 +1028 @@
                 return 0
             }
+            set all [blt::vector create \#auto]
             set xv [blt::vector create \#auto]
             set yv [blt::vector create \#auto]

trunk/gui/scripts/tool.tcl

@@ -172 +172 @@
     } result]
 
-    # set limits for cpu time
+    # Set limits for cpu time
     set limit [$_xmlobj get tool.limits.cputime]
-    if {"" == $limit || [catch {Rappture::rlimit set cputime $limit}]} {
-        Rappture::rlimit set cputime 900  ;# 15 mins by default
-    }
-
+    if { $limit == "unlimited" } {
+        set limit 43200;                # 12 hours
+    } else {
+        if { [scan $limit "%d" dum] != 1 } {
+            set limit 900;              # 15 mins by default
+        } elseif { $limit > 43200 } {
+            set limit 43200;            # limit to 12 hrs.
+        } elseif { $limit < 10 } {
+            set limit 10;               # lower bound is 10 seconds.
+        }
+    } 
+    Rappture::rlimit set cputime $limit  
     # execute the tool using the path from the tool description
     if {$status == 0} {