Commit 8269d19f authored by pugmire's avatar pugmire
Browse files

Add communicate to originating processor. Bug fix for streamlines going both...

Add communicate to originating processor. Bug fix for streamlines going both directions and tube with variable radius

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16063 18c085ea-50e0-402c-830e-de6fd14e8384
parent c785c39e
......@@ -105,7 +105,7 @@ avtIntegralCurve::avtIntegralCurve( const avtIVPSolver* model,
const avtVector &p_start,
const avtVector &v_start,
long ID )
: status(STATUS_OK), direction(dir), domain(-1), sortKey(0), id(ID)
: status(STATUS_OK), direction(dir), domain(-1), sortKey(0), id(ID), originatingRank(-1)
{
ivp = model->Clone();
ivp->Reset( t_start, p_start, v_start );
......@@ -159,6 +159,7 @@ avtIntegralCurve::avtIntegralCurve()
sortKey = 0;
id = -1;
counter = 0;
originatingRank = -1;
encounteredNumericalProblems = false;
postStepCallbackFunction = NULL;
}
......@@ -541,6 +542,7 @@ avtIntegralCurve::Serialize(MemStream::Mode mode, MemStream &buff,
buff.io(mode, status);
buff.io(mode, counter);
buff.io(mode, encounteredNumericalProblems);
buff.io(mode, originatingRank);
if ( mode == MemStream::WRITE )
{
......@@ -569,6 +571,16 @@ avtIntegralCurve::Serialize(MemStream::Mode mode, MemStream &buff,
<< buff.len() << endl;
}
// ****************************************************************************
// Method: avtIntegralCurve::DomainCompare
//
//
// Programmer: Dave Pugmire
// Creation: August 30, 2011
//
// ****************************************************************************
bool
avtIntegralCurve::DomainCompare(const avtIntegralCurve *icA,
const avtIntegralCurve *icB)
......
......@@ -270,6 +270,7 @@ class IVP_API avtIntegralCurve
int counter;
bool encounteredNumericalProblems;
int originatingRank;
protected:
avtIVPSolver* ivp;
......
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