Commit 9e9421ca authored by hrchilds's avatar hrchilds

Merge RC to trunk, picking up particle advection fixes.:wq


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@19958 18c085ea-50e0-402c-830e-de6fd14e8384
parent c96aa175
......@@ -366,6 +366,9 @@ avtSerialICAlgorithm::RunAlgorithm()
// Dave Pugmire, Tue Nov 30 13:24:26 EST 2010
// Change IC status when ic to not-terminated.
//
// Hank Childs, Tue Jan 8 17:53:46 PST 2013
// Continue to set particles to "OK", making pathlines work again.
//
// ****************************************************************************
void
......@@ -381,6 +384,7 @@ avtSerialICAlgorithm::ResetIntegralCurvesForContinueExecute(int curTimeSlice)
if( curTimeSlice == -1 || s->domain.timeStep == curTimeSlice )
{
activeICs.push_back(s);
s->status = avtIntegralCurve::STATUS_OK;
}
else
{
......
......@@ -554,7 +554,7 @@ void avtFTLEFilter::ComputeFtle(vtkDataArray *jacobian[3],vtkDataArray *result)
//x,y,z components compute front,back
avtVector dz(j0[2],j1[2],j2[2]);
std::cout << dx << " " << dy << " " << dz << std::endl;
//std::cout << dx << " " << dy << " " << dz << std::endl;
//J*J^T
//float a = dx.dot(dx), b = dx.dot(dy), c = dx.dot(dz);
......@@ -579,8 +579,8 @@ void avtFTLEFilter::ComputeFtle(vtkDataArray *jacobian[3],vtkDataArray *result)
double D = (r*r*r - q*q);
double phi = 0.0f;
std::cout << a << " " << b << " " << c << " " << d << " "
<< e << " " << f << " " << x << " " << q << " " << r << std::endl;
//std::cout << a << " " << b << " " << c << " " << d << " "
//<< e << " " << f << " " << x << " " << q << " " << r << std::endl;
if( D < std::numeric_limits<double>::epsilon())
phi = 0.0f;
else
......@@ -608,7 +608,7 @@ void avtFTLEFilter::ComputeFtle(vtkDataArray *jacobian[3],vtkDataArray *result)
lambda = log( sqrtf( lambda ) );
lambda /= (double) atts.GetIntegrationTime();
std::cout << "lambda :" << lambda << std::endl;
//std::cout << "lambda :" << lambda << std::endl;
result->SetTuple1(l,lambda);
}
}
......
......@@ -45,6 +45,8 @@ list of changes in release 2.6.</p>
<li>A bug caused by an indexing error was corrected in depth cueing. Thanks Jean Favre for the fix.</li>
<li>'import visit' from an installed python on Windows is again operational.</li>
<li>An error was corrected in the WriteScript python function where GetCurveView was incorrectly used instead of GetViewCurve. Thanks Jean Favre for the fix.</li>
<li>Pathlines again work when running in serial.</li>
<li>The FTLE operator no longer issues many print statements, which slowed down client-server performance.</li>
</ul>
<p><b><font size="4">Enhancements in version 2.6.1</font></b></p>
......
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