Commit eaad4cdf authored by allens's avatar allens

minor addition to the directionless field vector set and added a search tempalte for searching

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@26353 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3edd0308
......@@ -165,6 +165,9 @@ avtICAlgorithm::PostRunAlgorithm()
vtkDataSet *
avtICAlgorithm::GetDomain(avtIntegralCurve *ic)
{
if( ic == NULL )
return NULL;
if (!ic->blockList.empty())
{
avtVector pt = ic->CurrentLocation();
......
......@@ -289,7 +289,8 @@ avtIntegralCurve::Advance(avtIVPField *field)
// For a directionless field the initial velocity direction needs
// to be known.
if( field->GetDirectionless() )
if( field->GetDirectionless() && ivp->GetCurrentV().length() == 0.0 )
{
// Find the value sans orientation checks.
field->SetDirectionless( false );
......@@ -519,8 +520,16 @@ avtIntegralCurve::Advance(avtIVPField *field)
if (DebugStream::Level5())
{
debug5 << "avtIntegralCurve::Advance(): done, status: "<<status<<endl;
debug5 << "avtIntegralCurve::Advance(): done, "
<< "numver of steps taken " << numStepsTaken << " "
<< "status: " << status << std::endl;
}
// if( 1000 < id && id < 1002 )
// std::cerr << "avtIntegralCurve::Advance(): done, "
// << "numver of steps taken " << numStepsTaken << " "
// << "status: " << status << std::endl;
return numStepsTaken;
}
......
......@@ -460,4 +460,15 @@ inline std::ostream& operator<<(std::ostream& out,
return out;
}
template< class IC>
IC * icFromID(int id, std::vector<IC *> &ics)
{
for (size_t i = 0; i < ics.size(); i++)
{
if (ics[i]->id == id)
return dynamic_cast<IC *>(ics[i]);
}
return NULL;
}
#endif // AVT_INTEGRAL_CURVE_H
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