Commit 560d75f1 authored by bonnell's avatar bonnell

Clean up commented-out unused vars

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23652 18c085ea-50e0-402c-830e-de6fd14e8384
parent e09b1687
......@@ -285,46 +285,10 @@ vtkCSGGrid::Box::IsFlatEnough2(const double *const gridBoundaries,
if (cos_theta < 0.0) cos_theta = -cos_theta;
double theta = acos(cos_theta);
// compute length of spatial box diagonal
// double db = sqrt((upper(X)-lower(X)) * (upper(X)-lower(X)) +
// (upper(Y)-lower(Y)) * (upper(Y)-lower(Y)) +
// (upper(Z)-lower(Z)) * (upper(Z)-lower(Z)));
//if (((1-cos(theta/2)) / (2*sin(theta/2))) < tol)
// return true;
if (2*sin(theta/2) < tol)
return true;
return false;
#if 0
// compute estimate of radius of curvature of this surface
double r = (db / 2.0) / sin(theta / 2.0);
if (r > tol)
return true;
return false;
#endif
#if 0
// square of length of box diagonal
double db = (upper(gradX)-lower(gradX)) * (upper(gradX)-lower(gradX)) +
(upper(gradY)-lower(gradY)) * (upper(gradY)-lower(gradY)) +
(upper(gradZ)-lower(gradZ)) * (upper(gradZ)-lower(gradZ));
// square of distance to center of box
double dc = ((upper(gradX)+lower(gradX)) * (upper(gradX)+lower(gradX)) +
(upper(gradY)+lower(gradY)) * (upper(gradY)+lower(gradY)) +
(upper(gradZ)+lower(gradZ)) * (upper(gradZ)+lower(gradZ))) / 4.0;
if (dc < 0.0) dc = -dc;
if (dc > 0.0)
{
if (db / dc < tol)
return true;
}
return false;
#endif
#else
return false;
#endif
......@@ -1134,11 +1098,6 @@ static void BoxXYZXYZToQuadric(const double *const box, double *quadric)
#endif
static void CylinderPNLRToQuadric(const double *const cyl, double *quadric)
{
// point
// double px = cyl[0];
// double py = cyl[1];
// double pz = cyl[2];
// normal
double nx = cyl[3];
double ny = cyl[4];
......
......@@ -213,7 +213,6 @@ vtkMultiSplitter::RequestData(
ndx = 0;
int nx = dims[0];
int ny = dims[1];
//int nz = dims[2];
vtkCSGFixedLengthBitField bf_zero;
for (int k = 0; k < dims[2] - 1; k++)
{
......
......@@ -61,9 +61,7 @@ void vtkPPMWriter::WriteFileHeader(ofstream *file, vtkImageData *cache, int wExt
int min0 = wExt[0],
max0 = wExt[1],
min1 = wExt[2],
max1 = wExt[3]/*,
min2 = wExt[4],
max2 = wExt[5]*/;
max1 = wExt[3];
int width, height;
width = (max0 - min0 + 1);
......
......@@ -215,7 +215,6 @@ vtkRectilinearLinesNoDataFilter::RequestData(
// Set up some objects that we will be using throughout the process.
//
vtkPolyData *outPD = vtkPolyData::New();
//vtkCellData *inCellData = input->GetCellData();
vtkPointData *inPointData = input->GetPointData();
vtkCellData *outCellData = outPD->GetCellData();
vtkPointData *outPointData = outPD->GetPointData();
......
......@@ -191,8 +191,8 @@ vtkVisItInterpolatedVelocityField::Evaluate(double *pt, double *vel, double t)
double resPt[3]={0.0,0.0,0.0};
int subId = 0;
locator->IgnoreGhostsOff();
/*int success = */ locator->FindClosestPointWithinRadius(pt, rad, resPt,
cell, subId, dist);
locator->FindClosestPointWithinRadius(pt, rad, resPt,
cell, subId, dist);
}
if (cell < 0)
......
......@@ -336,7 +336,7 @@ vtkVisItPolyDataNormals2D::ExecuteCell(vtkPolyData *input, vtkPolyData *output)
int nVerts = *connPtrL++;
vtkIdType *cell = connPtrL;
double v0[3], v1[3]/*, v2[3]*/;
double v0[3], v1[3];
double normal[3] = {0, 0, 1};
if (nVerts == 2)
{
......
......@@ -89,7 +89,7 @@ int vtkVisItProbeFilter::RequestData(
vtkDataSet *output = vtkDataSet::SafeDownCast(
outInfo->Get(vtkDataObject::DATA_OBJECT()));
vtkIdType ptId, numPts/*, cnt = 0*/;
vtkIdType ptId, numPts;
double x[3], tol2;
vtkCell *cell;
vtkPointData *pd, *outPD;
......
......@@ -273,8 +273,6 @@ vtkVisItStructuredGridNormals::ExecuteCell(vtkStructuredGrid *input,
// Get all the input and output objects we'll need to reference
output->ShallowCopy(input);
//vtkPoints *inPts = input->GetPoints();
int dims[3];
input->GetDimensions(dims);
int nCells = input->GetNumberOfCells();
......@@ -285,7 +283,6 @@ vtkVisItStructuredGridNormals::ExecuteCell(vtkStructuredGrid *input,
newNormals->SetNumberOfComponents(3);
newNormals->SetNumberOfTuples(nCells);
newNormals->SetName("Normals");
//float *newNormalPtr = (float*)newNormals->GetPointer(0);
int fastDim, slowDim;
if (dims[0] <= 1)
......
......@@ -2176,7 +2176,7 @@ int vtkVisItCellLocator::IntersectWithLine(double a0[3], double a1[3],
int bestDir, cellIsGhost;
double stopDist, currDist;
double length, maxLength = 0.0;
double tempT, tempX[3]/*, pc[3] = {0., 0., 0.}*/;
double tempT, tempX[3];
vtkUnsignedCharArray *ghosts =
(vtkUnsignedCharArray *)this->DataSet->GetCellData()->GetArray("avtGhostZones");
......
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