Commit 434788e4 authored by hrchilds's avatar hrchilds

More cleanup in anticipation of streamline changes.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11560 18c085ea-50e0-402c-830e-de6fd14e8384
parent efc0bd19
......@@ -2132,6 +2132,9 @@ avtStreamlineFilter::IntegrateDomain(avtStreamlineWrapper *slSeg,
// Hank Childs, Thu Jun 3 10:22:16 PDT 2010
// Use new name "GetCurrentLocation".
//
// Hank Childs, Fri Jun 4 05:13:49 PDT 2010
// Remove call for collecting statistics that was a no-op.
//
// ****************************************************************************
void
......@@ -2155,9 +2158,6 @@ avtStreamlineFilter::IntegrateStreamline(avtStreamlineWrapper *slSeg,
}
else
{
// Integrate over this domain.
slSeg->UpdateDomainCount(slSeg->domain);
double extents[6] = { 0.,0., 0.,0., 0.,0. };
intervalTree->GetElementExtents(slSeg->domain.domain, extents);
IntegrateDomain(slSeg, ds, extents, maxSteps);
......
......@@ -87,7 +87,6 @@ avtStreamlineWrapper::avtStreamlineWrapper()
sequenceCnt = 0;
terminated = false;
sl = NULL;
maxCnt = sum= numDomainsVisited = 0;
id = -1;
sortKey = 0;
......@@ -124,7 +123,6 @@ avtStreamlineWrapper::avtStreamlineWrapper(avtStreamline *s, int ID)
status = UNSET;
domain = -1;
sequenceCnt = 0;
maxCnt = sum= numDomainsVisited = 0;
id = ID;
terminated = false;
termination = 0.0;
......@@ -281,64 +279,6 @@ avtStreamlineWrapper::GetCurrentLocation(avtVector &pt, double &t) const
}
// ****************************************************************************
// Method: avtStreamlineWrapper::UpdateDomainCount
//
// Purpose:
// Updates the domain count.
//
// Programmer: Dave Pugmire
// Creation: June 16, 2008
//
// Modifictaions:
//
// Dave Pugmire, Tue Mar 10 12:41:11 EDT 2009
// Generalized domain to include domain/time. Pathine cleanup.
//
// ****************************************************************************
void
avtStreamlineWrapper::UpdateDomainCount(DomainType &dom)
{
/*
if (dom.domain+1 > domainVisitCnts.size())
domainVisitCnts.resize(dom.domain+1, 0);
domainVisitCnts[dom.domain]++;
*/
}
// ****************************************************************************
// Method: avtStreamlineWrapper::ComputeStatistics
//
// Purpose:
// Computes statistics on the number of domains visited.
//
// Programmer: Dave Pugmire
// Creation: June 16, 2008
//
// ****************************************************************************
void
avtStreamlineWrapper::ComputeStatistics()
{
maxCnt = 0;
sum = 0;
numDomainsVisited = 0;
/*
for (size_t i = 0; i < domainVisitCnts.size(); i++)
{
int cnt = domainVisitCnts[i];
if (cnt > maxCnt)
maxCnt = cnt;
if (cnt > 0)
numDomainsVisited++;
sum += cnt;
}
*/
}
// ****************************************************************************
// Method: avtStreamlineWrapper::IdSeqCompare
//
......
......@@ -154,8 +154,6 @@ class AVTFILTERS_API avtStreamlineWrapper
avtStreamlineWrapper(avtStreamline *s, int ID=-1);
~avtStreamlineWrapper();
void UpdateDomainCount(DomainType &dom);
void ComputeStatistics();
void GetCurrentLocation(avtVector &pt, double &t) const;
void GetCurrentLocation(avtVector &pt) const
{double t; GetCurrentLocation(pt,t); }
......@@ -185,9 +183,6 @@ class AVTFILTERS_API avtStreamlineWrapper
DomainType domain;
Status status;
// statistical bookeeping.
//std::vector<int> domainVisitCnts;
int maxCnt, sum, numDomainsVisited;
long id, sequenceCnt;
long long sortKey;
};
......
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