Commit f2b2b63e authored by allens's avatar allens

clean up to files to remove streamline and use integral curve wording instead

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@21689 18c085ea-50e0-402c-830e-de6fd14e8384
parent bd904506
This diff is collapsed.
......@@ -63,34 +63,34 @@ class BlockIDType;
class avtICAlgorithm;
// Must match the streamline (poincare) attributes!!
#define STREAMLINE_FIELD_DEFAULT 0
#define STREAMLINE_FIELD_FLASH 1
#define STREAMLINE_FIELD_M3D_C1_2D 2
#define STREAMLINE_FIELD_M3D_C1_3D 3
#define STREAMLINE_FIELD_NEK5000 4
#define STREAMLINE_FIELD_NIMROD 5
#define STREAMLINE_INTEGRATE_EULER 0
#define STREAMLINE_INTEGRATE_LEAPFROG 1
#define STREAMLINE_INTEGRATE_DORMAND_PRINCE 2
#define STREAMLINE_INTEGRATE_ADAMS_BASHFORTH 3
#define STREAMLINE_INTEGRATE_RK4 4
#define STREAMLINE_INTEGRATE_M3D_C1_2D 5
#define STREAMLINE_TERMINATE_DISTANCE 0
#define STREAMLINE_TERMINATE_TIME 1
#define STREAMLINE_TERMINATE_STEPS 2
#define STREAMLINE_TERMINATE_INTERSECTIONS 3
#define STREAMLINE_SERIAL 0
#define STREAMLINE_PARALLEL_OVER_DOMAINS 1
#define STREAMLINE_PARALLEL_MASTER_SLAVE 2
#define STREAMLINE_VISIT_SELECTS 3
#define PICS_FIELD_DEFAULT 0
#define PICS_FIELD_FLASH 1
#define PICS_FIELD_M3D_C1_2D 2
#define PICS_FIELD_M3D_C1_3D 3
#define PICS_FIELD_NEK5000 4
#define PICS_FIELD_NIMROD 5
#define PICS_INTEGRATE_EULER 0
#define PICS_INTEGRATE_LEAPFROG 1
#define PICS_INTEGRATE_DORMAND_PRINCE 2
#define PICS_INTEGRATE_ADAMS_BASHFORTH 3
#define PICS_INTEGRATE_RK4 4
#define PICS_INTEGRATE_M3D_C1_2D 5
#define PICS_TERMINATE_DISTANCE 0
#define PICS_TERMINATE_TIME 1
#define PICS_TERMINATE_STEPS 2
#define PICS_TERMINATE_INTERSECTIONS 3
#define PICS_SERIAL 0
#define PICS_PARALLEL_OVER_DOMAINS 1
#define PICS_PARALLEL_MASTER_SLAVE 2
#define PICS_VISIT_SELECTS 3
#define PICS_CONN_CMFE 0
#define PICS_POS_CMFE 1
#define STREAMLINE_PARALLEL_COMM_DOMAINS 4
#define PICS_PARALLEL_COMM_DOMAINS 4
// ****************************************************************************
......
This diff is collapsed.
This diff is collapsed.
......@@ -254,11 +254,12 @@ avtStreamlinePolyDataFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCu
params->SetName(paramArrayName.c_str());
tangents->SetName(tangentsArrayName.c_str());
pd->GetPointData()->SetScalars(scalars);
pd->GetPointData()->AddArray(scalars);
pd->GetPointData()->AddArray(params);
pd->GetPointData()->AddArray(tangents);
if (displayMethod == STREAMLINE_DISPLAY_RIBBONS)
if (displayMethod == PICS_DISPLAY_RIBBONS)
{
thetas = vtkFloatArray::New();
thetas->Allocate(numPts);
......@@ -282,7 +283,7 @@ avtStreamlinePolyDataFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCu
double correlationDistMinDistToUse = correlationDistanceMinDist;
double correlationDistAngTolToUse = 0.0;
if (coloringMethod == STREAMLINE_CORRELATION_DISTANCE)
if (coloringMethod == PICS_CORRELATION_DISTANCE)
{
if (correlationDistanceDoBBox)
correlationDistMinDistToUse *= GetLengthScale();
......@@ -348,28 +349,28 @@ avtStreamlinePolyDataFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCu
// color scalars
switch (coloringMethod)
{
case STREAMLINE_COLOR_TIME:
case PICS_COLOR_TIME:
scalars->InsertTuple1(pIdx, s.time);
break;
case STREAMLINE_COLOR_SPEED:
case PICS_COLOR_SPEED:
scalars->InsertTuple1(pIdx, speed);
break;
case STREAMLINE_COLOR_VORTICITY:
case PICS_COLOR_VORTICITY:
scalars->InsertTuple1(pIdx, s.vorticity);
break;
case STREAMLINE_COLOR_ARCLENGTH:
case PICS_COLOR_ARCLENGTH:
scalars->InsertTuple1(pIdx, s.arclength);
break;
case STREAMLINE_COLOR_VARIABLE:
case PICS_COLOR_VARIABLE:
scalars->InsertTuple1(pIdx, s.scalar0);
break;
case STREAMLINE_COLOR_ID:
case PICS_COLOR_ID:
scalars->InsertTuple1(pIdx, ic->id);
break;
case STREAMLINE_COLOR_SOLID:
case PICS_COLOR_SOLID:
scalars->InsertTuple1(pIdx, 0.0f);
break;
case STREAMLINE_CORRELATION_DISTANCE:
case PICS_CORRELATION_DISTANCE:
scalars->InsertTuple1(pIdx, ComputeCorrelationDistance(j, ic, correlationDistAngTolToUse, correlationDistMinDistToUse));
break;
}
......
......@@ -190,7 +190,7 @@ avtIntegralCurve::~avtIntegralCurve()
// Method: avtIntegralCurve::Advance
//
// Purpose:
// Advances the streamline.
// Advances the integral curve.
//
// Programmer: Christoph Garth
// Creation: February 25, 2008
......@@ -462,7 +462,7 @@ avtIntegralCurve::Advance(avtIVPField *field)
// Method: avtIntegralCurve::Serialize
//
// Purpose:
// Serializes a streamline so it can be sent to another processor.
// Serializes an integral curve so it can be sent to another processor.
//
// Programmer: Christoph Garth
// Creation: February 25, 2008
......
......@@ -97,10 +97,10 @@ public:
virtual bool CheckForTermination(avtIVPStep& step, avtIVPField *);
unsigned int numSteps;
public:
unsigned int maxSteps;
protected:
unsigned int numSteps;
bool doDistance;
double maxDistance;
bool doTime;
......
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