Commit b79fdb35 authored by hrchilds's avatar hrchilds

Update from May 16, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@470 18c085ea-50e0-402c-830e-de6fd14e8384
parent c15e96ee
......@@ -261,10 +261,11 @@ cd ..
# set the datestamp used for all test modes
curdate=`date +%Y-%m-%d-%p%I%M`
theDay=`date +%A`
# set mode to run in
modes="serial parallel scalable,parallel purify"
if test "`date +%A`" = "Sunday"; then
if test "$theDay" = "Sunday"; then
modes="hdf5 dlb serial,purify scalable,parallel,purify"
fi
......@@ -273,19 +274,45 @@ skipList="scalable,parallel:tests/databases/boxlib.py \
scalable,parallel:tests/hybrid/locus.py \
dlb:tests/databases/global_node_ids.py \
dlb:tests/queries/pick.py \
purify:tests/databases/global_node_ids.py \
purify:tests/databases/pdbdatabase.py \
purify:tests/queries/queriesOverTime.py \
purify:tests/queries/pick.py"
purify:tests/databases/global_node_ids.py \
purify:tests/databases/pdbdatabase.py \
purify:tests/queries/queriesOverTime.py \
purify:tests/queries/pick.py"
# run the test(s)
error=0
cd test
for m in $modes; do
if test "$skipList" = ""; then
./runtest -q -p -m "$m" -d "$curdate" -notrackmem
if test "$m" = "purify"; then
theTests=""
case $theDay in
"Monday")
theTests="tests/databases/*.py"
;;
"Tuesday")
theTests="tests/hybrid/*.py"
;;
"Wednesday")
theTests="tests/meshtype/*.py tests/operators/*.py tests/plots/*.py"
;;
"Thursday")
theTests="tests/queries/*.py"
;;
"Friday")
theTests="tests/rendering/*.py tests/session/*.py"
;;
esac
if test "$skipList" = ""; then
./runtest -q -p -m "$m" -d "$curdate" -notrackmem $theTests
else
./runtest -q -s "$skipList" -p -m "$m" -d "$curdate" -notrackmem $theTests
fi
else
./runtest -q -s "$skipList" -p -m "$m" -d "$curdate" -notrackmem
if test "$skipList" = ""; then
./runtest -q -p -m "$m" -d "$curdate" -notrackmem
else
./runtest -q -s "$skipList" -p -m "$m" -d "$curdate" -notrackmem
fi
fi
curerror=$?
if test ! "$curerror" = "0"; then
......
......@@ -8974,6 +8974,9 @@ avtGenericDatabase::ScaleMesh(vtkDataSet *ds)
// Mark C. Miller, Tue Apr 5 10:30:16 PDT 2005
// Added dummy args for data type conversion for calls to get variable
//
// Kathleen Bonnell, Fri May 13 16:26:41 PDT 2005
// Fix memory leak.
//
// ****************************************************************************
bool
......@@ -9052,6 +9055,7 @@ avtGenericDatabase::QuerySpecies(const string &varName, const int dom,
if (getVal)
vals.push_back(species->GetTuple1(element));
}
species->Delete();
//
// Retrieve the mass fractions for each species within each material
......
......@@ -56,19 +56,23 @@ avtCurveComparisonQuery::avtCurveComparisonQuery()
// Programmer: Hank Childs
// Creation: October 2, 2003
//
// Modifications:
// Kathleen Bonnell, Thu May 12 17:21:34 PDT 2005
// Fix memory leak.
//
// ****************************************************************************
avtCurveComparisonQuery::~avtCurveComparisonQuery()
{
if (curve1 != NULL)
{
curve1 = NULL;
delete curve1;
curve1 = NULL;
}
if (curve2 != NULL)
{
curve2 = NULL;
delete curve2;
curve2 = NULL;
}
}
......@@ -86,6 +90,10 @@ avtCurveComparisonQuery::~avtCurveComparisonQuery()
// Programmer: Hank Childs
// Creation: October 2, 2003
//
// Modifications:
// Kathleen Bonnell, Thu May 12 17:21:34 PDT 2005
// Fix memory leak.
//
// ****************************************************************************
void
......@@ -272,6 +280,7 @@ avtCurveComparisonQuery::PutOnSameXIntervals(int on1, const float *ox1,
if (uniquePoint)
unique_x.push_back(all_xs[i]);
}
delete [] all_xs;
total_n_pts = unique_x.size();
int nextIndForCurve1 = 0;
......
......@@ -311,6 +311,9 @@ avtLocateNodeQuery::DeterminePickedNode(vtkDataSet *ds, int foundCell, float *pp
// keep the first node that has a valid OrigNode associated with it AND is
// part of the isectedCell.
//
// Kathleen Bonnell, Fri May 13 15:16:12 PDT 2005
// Fix memory leak.
//
// ****************************************************************************
int
......@@ -358,6 +361,7 @@ avtLocateNodeQuery::FindClosestPoint(vtkDataSet *ds, const int isectedCell,
oNode = -1;
}
}
cellPts->Delete();
}
else
{
......
......@@ -916,6 +916,9 @@ avtPickQuery::RetrieveVarInfo(vtkDataSet* ds, const int findElement,
// Kathleen Bonnell, Wed Dec 15 09:19:39 PST 2004
// Added call to 'SetGlobalIds'.
//
// Kathleen Bonnell, Mon May 16 07:35:27 PDT 2005
// Fix memory leak.
//
// ****************************************************************************
bool
......@@ -944,7 +947,7 @@ avtPickQuery::RetrieveNodes(vtkDataSet *ds, int zone)
{
unsigned char *gNodes = NULL;
unsigned char *gZones = NULL;
vtkIdList *cells;
vtkIdList *cells = NULL;
bool findGhosts = (ghostType == AVT_HAS_GHOSTS &&
((ds->GetPointData()->GetArray("avtGhostNodes") != NULL) ||
(ds->GetCellData()->GetArray("avtGhostZones") != NULL)));
......@@ -1071,6 +1074,8 @@ avtPickQuery::RetrieveNodes(vtkDataSet *ds, int zone)
pickAtts.SetElementIsGhost((gZones && gZones[zone]) ||
(nGnodes > 0 && nGnodes == ptIds->GetNumberOfIds()));
ptIds->Delete();
if (cells)
cells->Delete();
}
if (success && pickAtts.GetDisplayGlobalIds())
{
......
......@@ -755,6 +755,8 @@ avtMinMaxQuery::CreateResultMessage(const int n)
// Creation: July 1, 2004
//
// Modifications:
// Kathleen Bonnell, Fri May 13 13:45:58 PDT 2005
// Fix memory leak.
//
// ****************************************************************************
......@@ -809,6 +811,7 @@ avtMinMaxQuery::InfoToString(const MinMaxInfo &info)
}
os << ">)" << ends;
string str(os.str());
os.freeze(false);
return str;
}
......
......@@ -535,6 +535,9 @@ avtConeFilter::SetUpCone(void)
// Use 4-tuples for multiplying points (or else VTK does a UMR).
// Also renormalize basis vectors to ensure they are truly unit vectors.
//
// Kathleen Bonnell, Fri May 13 15:03:26 PDT 2005
// Fix memory leak.
//
// ****************************************************************************
void
......@@ -632,7 +635,6 @@ avtConeFilter::SetUpProjection(void)
mtlt->SetInput(result_transposed);
result_transposed->Delete();
transform = vtkTransformPolyDataFilter::New();
transform->SetTransform(mtlt);
mtlt->Delete();
......
......@@ -136,6 +136,9 @@ avtHistogramFilter::PreExecute(void)
// Kathleen Bonnell, Thu Jan 6 10:34:57 PST 2005
// Remove TRY-CATCH block in favor of testing for ValidActiveVariable.
//
// Kathleen Bonnell, Fri May 13 11:10:35 PDT 2005
// Fix memory leak.
//
// ****************************************************************************
void
......@@ -150,6 +153,8 @@ avtHistogramFilter::PostExecute(void)
for (i = 0 ; i < workingNumBins ; i++)
bins[i] = newBins[i];
delete [] newBins;
if (PAR_Rank() != 0)
{
SetOutputDataTree(new avtDataTree());
......
......@@ -191,6 +191,9 @@ avtWireframeFilter::ExecuteData(vtkDataSet *inDS, int, std::string)
// Hank Childs, Fri Mar 11 07:37:05 PST 2005
// Fix non-problem size leak introduced with last fix.
//
// Kathleen Bonnell, Fri May 13 15:39:41 PDT 2005
// Fix memory leak.
//
// ****************************************************************************
void
......@@ -210,13 +213,13 @@ avtWireframeFilter::ReleaseData(void)
appendFilter->SetInputByNumber(i, NULL);
}
p = vtkPolyData::New();
appendFilter->SetOutput(vtkPolyData::New());
appendFilter->SetOutput(p);
p->Delete();
edgesFilter->SetInput(NULL);
edgesFilter->SetLocator(NULL);
p = vtkPolyData::New();
edgesFilter->SetOutput(vtkPolyData::New());
edgesFilter->SetOutput(p);
p->Delete();
}
......
......@@ -350,6 +350,12 @@ void vtkVisItCutter::DataSetCutter()
output->Squeeze();
}
// ***************************************************************************
// Modifications:
// Kathleen Bonnell, Fri May 13 15:03:26 PDT 2005
// Fix memory leak.
//
// ***************************************************************************
void vtkVisItCutter::UnstructuredGridCutter()
{
......@@ -377,7 +383,6 @@ void vtkVisItCutter::UnstructuredGridCutter()
float range[2];
cellScalars=vtkFloatArray::New();
// Create objects to hold output of contour operation
//
......
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