Commit 469dbf79 authored by hrchilds's avatar hrchilds

Update from April 1, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@443 18c085ea-50e0-402c-830e-de6fd14e8384
parent a0f5b9c9
......@@ -63,6 +63,9 @@ $0 = shift @ARGV;
# Hank Childs, Mon Mar 28 10:00:15 PST 2005
# Added more timings options to -fullhelp.
#
# Jeremy Meredith, Fri Apr 1 16:05:49 PST 2005
# Added valgrind to -fullhelp, and unlimited the errors it will report.
#
###############################################################################
......@@ -246,6 +249,7 @@ $fullusage = "$usage
-break <funcname> Add the specified breakpoint in gdb.
-xterm Run gdb in an xterm window.
-totalview <comp> Run totalview on the given component.
-valgrind <comp> Run valgrind on the given component.
-numrestarts <#> Number of attempts to restart a failed engine.
";
......@@ -1066,7 +1070,7 @@ else
# Note: could use --tool=addrcheck because it uses much less memory
# and runs twice as fast, but it doesn't catch UMRs
# Note: could add --leak-check=yes to either tool
@debugcmd = ("valgrind", "--tool=memcheck", "--num-callers=32", "$visitbindir/$exe_name", @visitargs);
@debugcmd = ("valgrind", "--tool=memcheck", "--error-limit=no", "--num-callers=32", "$visitbindir/$exe_name", @visitargs);
if ($security_key_set) { push @debugcmd, "-key", $security_key; }
print STDERR "Running: @debugcmd\n";
exec @debugcmd or die "Could not execute $exe_name under valgrind\n";
......
......@@ -980,6 +980,8 @@ DatabaseCorrelation::GetCorrelatedTimeStates(int state, intVector &states) const
// Creation: Sat Jan 31 19:56:11 PST 2004
//
// Modifications:
// Brad Whitlock, Fri Apr 1 15:17:08 PST 2005
// Fixed a rounding problem.
//
// ****************************************************************************
......@@ -1062,7 +1064,7 @@ DatabaseCorrelation::AddDatabase(const std::string &database, int nStates,
for(int j = 0; j < maxStates; ++j)
{
float t = float(j) / float(maxStates - 1);
int state = int(t * (databaseNStates[i] - 1));
int state = int(t * (databaseNStates[i] - 1) + 0.5);
indices.push_back(state);
}
}
......
......@@ -95,7 +95,7 @@ DatabaseCorrelation::SetNumStates(int nStates)
for(int j = 0; j < maxStates; ++j)
{
float t = float(j) / float(maxStates - 1);
int state = int(t * databaseNStates[i]);
int state = int(t * databaseNStates[i] + 0.5);
newIndices.push_back(state);
}
}
......@@ -152,7 +152,9 @@ Definition:
// Creation: Sat Jan 31 19:56:11 PST 2004
//
// Modifications:
//
// Brad Whitlock, Fri Apr 1 15:17:08 PST 2005
// Fixed a rounding problem.
//
// ****************************************************************************
void
......@@ -234,7 +236,7 @@ DatabaseCorrelation::AddDatabase(const std::string &database, int nStates,
for(int j = 0; j < maxStates; ++j)
{
float t = float(j) / float(maxStates - 1);
int state = int(t * (databaseNStates[i] - 1));
int state = int(t * (databaseNStates[i] - 1) + 0.5);
indices.push_back(state);
}
}
......
......@@ -1162,9 +1162,16 @@ avtStructuredDomainBoundaries::avtStructuredDomainBoundaries(
// Programmer: Jeremy Meredith
// Creation: October 25, 2001
//
// Modifications:
// Mark C. Miller, ed Mar 23 15:29:56 PST 2005
// Added code to delete stuff new'd in constructor
//
// ****************************************************************************
avtStructuredDomainBoundaries::~avtStructuredDomainBoundaries()
{
delete bhf_int;
delete bhf_float;
delete bhf_uchar;
}
// ****************************************************************************
......
......@@ -109,10 +109,6 @@ avtExtents::Print(ostream &out)
// Programmer: Hank Childs
// Creation: September 4, 2001
//
// Modifications:
// Mark C. Miller, Mon Mar 21 11:16:10 PST 2005
// Added missing line to set deleted extents to NULL. Other code in this
// class depends on it being null whenever it is NOT allocated.
// ****************************************************************************
const avtExtents &
......@@ -121,16 +117,12 @@ avtExtents::operator=(const avtExtents &exts)
if (extents != NULL)
{
delete [] extents;
extents = NULL;
}
dimension = exts.dimension;
if (exts.extents != NULL)
{
if (extents == NULL)
{
extents = new double[2*dimension];
}
extents = new double[2*dimension];
for (int i = 0 ; i < 2*dimension ; i++)
{
extents[i] = exts.extents[i];
......
......@@ -76,8 +76,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/2.0/linux_rhel3_gcc_3.2.3/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.3/Linux/serial/64/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.3/Linux/serial/64/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/lib
##
## Mili
......
......@@ -76,8 +76,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/2.0/linux_rhel3_gcc_3.2.3/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.3/Linux/serial/64/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.3/Linux/serial/64/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/lib
##
## Mili
......
......@@ -76,8 +76,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/2.0/linux_rhel3_gcc_3.2.3/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.3/Linux/serial/64/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.3/Linux/serial/64/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/lib
##
## Mili
......
......@@ -76,8 +76,8 @@ DEFAULT_HDF4_LIBS=/usr/gapps/visit/hdf4/2.0/linux_rhel3_gcc_3.2.3/lib
##
## HDF5
##
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.3/Linux/serial/64/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.3/Linux/serial/64/optim/lib
DEFAULT_HDF5_INCLUDE=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/include
DEFAULT_HDF5_LIB=/usr/gapps/hdf5/1.6.0/LinuxE3/serial/64/optim/lib
##
## Mili
......
......@@ -376,6 +376,9 @@ debug4 << "avtScatterFilter::ExecuteData: var2Name = " << var2Name.c_str() << en
// Hank Childs, Sun Mar 13 11:38:06 PST 2005
// Fix memory leak.
//
// Jeremy Meredith, Fri Apr 1 16:07:29 PST 2005
// Fix UMR.
//
// ****************************************************************************
vtkDataSet *
......@@ -430,6 +433,12 @@ avtScatterFilter::PointMeshFromVariables(DataInput *d1,
coord[1] = arr2->GetTuple1(i);
coord[2] = 0.;
// Do data min, max so we can set the min,max spatial extents.
xMin = (xMin < coord[0]) ? xMin : coord[0];
xMax = (xMax > coord[0]) ? xMax : coord[0];
yMin = (yMin < coord[1]) ? yMin : coord[1];
yMax = (yMax > coord[1]) ? yMax : coord[1];
//
// Only add values that are in the specified min/max range.
//
......@@ -452,12 +461,6 @@ avtScatterFilter::PointMeshFromVariables(DataInput *d1,
++nCells;
}
}
// Do data min, max so we can set the min,max spatial extents.
xMin = (xMin < coord[0]) ? xMin : coord[0];
xMax = (xMax > coord[0]) ? xMax : coord[0];
yMin = (yMin < coord[1]) ? yMin : coord[1];
yMax = (yMax > coord[1]) ? yMax : coord[1];
}
pts->SetNumberOfPoints(nCells);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment