Commit da71df69 authored by hrchilds's avatar hrchilds

Minor cleanup to recent integral curve changes.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@11585 18c085ea-50e0-402c-830e-de6fd14e8384
parent 6c047c4a
......@@ -242,6 +242,9 @@ avtMasterSlaveICAlgorithm::~avtMasterSlaveICAlgorithm()
// Hank Childs, Fri Jun 4 19:58:30 CDT 2010
// Use avtStreamlines, not avtStreamlineWrappers.
//
// Hank Childs, Mon Jun 7 14:57:13 CDT 2010
// Reflect change in method name to InitializeBuffers.
//
// ****************************************************************************
void
......@@ -251,7 +254,7 @@ avtMasterSlaveICAlgorithm::Initialize(std::vector<avtIntegralCurve *> &seedPts)
if (numRecvs > 64)
numRecvs = 64;
avtParICAlgorithm::Initialize(seedPts, 2+NUM_DOMAINS, numRecvs);
avtParICAlgorithm::InitializeBuffers(seedPts, 2+NUM_DOMAINS, numRecvs);
}
void
......
......@@ -577,7 +577,7 @@ avtPICSFilter::SetTermination(int type, double term)
//
// Arguments:
// algo : Type of algorithm
// maxCnt : maximum number of streamlines to process before distributing.
// maxCnt : maximum number of integral curves to process before distributing.
//
// Programmer: Dave Pugmire
// Creation: Thu Mar 5 09:51:00 EST 2009
......@@ -605,7 +605,7 @@ avtPICSFilter::SetPathlines(bool pathlines, double time0)
//
// Arguments:
// algo : Type of algorithm
// maxCnt : maximum number of streamlines to process before distributing.
// maxCnt : maximum number of integral curves to process before distributing.
//
// Programmer: Dave Pugmire
// Creation: Thu Jul 31 12:46:32 EDT 2008
......@@ -1073,8 +1073,8 @@ avtPICSFilter::Initialize()
// ARS - commented as the doPathlines check below as will always fail
// because this scope is the !doPathline.
// We need to set seedTimeStep0 even for streamlines since it is used
// as time for the streamline seeds.
// We need to set seedTimeStep0 even for non-time varying since it is used
// as time for the seeds.
// if (doPathlines)
// seedTime0 = md->GetTimes()[activeTimeStep];
// else
......@@ -1929,13 +1929,12 @@ randMinus1_1()
// ****************************************************************************
void
avtPICSFilter::GetIntegralCurvesFromInitialSeeds(std::vector<avtIntegralCurve *> &streamlines)
avtPICSFilter::GetIntegralCurvesFromInitialSeeds(std::vector<avtIntegralCurve *> &curves)
{
std::vector<avtVector> seedPts = GetInitialLocations();
//Create streamlines from the seed points.
vector<vector<int> > ids;
CreateIntegralCurvesFromSeeds(seedPts, streamlines, ids);
CreateIntegralCurvesFromSeeds(seedPts, curves, ids);
}
// ****************************************************************************
......@@ -1965,7 +1964,7 @@ avtPICSFilter::AddSeedpoints(std::vector<avtVector> &pts,
// Method: avtPICSFilter::CreateIntegralCurvesFromSeeds
//
// Purpose:
// Create streamlines from seed points.
// Create integral curves from seed points.
//
// Programmer: Dave Pugmire
// Creation: December 3, 2009
......@@ -1985,7 +1984,7 @@ avtPICSFilter::AddSeedpoints(std::vector<avtVector> &pts,
void
avtPICSFilter::CreateIntegralCurvesFromSeeds(std::vector<avtVector> &pts,
std::vector<avtIntegralCurve *> &streamlines,
std::vector<avtIntegralCurve *> &curves,
std::vector<std::vector<int> > &ids)
{
for (int i = 0; i < pts.size(); i++)
......@@ -2011,7 +2010,7 @@ avtPICSFilter::CreateIntegralCurvesFromSeeds(std::vector<avtVector> &pts,
ic->termination = termination;
ic->terminationType = terminationType;
streamlines.push_back(ic);
curves.push_back(ic);
seedPtIds.push_back(ic->id);
}
......@@ -2025,7 +2024,7 @@ avtPICSFilter::CreateIntegralCurvesFromSeeds(std::vector<avtVector> &pts,
ic->termination = -termination;
ic->terminationType = terminationType;
streamlines.push_back(ic);
curves.push_back(ic);
seedPtIds.push_back(ic->id);
}
}
......@@ -2034,11 +2033,11 @@ avtPICSFilter::CreateIntegralCurvesFromSeeds(std::vector<avtVector> &pts,
}
//Sort them on domain.
std::sort(streamlines.begin(), streamlines.end(), avtIntegralCurve::DomainCompare);
std::sort(curves.begin(), curves.end(), avtIntegralCurve::DomainCompare);
for (int i = 0; i < streamlines.size(); i++)
for (int i = 0; i < curves.size(); i++)
{
avtIntegralCurve *ic = streamlines[i];
avtIntegralCurve *ic = curves[i];
if (DebugStream::Level5())
{
avtVector loc;
......@@ -2223,7 +2222,7 @@ avtPICSFilter::GetTerminatedIntegralCurves(vector<avtIntegralCurve *> &ics)
// Method: avtPICSFilter::DeleteIntegralCurves
//
// Purpose:
// Delete streamlines
// Delete integral curves
//
// Programmer: Dave Pugmire
// Creation: Tue May 25 10:15:35 EDT 2010
......
......@@ -121,6 +121,9 @@ avtParDomICAlgorithm::~avtParDomICAlgorithm()
// Rename method called in this function to reflect the new emphasis
// in particle advection, as opposed to streamlines.
//
// Hank Childs, Mon Jun 7 14:57:13 CDT 2010
// Reflect change in name to InitializeBuffers method.
//
// ****************************************************************************
void
......@@ -130,7 +133,7 @@ avtParDomICAlgorithm::Initialize(vector<avtIntegralCurve *> &seedPts)
if (numRecvs > 64)
numRecvs = 64;
avtParICAlgorithm::Initialize(seedPts, 1, numRecvs);
avtParICAlgorithm::InitializeBuffers(seedPts, 1, numRecvs);
numICChange = 0;
AddIntegralCurves(seedPts);
}
......
......@@ -111,12 +111,15 @@ avtParICAlgorithm::~avtParICAlgorithm()
// Hank Childs, Fri Jun 4 19:58:30 CDT 2010
// Use avtStreamlines, not avtStreamlineWrappers.
//
// Hank Childs, Mon Jun 7 14:57:13 CDT 2010
// Rename to InitializeBuffers to prevent name collision.
//
// ****************************************************************************
void
avtParICAlgorithm::Initialize(vector<avtIntegralCurve *> &seedPts,
int msgSz,
int numRecvs)
avtParICAlgorithm::InitializeBuffers(vector<avtIntegralCurve *> &seedPts,
int msgSz,
int numRecvs)
{
//Standardmsg + 1(sender rank) +1(msg ID).
statusMsgSz = msgSz+1+1;
......
......@@ -83,6 +83,9 @@
// Rename class "IC" from "SL", to reflect the emphasis on integral curves,
// as opposed to streamlines.
//
// Hank Childs, Mon Jun 7 14:57:13 CDT 2010
// Rename Initialize method to be InitializeBuffers to prevent name collision.
//
// ****************************************************************************
class avtParICAlgorithm : public avtICAlgorithm
......@@ -91,7 +94,7 @@ class avtParICAlgorithm : public avtICAlgorithm
avtParICAlgorithm(avtPICSFilter *icFilter);
virtual ~avtParICAlgorithm();
virtual void Initialize(std::vector<avtIntegralCurve *> &,
virtual void InitializeBuffers(std::vector<avtIntegralCurve *> &,
int, int);
virtual void PostExecute();
......
......@@ -57,6 +57,12 @@
// Creationist: Allen Sanderson
// Creation: 20 November 2009
//
// Modifications:
//
// Hank Childs, Mon Jun 7 14:48:03 CDT 2010
// Initialize variables to prevent compiler warning. (They are unused and
// just to get the template instantiation right.)
//
// ****************************************************************************
avtIVPM3DC1Field::avtIVPM3DC1Field( vtkVisItInterpolatedVelocityField* velocity )
......@@ -81,8 +87,8 @@ avtIVPM3DC1Field::avtIVPM3DC1Field( vtkVisItInterpolatedVelocityField* velocity
ds->GetCellData()->GetArray("hidden/elements")->GetNumberOfTuples();
// Dummy variable to the template class
int *intPtr, intVar;
float *fltPtr, fltVar;
int *intPtr, intVar = 0;
float *fltPtr, fltVar = 0;
// Single values from the header attributes.
intPtr = SetDataPointer( ds, intVar, "hidden/header/linear", nelms, 1 );
......
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