Changeset 5631 for branches/1.4

Timestamp:

May 29, 2015, 4:16:26 PM (9 years ago)

Author:

ldelgass

Message:

merge r5629 from 1.3 branch

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• examples/zoo/mesh/mesh.tcl (modified) (1 diff)
• gui/scripts/mesh.tcl (modified) (4 diffs)

branches/1.4/examples/zoo/mesh/mesh.tcl

@@ -154 +154 @@
         }
         $driver put -type file -compress no $mesh.unstructured.points points.txt
-        $driver put $mesh.unstructured.celltypes "triangle"
+        $driver put $mesh.unstructured.celltypes $celltypes
         $driver put $mesh.unstructured.cells $cells
     }

branches/1.4/gui/scripts/mesh.tcl

@@ -1136 +1136 @@
     set count 0
     set _numCells 0
-    set celltypes {}
+    set celltypesout {}
     foreach line $lines {
         set length [llength $line]
@@ -1143 +1143 @@
         }
         if { $numCellTypes > 1 } {
-            set cellType [GetCellType [lindex $cellTypes $_numCells]]
+            set celltype [GetCellType [lindex $celltypes $_numCells]]
         }
         set numIndices [GetNumIndices $celltype]
@@ -1153 +1153 @@
         }
         append data " $numIndices $line\n"
-        lappend celltypes $celltype
+        lappend celltypesout $celltype
         incr count $length;         # Include the indices
         incr count;                 # and the number of indices
@@ -1167 +1167 @@
     append out $data
     append out "CELL_TYPES $_numCells\n"
-    append out $celltypes
+    append out $celltypesout
     set _limits(x) [$xv limits]
     set _limits(y) [$yv limits]