Changeset 4471 for branches/1.3


Ignore:
Timestamp:
Jul 9, 2014 6:38:40 PM (6 years ago)
Author:
ldelgass
Message:

merge r4390 from trunk

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4390
  • branches/1.3/gui/scripts/field.tcl

    r4459 r4471  
    14881488        set numComponentsPerPoint [numComponents $cname]
    14891489        set numPoints [$mesh numpoints]
    1490         if { ($numPoints * $numComponentsPerPoint) != $numFieldValues } {
    1491             puts stderr "ERROR: Number of points in mesh and field values don't agree"
     1490        set numExpectedPoints [expr $numPoints * $numComponentsPerPoint]
     1491        if { $numExpectedPoints != $numFieldValues } {
     1492            puts stderr "ERROR: Number of points in mesh ($numExpectedPoints) and number of field values ($numFieldValues) don't agree"
    14921493            return 0
    14931494        }
     
    15181519        set numComponentsPerPoint [numComponents $cname]
    15191520        set numPoints [$mesh numpoints]
    1520         if { ($numPoints * $numComponentsPerPoint) != $numFieldValues } {
    1521             puts stderr "ERROR: Number of points in mesh and field values don't agree"
     1521        set numExpectedPoints [expr $numPoints * $numComponentsPerPoint]
     1522        if { $numExpectedPoints != $numFieldValues } {
     1523            puts stderr "ERROR: Number of points in mesh ($numExpectedPoints) and number of field values ($numFieldValues) don't agree"
    15221524            return 0
    15231525        }
  • branches/1.3/gui/scripts/mesh.tcl

    r4392 r4471  
    420420    $reader Update
    421421    set output [$reader GetOutput]
     422    set _numPoints [$output GetNumberOfPoints]
     423    set _numCells [$output GetNumberOfCells]
    422424    foreach { xmin xmax ymin ymax zmin zmax } [$output GetBounds] break
    423425    set _limits(x) [list $xmin $xmax]
Note: See TracChangeset for help on using the changeset viewer.