Changeset 4666 for branches/1.3

Timestamp:

Nov 8, 2014, 5:58:32 PM (10 years ago)

Author:

ldelgass

Message:

Merge r4639,r4659 from trunk

Location:

branches/1.3

Files:

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

branches/1.3/gui/scripts/field.tcl

@@ -1514 +1514 @@
         set dim 0 
         foreach axis {x y z} {
-            foreach {min max} [$mesh limits $axis] { 
+            foreach {min max} [$mesh limits $axis] {
                 if { $min < $max } {
                     incr dim

branches/1.3/gui/scripts/mesh.tcl

@@ -518 +518 @@
             set ${axis}Max $max
             set ${axis}Num $num
+            if {$min > $max} {
+                puts stderr "ERROR: grid $axis axis minimum larger than maximum"
+                return 0
+            }
             incr numUniform
         } elseif { $coords != "" } {
@@ -557 +561 @@
             set _dim 3
             set _numPoints [expr $xNum * $yNum * $zNum]
-            set _numCells [expr ($xNum - 1) * ($yNum - 1) * ($zNum - 1)]
+            set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1) * ($zNum > 1 ? ($zNum - 1) : 1)]
             if { ($_numPoints*3) != $numCoords } {
                 puts stderr "WARNING: bad grid \"$path\": invalid grid: \# of points does not match dimensions <xdim> * <ydim> * <zdim>"
@@ -580 +584 @@
             set _dim 2
             set _numPoints [expr $xNum * $yNum]
-            set _numCells [expr ($xNum - 1) * ($yNum - 1)]
+            set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1)]
             if { ($_numPoints*2) != $numCoords } {
                 puts stderr "WARNING: bad grid \"$path\": \# of points does not match dimensions <xdim> * <ydim>"
@@ -630 +634 @@
         # This results in a STRUCTURED_POINTS
         if { $_dim == 1 } {
-            set xSpace [expr ($xMax - $xMin) / double($xNum - 1)]
+            if {$xNum == 1} {
+                set xSpace 0
+            } else {
+                set xSpace [expr ($xMax - $xMin) / double($xNum - 1)]
+            }
             set _numPoints $xNum
             set _numCells [expr $xNum - 1]
@@ -642 +650 @@
             set _limits(z) [list 0 0]
         } elseif { $_dim == 2 } {
-            set xSpace [expr ($xMax - $xMin) / double($xNum - 1)]
-            set ySpace [expr ($yMax - $yMin) / double($yNum - 1)]
+            if {$xNum == 1} {
+                set xSpace 0
+            } else {
+                set xSpace [expr ($xMax - $xMin) / double($xNum - 1)]
+            }
+            if {$yNum == 1} {
+                set ySpace 0
+            } else {
+                set ySpace [expr ($yMax - $yMin) / double($yNum - 1)]
+            }
             set _numPoints [expr $xNum * $yNum]
-            set _numCells [expr ($xNum - 1) * ($yNum - 1)]
+            set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1)]
             append out "DATASET STRUCTURED_POINTS\n"
             append out "DIMENSIONS $xNum $yNum 1\n"
@@ -656 +672 @@
             set _limits(z) [list 0 0]
         } elseif { $_dim == 3 } {
-            set xSpace [expr ($xMax - $xMin) / double($xNum - 1)]
-            set ySpace [expr ($yMax - $yMin) / double($yNum - 1)]
-            set zSpace [expr ($zMax - $zMin) / double($zNum - 1)]
+            if {$xNum == 1} {
+                set xSpace 0
+            } else {
+                set xSpace [expr ($xMax - $xMin) / double($xNum - 1)]
+            }
+            if {$yNum == 1} {
+                set ySpace 0
+            } else {
+                set ySpace [expr ($yMax - $yMin) / double($yNum - 1)]
+            }
+            if {$zNum == 1} {
+                set zSpace 0
+            } else {
+                set zSpace [expr ($zMax - $zMin) / double($zNum - 1)]
+            }
             set _numPoints [expr $xNum * $yNum * $zNum]
-            set _numCells [expr ($xNum - 1) * ($yNum - 1) * ($zNum - 1)]
+            set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1) * ($zNum > 1 ? ($zNum - 1) : 1)]
             append out "DATASET STRUCTURED_POINTS\n"
             append out "DIMENSIONS $xNum $yNum $zNum\n"
@@ -713 +741 @@
     if { $_dim == 3 } {
         set _numPoints [expr $xNum * $yNum * $zNum]
-        set _numCells [expr ($xNum - 1) * ($yNum - 1) * ($zNum - 1)]
+        set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1) * ($zNum > 1 ? ($zNum - 1) : 1)]
         append out "DATASET RECTILINEAR_GRID\n"
         append out "DIMENSIONS $xNum $yNum $zNum\n"
@@ -733 +761 @@
     } elseif { $_dim == 2 } {
         set _numPoints [expr $xNum * $yNum]
-        set _numCells [expr ($xNum - 1) * ($yNum - 1)]
+        set _numCells [expr ($xNum > 1 ? ($xNum - 1) : 1) * ($yNum > 1 ? ($yNum - 1) : 1)]
         append out "DATASET RECTILINEAR_GRID\n"
         append out "DIMENSIONS $xNum $yNum 1\n"