Changeset 4473 for branches

Timestamp:

Jul 9, 2014 6:47:42 PM (10 years ago)

Author:

ldelgass

Message:

merge r4394 from trunk

Location:

branches/1.3

Files:

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

branches/1.3/gui/scripts/field.tcl

@@ -1486 +1486 @@
         }
         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]
@@ -1517 +1528 @@
         }
         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"