Commit f51235e7 authored by pugmire's avatar pugmire

Move icalgorithm cleanup from execute to postexecute. This was causing problems in poincare plot.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11864 18c085ea-50e0-402c-830e-de6fd14e8384
parent eb80ffd0
......@@ -763,7 +763,11 @@ avtPICSFilter::CheckOnDemandViability(void)
//
// Hank Childs, Fri Jun 4 19:58:30 CDT 2010
// Use avtStreamlines, not avtStreamlineWrappers.
//
//
// Dave Pugmire, Tue Jul 13 09:24:57 EDT 2010
// Move icAlgo cleanup from Execute() to PostExecute(). The poincare plot
// analysis was using IC data after Execute() had been called.
//
// ****************************************************************************
void
......@@ -803,14 +807,6 @@ avtPICSFilter::Execute(void)
icAlgo->ResetIntegralCurvesForContinueExecute();
icAlgo->Execute();
}
icAlgo->PostExecute();
delete icAlgo;
icAlgo = NULL;
delete intervalTree;
intervalTree = NULL;
}
// ****************************************************************************
......@@ -1819,6 +1815,12 @@ avtPICSFilter::PreExecute(void)
// Programmer: Hank Childs
// Creation: June 5, 2010
//
// Modifications:
//
// Dave Pugmire, Tue Jul 13 09:24:57 EDT 2010
// Move icAlgo cleanup from Execute() to PostExecute(). The poincare plot
// analysis was using IC data after Execute() had been called.
//
// ****************************************************************************
void
......@@ -1829,6 +1831,13 @@ avtPICSFilter::PostExecute(void)
if (solver)
delete solver;
solver = NULL;
delete intervalTree;
intervalTree = NULL;
icAlgo->PostExecute();
delete icAlgo;
icAlgo = NULL;
}
......
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