Commit e601c1db authored by hrchilds's avatar hrchilds

AVT changes from Hari's warnings cleanup


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23932 18c085ea-50e0-402c-830e-de6fd14e8384
parent e156c2bd
......@@ -672,7 +672,7 @@ avtExpressionFilter::GetVariableDimension(void)
// ds The mesh the variable lays on.
// arr The variable to recenter.
// currCent The current centering of the variable
// targCent The desires centering of the variable
// targCent The desired centering of the variable
//
// Returns: The array recentered. Note: the calling routine will then
// be responsible for deleting the returned object.
......
......@@ -1021,7 +1021,6 @@ avtPosCMFEAlgorithm::DesiredPoints::RelocatePointsUsingPartition(
// Translate the buffers we just received into the points we should look
// at.
//
//int numPts = 0;
pt_list_came_from.clear();
vector<double *> new_pt_list;
vector<int> new_pt_list_size;
......@@ -2207,12 +2206,6 @@ Boundary::AttemptSplit(Boundary *&b1, Boundary *&b2)
double min, max;
// int index = 0;
// if (axis == Y_AXIS)
// index = 2;
// else if (axis == Z_AXIS)
// index = 4;
if (firstBigger <= 0)
{
min = pivots[0] - (pivots[1] - pivots[0]);
......
......@@ -133,7 +133,6 @@ avtTensorMaximumShearExpression::DoOperation(vtkDataArray *in, vtkDataArray *out
invariant2 += dev2*vals[1]*vals[1];
double princ0 = 0.;
//double princ1 = 0.;
double princ2 = 0.;
if (invariant1 >= 1e-100)
{
......@@ -147,8 +146,9 @@ avtTensorMaximumShearExpression::DoOperation(vtkDataArray *in, vtkDataArray *out
double angle = acos((double)alpha) / 3.;
double value = 2.0 * sqrt(invariant1 / 3.);
princ0 = value*cos(angle);
// Displace the angle for princ1 (which we don't calculate)
angle = angle - 2.0*vtkMath::Pi()/3.;
//princ1 = value*cos(angle);
// Now displace for princ2
angle = angle + 4.0*vtkMath::Pi()/3.;
princ2 = value*cos(angle);
}
......
......@@ -705,8 +705,6 @@ avtConnComponentsExpression::LabelBoundaryNeighbors(vtkDataSet *data_set)
true, true, NULL);
delete flf;
clone_ds->Delete();
//vtkDataSet *ds = tree->GetSingleLeaf();
// we do not need to Delete ds because it is contained by tree
// we do not need to delete tree, since it is a ref_ptr
// init the boundary neighbors array
......@@ -1282,11 +1280,6 @@ avtConnComponentsExpression::GlobalResolve(int num_comps,
std::vector<vtkDataSet*> sets;
std::vector<vtkIntArray*> labels;
// get the id of the local processor
//int procid = PAR_Rank();
// get the number of local datasets
//int n_local_sets = local_sets.size();
// To create the spatial partition, we first need to know the bounds of
// the entire dataset.
......@@ -1374,7 +1367,6 @@ avtConnComponentsExpression::GlobalUnion(int num_comps,
// get the number of processors and the current processor id
int nprocs = PAR_Size();
//int procid = PAR_Rank();
// create a union find data structure for resolving the labels
// (in this case all union representatives are valid)
......@@ -2369,7 +2361,6 @@ avtConnComponentsExpression::BoundarySet::RelocateUsingPartition
// get the current processor id and the # of processors
int nprocs = PAR_Size();
//int procid = PAR_Rank();
char *snd_msg = NULL;
int *snd_count = new int[nprocs];
......@@ -2981,12 +2972,6 @@ PartitionBoundary::AttemptSplit(PartitionBoundary *&b1, PartitionBoundary *&b2)
float min, max;
// int index = 0;
// if (axis == Y_AXIS)
// index = 2;
// else if (axis == Z_AXIS)
// index = 4;
if (firstBigger <= 0)
{
min = pivots[0] - (pivots[1] - pivots[0]);
......
......@@ -168,7 +168,6 @@ avtGeodesicVectorQuantizeExpression::DeriveVariable(vtkDataSet *in_ds, int curre
// accumulate at all points within "spread" units of a dp of 1.0,
// weighted by dot product squared
int maxindex = -1;
//double maxvlen = -1e9;
double maxdp = -1e9;
for (int j=0; j<geodesic_sphere_npts; j++)
{
......@@ -179,7 +178,6 @@ avtGeodesicVectorQuantizeExpression::DeriveVariable(vtkDataSet *in_ds, int curre
if (dp > maxdp)
{
maxdp = dp;
//maxvlen = vlen;
maxindex = j;
}
}
......
......@@ -1056,7 +1056,6 @@ avtGradientExpression::LogicalGradient(vtkStructuredGrid *sg,
int dims[3];
sg->GetDimensions(dims);
//bool isNodal = true;
vtkDataArray *s = sg->GetPointData()->GetScalars();
if (s == NULL)
{
......@@ -1067,7 +1066,6 @@ avtGradientExpression::LogicalGradient(vtkStructuredGrid *sg,
" be found.");
}
//isNodal = false;
dims[0] -= 1;
dims[1] -= 1;
dims[2] -= 1;
......
......@@ -132,8 +132,6 @@ avtMeshCoordinateExpression::DeriveVariable(vtkDataSet *in_ds, int currentDomain
vtkDataArray *Y = rg->GetYCoordinates();
vtkDataArray *Z = rg->GetZCoordinates();
//int npts = dims[0]*dims[1]*dims[2];
#define EXTRACT_COORDS(dtype) \
{ \
dtype *x = (dtype*)X->GetVoidPointer(0); \
......
......@@ -222,7 +222,7 @@ avtRecenterExpression::DeriveVariable(vtkDataSet *in_ds, int currentDomainsIndex
vtkDataArray *rv = NULL;
avtCentering target = AVT_NO_VARIABLE; /// TODO: only var not used..
avtCentering target = AVT_UNKNOWN_CENT;
switch(recenterMode)
{
case Nodal:
......
......@@ -106,12 +106,13 @@ avtViscousStressExpression::DeriveVariable(vtkDataSet *in_ds, int currentDomains
avtDataAttributes &atts = GetInput()->GetInfo().GetAttributes();
topo_dim = atts.GetTopologicalDimension();
if(topo_dim == 2) { /// TODO: Check the parens
if(GetInput()->GetInfo().GetAttributes().GetMeshCoordType()== AVT_XY)
{rz_mesh = false;}
else
{rz_mesh = true;}
if(topo_dim == 2)
{
if (GetInput()->GetInfo().GetAttributes().GetMeshCoordType()== AVT_XY)
rz_mesh = false;
}
else
rz_mesh = true;
if(topo_dim != 2)
{
......
......@@ -145,7 +145,6 @@ avtMinCornerArea::GetMinCornerArea(vtkCell *cell)
for (vtkIdType i = 0 ; i < nPts ; i++)
{
//vtkIdType ID = cell->GetPointId(i);
cell->GetPoints()->GetPoint(i, ptV);
ptX[i] = ptV[0];
ptY[i] = ptV[1];
......
......@@ -147,7 +147,6 @@ avtMinSinCorner::GetMinSinCorner(vtkCell *cell)
// Counter-ClockWise ordering:
for (vtkIdType i = 0 ; i < nPts ; i++)
{
//vtkIdType ID = cell->GetPointId(i);
cell->GetPoints()->GetPoint(i, ptV);
ptX[i] = ptV[0];
ptY[i] = ptV[1];
......@@ -156,7 +155,6 @@ avtMinSinCorner::GetMinSinCorner(vtkCell *cell)
// ClockWise ordering:
for (vtkIdType i = 0 ; i < nPts ; i++)
{
//vtkIdType ID = cell->GetPointId(i);
cell->GetPoints()->GetPoint((3-i), ptV);
ptX[i] = ptV[0];
ptY[i] = ptV[1];
......
......@@ -333,8 +333,6 @@ avtFacelistFilter::FindFaces(avtDataRepresentation *in_dr,
std::string label = in_dr->GetLabel();
int tDim = info.GetAttributes().GetTopologicalDimension();
//int sDim = info.GetAttributes().GetSpatialDimension();
//int dis_elem = info.GetValidity().GetDisjointElements();
vtkDataSet *orig_in_ds = in_ds;
bool shouldDeleteInDs = false;
......
......@@ -99,9 +99,8 @@ bool sortImgByDepthIota(iotaMeta const& before, iotaMeta const& after){
avtImgCommunicator::avtImgCommunicator(){
#ifdef PARALLEL
/*int ierr;*/
/*ierr =*/ MPI_Comm_size(VISIT_MPI_COMM, &num_procs);
/*ierr =*/ MPI_Comm_rank(VISIT_MPI_COMM, &my_id);
MPI_Comm_size(VISIT_MPI_COMM, &num_procs);
MPI_Comm_rank(VISIT_MPI_COMM, &my_id);
_img_mpi = createMetaDataType();
MPI_Type_commit(&_img_mpi);
......@@ -1048,7 +1047,6 @@ void avtImgCommunicator::gatherAndAssembleEncodedImages(int sizex, int sizey, in
recvSizePerProc = new int[num_procs];
offsetBuffer = new int[num_procs];
//int divCount = 0;
for (int i=0; i<num_procs; i++){
int numBoundsPerBlock = boundsPerBlockVec[i].size()/2;
totalDivisions += numBoundsPerBlock;
......
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