Changeset 4394

Timestamp:

Jun 18, 2014, 11:08:12 AM (10 years ago)

Author:

ldelgass

Message:

Fix test for number of field values: check that number of values is divisible by
the number of components per tuple, also when field association is celldata,
check number of tuples against number of cells, not number of points.

File:

• trunk/gui/scripts/field.tcl (modified) (2 diffs)

trunk/gui/scripts/field.tcl

@@ -1556 +1556 @@
         }
         set numFieldValues [$v length]
-        set numComponentsPerPoint [numComponents $cname]
-        set numPoints [$mesh numpoints]
-        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"
+        set numComponentsPerTuple [numComponents $cname]
+        if { [expr $numFieldValues % $numComponentsPerTuple] != 0 } {
+            puts stderr "ERROR: Number of field values ($numFieldValues) not divisble by elemsize ($numComponentsPerTuple)"
             return 0
         }
-
+        set numFieldTuples [expr $numFieldValues / $numComponentsPerTuple]
+        if { $_comp2assoc($cname) == "pointdata" } {
+            set numPoints [$mesh numpoints]
+            if { $numPoints != $numFieldTuples } {
+                puts stderr "ERROR: Number of points in mesh ($numPoints) and number of field tuples ($numFieldTuples) don't agree"
+                return 0
+            }
+        } elseif { $_comp2assoc($cname) == "celldata" } {
+            set numCells [$mesh numcells]
+            if { $numCells != $numFieldTuples } {
+                puts stderr "ERROR: Number of cells in mesh ($numCells) and number of field tuples ($numFieldTuples) don't agree"
+                return 0
+            }
+        }
         set _comp2dims($cname) "[$mesh dimensions]D"
         set _comp2mesh($cname) [list $mesh $v]
@@ -1592 +1603 @@
         }
         set numFieldValues [$v length]
-        set numComponentsPerPoint [numComponents $cname]
-        set numPoints [$mesh numpoints]
-        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"
+        set numComponentsPerTuple [numComponents $cname]
+        if { [expr $numFieldValues % $numComponentsPerTuple] != 0 } {
+            puts stderr "ERROR: Number of field values ($numFieldValues) not divisble by elemsize ($numComponentsPerTuple)"
             return 0
+        }
+        set numFieldTuples [expr $numFieldValues / $numComponentsPerTuple]
+        if { $_comp2assoc($cname) == "pointdata" } {
+            set numPoints [$mesh numpoints]
+            if { $numPoints != $numFieldTuples } {
+                puts stderr "ERROR: Number of points in mesh ($numPoints) and number of field tuples ($numFieldTuples) don't agree"
+                return 0
+            }
+        } elseif { $_comp2assoc($cname) == "celldata" } {
+            set numCells [$mesh numcells]
+            if { $numCells != $numFieldTuples } {
+                puts stderr "ERROR: Number of cells in mesh ($numCells) and number of field tuples ($numFieldTuples) don't agree"
+                return 0
+            }
         }
         set _comp2dims($cname) "[$mesh dimensions]D"