Changeset 4471 for branches/1.3/gui/scripts

Timestamp:

Jul 9, 2014, 6:38:40 PM (10 years ago)

Author:

ldelgass

Message:

merge r4390 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/field.tcl (modified) (2 diffs)
• gui/scripts/mesh.tcl (modified) (1 diff)

branches/1.3/gui/scripts/field.tcl

@@ -1488 +1488 @@
         set numComponentsPerPoint [numComponents $cname]
         set numPoints [$mesh numpoints]
-        if { ($numPoints * $numComponentsPerPoint) != $numFieldValues } {
-            puts stderr "ERROR: Number of points in mesh and field values don't agree"
+        set numExpectedPoints [expr $numPoints * $numComponentsPerPoint]
+        if { $numExpectedPoints != $numFieldValues } {
+            puts stderr "ERROR: Number of points in mesh ($numExpectedPoints) and number of field values ($numFieldValues) don't agree"
             return 0
         }
@@ -1518 +1519 @@
         set numComponentsPerPoint [numComponents $cname]
         set numPoints [$mesh numpoints]
-        if { ($numPoints * $numComponentsPerPoint) != $numFieldValues } {
-            puts stderr "ERROR: Number of points in mesh and field values don't agree"
+        set numExpectedPoints [expr $numPoints * $numComponentsPerPoint]
+        if { $numExpectedPoints != $numFieldValues } {
+            puts stderr "ERROR: Number of points in mesh ($numExpectedPoints) and number of field values ($numFieldValues) don't agree"
             return 0
         }

branches/1.3/gui/scripts/mesh.tcl

@@ -420 +420 @@
     $reader Update
     set output [$reader GetOutput]
+    set _numPoints [$output GetNumberOfPoints]
+    set _numCells [$output GetNumberOfCells]
     foreach { xmin xmax ymin ymax zmin zmax } [$output GetBounds] break
     set _limits(x) [list $xmin $xmax]