Commit 3791e93f authored by bonnell's avatar bonnell

warning cleanup

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23684 18c085ea-50e0-402c-830e-de6fd14e8384
parent 0b7d189d
......@@ -951,7 +951,6 @@ avtAMRStitchCellFilter::CreateStitchCells(vtkRectilinearGrid *rgrid,
{
// Create unstructured grid for stitch cells
vtkPoints *stitchCellPts = vtkVisItUtility::NewPoints(rgrid);
//vtkUnstructuredGrid *stitchCellGrid = vtkUnstructuredGrid::New();
vtkUnstructuredGrid *ugrid = vtkUnstructuredGrid::New();
ugrid->SetPoints(stitchCellPts);
stitchCellPts->Delete();
......
......@@ -184,8 +184,8 @@ vtkBoxFilter::RequestData(
{
pointMap[i] = -1;
}
bool *isInBox = NULL; ///TODO: check on fix for uninitialized pointer
char *relativeToBox[3] = {NULL, NULL, NULL}; ///TODO: check on fix for uninitialized pointer
bool *isInBox = NULL;
char *relativeToBox[3] = {NULL, NULL, NULL};
float bxpts[8][3];
double bounds[6];
......
......@@ -304,7 +304,8 @@ avtCartographicProjectionFilter::ExecuteData(vtkDataSet *in_ds, int, std::string
ds->SetPoints(newPoints);
if(do_type != VTK_POLY_DATA) {
if(do_type != VTK_POLY_DATA)
{
debug4 << "dims = " << dims[0] << " x " << dims[1] << " x " << dims[2] << endl;
}
......
......@@ -659,7 +659,7 @@ ClipAttributes::CreateCompatible(const std::string &tname) const
else if(tname == "PlaneAttributes" && GetPlaneToolControlledClipPlane() != None)
{
PlaneAttributes *p = new PlaneAttributes;
const double *normal_arr = NULL; //TODO: check on fix for uninitialized array
const double *normal_arr = NULL;
switch (GetPlaneToolControlledClipPlane())
{
......
......@@ -153,7 +153,7 @@ ClipAttributes::CreateCompatible(const std::string &tname) const
else if(tname == "PlaneAttributes" && GetPlaneToolControlledClipPlane() != None)
{
PlaneAttributes *p = new PlaneAttributes;
const double *normal_arr;
const double *normal_arr = NULL;
switch (GetPlaneToolControlledClipPlane())
{
......
......@@ -850,8 +850,6 @@ avtClipFilter::Clip1DRGrid(vtkImplicitBoolean *ifuncs, bool inv,
vtkDataArray *outXC = outGrid->GetXCoordinates();
vtkDataArray *outVal = inVal->NewInstance();
//int nx = inXC->GetNumberOfTuples();
double lastX = inXC->GetTuple1(0);
double lastVal = inVal->GetTuple1(0);
double lastDist = ifuncs->EvaluateFunction(lastX, 0., 0.);
......@@ -875,7 +873,7 @@ avtClipFilter::Clip1DRGrid(vtkImplicitBoolean *ifuncs, bool inv,
if ((dist <= 0 && inv) || (lastDist > 0 && !inv))
whichCase += 2;
double x1 = 0, x2 = 0, d1 = 0., d2 = 1., v1 = 0, v2 = 0, newX = 0., newVal = 0.; ///TODO: check on fix for uninitialized values
double x1 = 0, x2 = 0, d1 = 0., d2 = 1., v1 = 0, v2 = 0, newX = 0., newVal = 0.;
switch(whichCase)
{
case 1 :
......
......@@ -275,8 +275,8 @@ vtkCrackWidthFilter::RequestData(
// step through cells, calculating cell centers and crack widths for
// each crack direction. Terminate early when possible.
//
vtkDoubleArray *crackWidth = NULL; ///TODO: check on fix for uninitialized vars
double delta = 0, cw, zVol, *dir = NULL, *maxCW = NULL; ///TODO: check on fix for unitialized vars
vtkDoubleArray *crackWidth = NULL;
double delta = 0, cw, zVol, *dir = NULL, *maxCW = NULL;
int crackOrder[3];
for (vtkIdType cellId = 0; cellId < numCells; cellId++)
......
......@@ -460,9 +460,6 @@ avtCreateBondsFilter::ExecuteData_Fast(vtkPolyData *in, float maxBondDist,
// for periodic atom images
//
bool addPeriodicBonds = atts.GetAddPeriodicBonds();
//bool xper = addPeriodicBonds && atts.GetPeriodicInX();
//bool yper = addPeriodicBonds && atts.GetPeriodicInY();
//bool zper = addPeriodicBonds && atts.GetPeriodicInZ();
double xv[3], yv[3], zv[3];
for (int j=0; j<3; j++)
{
......
......@@ -288,7 +288,6 @@ avtCylinderFilter::ExecuteData(vtkDataSet *in_ds, int, std::string)
void
avtCylinderFilter::UpdateDataObjectInfo(void)
{
//avtDataAttributes &inAtts = GetInput()->GetInfo().GetAttributes();
avtDataAttributes &outAtts = GetOutput()->GetInfo().GetAttributes();
avtDataValidity &outValidity = GetOutput()->GetInfo().GetValidity();
......
......@@ -350,8 +350,6 @@ avtDataBinningFilter::Execute(void)
SetOutputDataTree(new avtDataTree());
avtDataAttributes &dataAtts = GetOutput()->GetInfo().GetAttributes();
//int dim = ( (atts.GetNumDimensions() == DataBinningAttributes::One) ? 1
// : ((atts.GetNumDimensions() == DataBinningAttributes::Two) ? 2 : 3));
dataAtts.GetThisProcsOriginalSpatialExtents()->Set(&bb[0]);
dataAtts.GetOriginalSpatialExtents()->Set(&bb[0]);
}
......@@ -557,14 +555,13 @@ avtDataBinningFilter::ModifyContract(avtContract_p inContract)
out_dr = new avtDataRequest(in_dr);
std::vector<CharStrRef> vars2nd = in_dr->GetSecondaryVariablesWithoutDuplicates();
std::vector<std::string> removeMe;
size_t i;
for (i = 0 ; i < vars2nd.size() ; i++)
for (size_t i = 0 ; i < vars2nd.size() ; i++)
if (strncmp(*(vars2nd[i]), "operators/DataBinning", strlen("operators/DataBinning")) == 0)
{
varname = *(vars2nd[i]);
removeMe.push_back(*(vars2nd[i]));
}
for (i = 0 ; i < removeMe.size() ; i++)
for (size_t i = 0 ; i < removeMe.size() ; i++)
out_dr->RemoveSecondaryVariable(removeMe[i].c_str());
if (atts.GetDim1BinBasedOn() == DataBinningAttributes::Variable)
......@@ -679,7 +676,6 @@ avtDataBinningFilter::ModifyContract(avtContract_p inContract)
void
avtDataBinningFilter::UpdateDataObjectInfo(void)
{
//avtDataAttributes &inAtts = GetInput()->GetInfo().GetAttributes();
avtDataAttributes &dataAtts = GetOutput()->GetInfo().GetAttributes();
dataAtts.AddVariable(varname);
dataAtts.SetActiveVariable(varname.c_str());
......
......@@ -173,6 +173,11 @@ avtExtractPointFunction2DFilter::PreExecute(void)
// Programmer: ghweber -- generated by xml2avt
// Creation: Tue Jun 4 10:46:56 PDT 2013
//
// Modifications:
// Kathleen Biagas, Tue Jul 8 14:52:03 PDT 2014
// Moved avtRealDims code into FIXME comment, to suppress warnings until
// such a time as they are used.
//
// ****************************************************************************
vtkDataSet *
......@@ -198,22 +203,19 @@ avtExtractPointFunction2DFilter::ExecuteData(vtkDataSet *in_ds, int domain, std:
for (int d = 0; d < 3; ++d)
base_index[d] = arr->GetValue(d);
arr = dynamic_cast<vtkIntArray*>(in_ds->GetFieldData()->GetArray("avtRealDims"));
int iMin = base_index[0];
int iMax = base_index[0] + dims[0] - 1;
int jMin = base_index[1];
int jMax = base_index[1] + dims[1] - 1;
//int kMin = base_index[2];
//int kMax = base_index[2] + dims[2] - 1;
int avtRealDims[6] = { 0, 0, 0, 0, 0, 0 };
if (arr)
for (int d = 0; d < 6; ++d)
avtRealDims[d] = arr->GetValue(d);
(void) avtRealDims; ///suppress unused warning
// FIXME: Take avtRealDims into account
// arr = dynamic_cast<vtkIntArray*>(in_ds->GetFieldData()->GetArray("avtRealDims"));
// int avtRealDims[6] = { 0, 0, 0, 0, 0, 0 };
// if (arr)
// for (int d = 0; d < 6; ++d)
// avtRealDims[d] = arr->GetValue(d);
if (iMin <= atts.GetI() && atts.GetI() <= iMax && jMin <= atts.GetJ() && atts.GetJ() <= jMax)
{
double dx = 1.0;
......
......@@ -752,7 +752,6 @@ avtExtrudeFilter::UpdateDataObjectInfo(void)
// Now extrude the extents.
//
double b[6];
//int olddim = inAtts.GetSpatialDimension();
if (inAtts.GetOriginalSpatialExtents()->HasExtents())
{
inAtts.GetOriginalSpatialExtents()->CopyTo(b);
......
......@@ -145,7 +145,7 @@ IndexSelectViewerPluginInfo::InitializeOperatorAtts(AttributeSubject *atts,
if (*collection != NULL)
{
int nSets = collection->GetNumberOfSubsets();
for (size_t i = 0; i < nSets && !subsetNameValid; ++i)
for (int i = 0; i < nSets && !subsetNameValid; ++i)
{
bool isOn = false;
if (silAtts->GetTopSetIsAllOn())
......
......@@ -251,8 +251,8 @@ IndexSelectViewerPluginInfo::InitializeOperatorAtts(AttributeSubject *atts,
restriction->GetSILCollection(colIndex);
if (*collection != NULL)
{
size_t nSets = collection->GetNumberOfSubsets();
for (size_t i = 0; i < nSets && !subsetNameValid; ++i)
int nSets = collection->GetNumberOfSubsets();
for (int i = 0; i < nSets && !subsetNameValid; ++i)
{
bool isOn = false;
if (silAtts->GetTopSetIsAllOn())
......
......@@ -829,14 +829,13 @@ avtIndexSelectFilter::ModifyContract(avtContract_p spec)
// So see which species are on.
std::vector<int> species;
std::vector<bool> setState;
unsigned int i;
int topset = silr->GetTopSet();
avtSILSet_p pTopset = silr->GetSILSet(topset);
const std::vector<int> &mapsOut = pTopset->GetRealMapsOut();
avtSILCollection_p speciesColl = NULL;
for (i = 0 ; i < mapsOut.size() ; i++)
for (size_t i = 0 ; i < mapsOut.size() ; i++)
{
avtSILCollection_p coll = silr->GetSILCollection(mapsOut[i]);
if (coll->GetRole() == SIL_SPECIES)
......@@ -846,7 +845,7 @@ avtIndexSelectFilter::ModifyContract(avtContract_p spec)
}
if (*speciesColl != NULL)
{
for (i = 0 ; i < (unsigned int)speciesColl->GetNumberOfSubsets() ; i++)
for (int i = 0 ; i < speciesColl->GetNumberOfSubsets() ; i++)
setState.push_back(trav.UsesData(speciesColl->GetSubset(i)));
}
// End logic for seeing which species is on.
......@@ -857,17 +856,17 @@ avtIndexSelectFilter::ModifyContract(avtContract_p spec)
// We've just turned on an entire set, but some parts
// (materials) may have been turned off before, so ensure
// that remains the case.
unsigned int numSets = silr->GetNumSets();
for (i = 0; i < numSets ; i++)
int numSets = silr->GetNumSets();
for (int i = 0; i < numSets ; i++)
{
if ((unsigned int)setID == i)
if (setID == i)
continue;
if (trav.UsesSetData(i) == NoneUsed)
silr->TurnOffSet(i);
}
// Turn sets back on if species are on.
for (i = 0 ; i < species.size() ; i++)
for (size_t i = 0 ; i < species.size() ; i++)
if (setState[i])
silr->TurnOnSet(species[i]);
}
......
......@@ -421,7 +421,6 @@ IntegralCurveViewerPluginInfo::GetOperatorVarDescription(AttributeSubject *atts,
{
IntegralCurveAttributes *atts_in = (IntegralCurveAttributes *)atts;
const char numTypes = 11;
const char *typeString[11] =
{ "None", "Seed Point ID", "Speed", "Vorticity", "Arc Length",
"Absolute Time", "Relative Time",
......
......@@ -236,7 +236,6 @@ IntegralCurveViewerPluginInfo::GetOperatorVarDescription(AttributeSubject *atts,
{
IntegralCurveAttributes *atts_in = (IntegralCurveAttributes *)atts;
//const char numTypes = 11;
const char *typeString[11] =
{ "None", "Seed Point ID", "Speed", "Vorticity", "Arc Length",
"Absolute Time", "Relative Time",
......
......@@ -978,7 +978,6 @@ QvisIntegralCurveWindow::CreateAppearanceTab(QWidget *pageAppearance)
void
QvisIntegralCurveWindow::CreateAdvancedTab(QWidget *pageAdvanced)
{
//int row = 0;
QGridLayout *mainLayout = new QGridLayout(pageAdvanced);
mainLayout->setMargin(5);
mainLayout->setSpacing(5);
......
......@@ -488,7 +488,6 @@ avtIntegralCurveFilter::UpdateDataObjectInfo(void)
avtDataAttributes &in_atts = GetInput()->GetInfo().GetAttributes();
avtDataAttributes &out_atts = GetOutput()->GetInfo().GetAttributes();
//avtDataValidity &val = GetOutput()->GetInfo().GetValidity();
if( outVarName != "" )
{
......@@ -2139,7 +2138,8 @@ avtIntegralCurveFilter::ReportWarnings(std::vector<avtIntegralCurve *> &ics)
int numStiff = 0;
int numCritPts = 0;
if (DebugStream::Level5()) {
if (DebugStream::Level5())
{
debug5 << "::CreateIntegralCurveOutput " << ics.size() << endl;
}
......@@ -2290,11 +2290,9 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
return;
int numICs = ics.size(), numPts = 0;
//int numEarlyTerminators = 0;
//int numStiff = 0;
//int numCritPts = 0;
if (DebugStream::Level5()) {
if (DebugStream::Level5())
{
debug5 << "::CreateIntegralCurveOutput " << ics.size() << endl;
}
......
......@@ -229,7 +229,6 @@ LCSViewerPluginInfo::GetOperatorVarDescription(AttributeSubject *atts,
{
LCSAttributes *atts_in = (LCSAttributes *)atts;
const char numTypes = 3;
const char *typeString[2][3] = { { "FTLE", "FDLE", "FSLE" },
{ "Time", "Arc length",
"Ave. dist. from seed" } };
......
......@@ -236,7 +236,6 @@ LCSViewerPluginInfo::GetOperatorVarDescription(AttributeSubject *atts,
{
LCSAttributes *atts_in = (LCSAttributes *)atts;
//const char numTypes = 3;
const char *typeString[2][3] = { { "FTLE", "FDLE", "FSLE" },
{ "Time", "Arc length",
"Ave. dist. from seed" } };
......
......@@ -591,7 +591,6 @@ QvisLCSWindow::CreateAppearanceTab(QWidget *pageAppearance)
void
QvisLCSWindow::CreateAdvancedTab(QWidget *pageAdvanced)
{
//int row = 0;
QGridLayout *mainLayout = new QGridLayout(pageAdvanced);
mainLayout->setMargin(5);
mainLayout->setSpacing(5);
......
......@@ -558,7 +558,7 @@ avtLCSFilter::PreExecute(void)
double minResolution = std::numeric_limits<float>::max();
double resX, resY, resZ;
double resX = 0., resY = 0., resZ = 0.;
if (global_resolution[0] > 1)
{
......@@ -882,10 +882,6 @@ avtLCSFilter::GetInitialLocationsFromRectilinearGrid()
global_bounds[0]*(1.0-xpcnt) +
global_bounds[1]*xpcnt;
//size_t index =
// (global_resolution[1]*global_resolution[0]*k) +
// (global_resolution[0]*j)+i;
seedPoints[l++].set(x,y,z);
}
}
......@@ -2069,7 +2065,8 @@ avtLCSFilter::SingleBlockIterativeCalc( vtkDataSet *out_ds,
UnifyMaximumValue(iHavePoint, anyoneHasPoint);
avtVector zero;
zero.x = zero.y = zero.z = 0.;
for (size_t i = 0; i < (size_t)nTuples; i++) {
for (size_t i = 0; i < (size_t)nTuples; i++)
{
if (PAR_Rank() == 0 && !anyoneHasPoint[i])
{
remapPoints[i] = seedPoints.at(offset + i);
......@@ -2986,7 +2983,8 @@ avtLCSFilter::ReportWarnings(std::vector<avtIntegralCurve *> &ics)
int numStiff = 0;
int numCritPts = 0;
if (DebugStream::Level5()) {
if (DebugStream::Level5())
{
debug5 << "::CreateIntegralCurveOutput " << ics.size() << endl;
}
......@@ -3250,7 +3248,6 @@ avtLCSFilter::GetCachedNativeDataSet(avtDataTree_p inDT)
//
// there is only one dataset to process
//
//vtkDataSet *in_ds = inDT->GetDataRepresentation().GetDataVTK();
int dom = inDT->GetDataRepresentation().GetDomain();
std::string label = inDT->GetDataRepresentation().GetLabel();
std::string str = CreateCacheString();
......
......@@ -294,7 +294,7 @@ avtLagrangianFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *> &
avtStateRecorderIntegralCurve::Sample samp;
float xi = 0, yi = 0; ///TODO: check on fix for uninitialized values
float xi = 0, yi = 0;
for (int j = 0; j < nSamps; j++)
{
samp = ic->GetSample(j);
......
......@@ -1138,7 +1138,7 @@ avtLineSamplerFilter::ExecuteChannelData(vtkDataSet *in_ds, int, std::string)
poloidalAngle += ((double) (c) - channelIndexOffset) * channelAngle;
// Toroidal rotation
double toroidalAngle = 0; ///TODO: check on fix for uninitialized var
double toroidalAngle = 0.;
if( atts.GetToroidalIntegration() ==
LineSamplerAttributes::ToroidalTimeSample ||
......@@ -1401,7 +1401,7 @@ avtLineSamplerFilter::ExecuteChannelData(vtkDataSet *in_ds, int, std::string)
return NULL;
}
double a = 0, sd = 0, weight = 0, total=0; ///TODO: check on fix for uninitialized vars
double a = 0., sd = 0., weight = 0., total=0.;
if( atts.GetChannelProfile() == LineSamplerAttributes::Gaussian )
{
......@@ -1485,9 +1485,6 @@ avtLineSamplerFilter::ExecuteChannelData(vtkDataSet *in_ds, int, std::string)
applyTransform( transform, offset );
//avtVector startBase = startPoint + offset;
//avtVector stopBase = stopPoint + offset;
vtkDataSet *tmp_ds = createLine( startPoint, stopPoint, false );
if( tmp_ds == NULL )
......@@ -1785,7 +1782,7 @@ avtLineSamplerFilter::ExecuteChannelData(vtkDataSet *in_ds, int, std::string)
// if( atts.GetChannelGeometry() == LineSamplerAttributes::Point ||
// atts.GetChannelGeometry() == LineSamplerAttributes::Line )
{
float *points_ptr = NULL; /// TODO: is it possible to not be vtkUnstructured or PolyData?
float *points_ptr = NULL;
if( out_ds->IsA("vtkUnstructuredGrid") )
{
......@@ -1801,7 +1798,9 @@ avtLineSamplerFilter::ExecuteChannelData(vtkDataSet *in_ds, int, std::string)
points_ptr =
(float *) out_pd->GetPoints()->GetVoidPointer(0);
} else {
}
else
{
const char* msg = "Input not vtkPolyData or Unstructured Grid";
EXCEPTION1(ImproperUseException, msg);
}
......@@ -2200,7 +2199,6 @@ avtLineSamplerFilter::createCone( avtVector startPoint,
float *points_ptr = (float *) points->GetVoidPointer(0);
//double deltaAngle = 360.0 / (double) (nRadialSamples);
for( unsigned int i=0, index=0; i< (unsigned int)nSamples; ++i )
{
......
......@@ -614,8 +614,6 @@ avtModelFitFilter::ModifyContract(avtContract_p in_spec){
if(!curListedVars.size())
return in_spec;
//ExpressionList *elist = ParsingExprList::Instance()->GetList();
if((!strcmp(pipelineVar, "operators/ModelFit/model")) ||
(!strcmp(pipelineVar, "operators/ModelFit/distance")))
for(int i = 0; ; i++)
......
......@@ -94,7 +94,7 @@ OnionPeelViewerPluginInfo::InitializeOperatorAtts(AttributeSubject *atts,
if (*collection != NULL)
{
int nSets = collection->GetNumberOfSubsets();
for (size_t i = 0; i < nSets && !subsetNameValid; ++i)
for (int i = 0; i < nSets && !subsetNameValid; ++i)
{
bool isOn = false;
if (silAtts->GetTopSetIsAllOn())
......
......@@ -253,8 +253,8 @@ OnionPeelViewerPluginInfo::InitializeOperatorAtts(AttributeSubject *atts,
restriction->GetSILCollection(colIndex);
if (*collection != NULL)
{
size_t nSets = collection->GetNumberOfSubsets();
for (size_t i = 0; i < nSets && !subsetNameValid; ++i)
int nSets = collection->GetNumberOfSubsets();
for (int i = 0; i < nSets && !subsetNameValid; ++i)
{
bool isOn = false;
if (silAtts->GetTopSetIsAllOn())
......
......@@ -260,14 +260,12 @@ void
QvisOnionPeelWindow::UpdateWindow(bool doAll)
{
QString temp;
size_t i, j;
intVector ivec;
// Loop through all the attributes and do something for
// each of them that changed. This function is only responsible
// for displaying the state values and setting widget sensitivity.
for(i = 0; i < (size_t)atts->NumAttributes(); ++i)
for(int i = 0; i < atts->NumAttributes(); ++i)
{
if(!doAll)
{
......@@ -303,7 +301,7 @@ QvisOnionPeelWindow::UpdateWindow(bool doAll)
ivec = atts->GetIndex();
char buff[80];
temp = "";
for (j = 0; j < ivec.size(); j++)
for (size_t j = 0; j < ivec.size(); j++)
{
sprintf(buff, "%d ", ivec[j]);
temp += buff;
......
......@@ -696,14 +696,13 @@ avtOnionPeelFilter::ModifyContract(avtContract_p spec)
// So see which species are on.
std::vector<int> species;
std::vector<bool> setState;
unsigned int i;
int topset = silr->GetTopSet();
avtSILSet_p pTopset = silr->GetSILSet(topset);
const std::vector<int> &mapsOut = pTopset->GetRealMapsOut();
avtSILCollection_p speciesColl = NULL;
for (i = 0 ; i < mapsOut.size() ; i++)
for (size_t i = 0 ; i < mapsOut.size() ; i++)
{
avtSILCollection_p coll = silr->GetSILCollection(mapsOut[i]);
if (coll->GetRole() == SIL_SPECIES)
......@@ -713,7 +712,7 @@ avtOnionPeelFilter::ModifyContract(avtContract_p spec)
}
if (*speciesColl != NULL)
{
for (i = 0 ; i < (unsigned int)speciesColl->GetNumberOfSubsets() ; i++)
for (int i = 0 ; i < speciesColl->GetNumberOfSubsets() ; i++)
setState.push_back(trav.UsesData(speciesColl->GetSubset(i)));
}
// End logic for seeing which species is on.
......@@ -722,7 +721,7 @@ avtOnionPeelFilter::ModifyContract(avtContract_p spec)
silr->TurnOnSet(setID);
// Turn sets back on if species are on.
for (i = 0 ; i < species.size() ; i++)
for (size_t i = 0 ; i < species.size() ; i++)
if (setState[i])
silr->TurnOnSet(species[i]);
......
......@@ -260,7 +260,6 @@ PoincareViewerPluginInfo::GetOperatorVarDescription(AttributeSubject *atts,
{
PoincareAttributes *atts_in = (PoincareAttributes *)atts;
const char numTypes = 14;
const char *typeString[14] =
{ "None", "Safety Factor Q", "Safety Factor P",
"Safety Factor Q != P", "Safety Factor P != Q",
......
......@@ -236,7 +236,6 @@ PoincareViewerPluginInfo::GetOperatorVarDescription(AttributeSubject *atts,
{
PoincareAttributes *atts_in = (PoincareAttributes *)atts;
//const char numTypes = 14;
const char *typeString[14] =
{ "None", "Safety Factor Q", "Safety Factor P",
"Safety Factor Q != P", "Safety Factor P != Q",
......
......@@ -946,7 +946,6 @@ QvisPoincareWindow::CreateAppearanceTab(QWidget *pageAppearance)
void
QvisPoincareWindow::CreateAdvancedTab(QWidget *pageAdvanced)
{
//int row = 0;
QGridLayout *mainLayout = new QGridLayout(pageAdvanced);
mainLayout->setMargin(5);
mainLayout->setSpacing(5);
......
......@@ -104,9 +104,6 @@ bool BracketIsValid(avtPoincareIC *poincare_ic)
}
bool NeedToMinimize(avtPoincareIC *poincare_ic)
{
//int toroidalWinding = poincare_ic->properties.toroidalWinding;
//int windingGroupOffset = poincare_ic->properties.windingGroupOffset;
Vector xzplane(0,1,0);
FieldlineLib fieldlib;
......@@ -367,13 +364,6 @@ bool PrepareToMinimize(avtPoincareIC *poincare_ic, avtVector &newPt, bool &cbGTb
_a->properties.rationalPt2 =_b->properties.rationalPt2;
double bx_ax,cx_bx;
//double a_x,a_z,b_x,b_z,c_x,c_z;
//a_x = a_puncturePoints[a_i][0];
//a_z = a_puncturePoints[a_i][2];
//b_x = b_puncturePoints[b_i][0];
//b_z = b_puncturePoints[b_i][2];
//c_x = c_puncturePoints[c_i][0];
//c_z = c_puncturePoints[c_i][2];
bx_ax = PythDist(a_puncturePoints[a_i],b_puncturePoints[b_i]);
cx_bx = PythDist(b_puncturePoints[b_i],c_puncturePoints[c_i]);
......@@ -385,7 +375,6 @@ bool PrepareToMinimize(avtPoincareIC *poincare_ic, avtVector &newPt, bool &cbGTb
{
std::cerr<<"Line: "<<__LINE__<<"Prepare to minimize: "<<"\n\t"<<VectorToString(a_puncturePoints[a_i])<<"\n\t"<<VectorToString(b_puncturePoints[b_i])<<"\n\t"<<VectorToString(c_puncturePoints[c_i])<<"\n";
}
//double new_x,new_z;
if (cx_bx > bx_ax)
{
cbGTba = true;
......@@ -519,8 +508,8 @@ std::vector<avtVector> GetSeeds( avtPoincareIC *poincare_ic,
double maxAngle = 0;
unsigned int best_index = 0;
unsigned int best_one_less = 0; /// TODO: check on fix
unsigned int best_one_more = 0; /// TODO: check on fix of uninitialized vars
unsigned int best_one_less = 0;
unsigned int best_one_more = 0;
bool twoPts = false;
for( unsigned int i=0; i<toroidalWinding; ++i )
......
......@@ -1097,7 +1097,8 @@ avtPoincareFilter::ReportWarnings(std::vector<avtIntegralCurve *> &ics)
int numStiff = 0;
int numCritPts = 0;
if (DebugStream::Level5()) {
if (DebugStream::Level5())
{
debug5 << "::ReportWarnings " << ics.size() << endl;
}
//See how many pts, ics we have so we can preallocate everything.
......@@ -1641,7 +1642,7 @@ avtPoincareFilter::ContinueExecute()
std::vector<avtIntegralCurve *> new_ics;
newA[1] =Z_OFFSET;
AddSeedPoint( newB, zeroVec, new_ics );
avtPoincareIC *seed_b = NULL; ///TODO: check on fix for uninitialized value
avtPoincareIC *seed_b = NULL;
for( unsigned int k=0; k<new_ics.size(); k++ )
{
seed_b = (avtPoincareIC *) new_ics[k];
......@@ -1652,7 +1653,7 @@ avtPoincareFilter::ContinueExecute()
std::vector<avtIntegralCurve *> new_ics_2;
newC[1]=Z_OFFSET;
AddSeedPoint( newC, zeroVec, new_ics_2 );
avtPoincareIC *seed_c = NULL; ///TODO: check on fix for uninitialized value
avtPoincareIC *seed_c = NULL;
for( unsigned int k=0; k<new_ics_2.size(); k++ )
{
......@@ -2081,8 +2082,8 @@ avtPoincareFilter::ContinueExecute()
std::vector<avtIntegralCurve *> new_ics;
avtVector zeroVec = avtVector(0,0,0);
avtPoincareIC *newIC = NULL; ///TODO: check on fix for uninitialized value
size_t j;
avtPoincareIC *newIC = NULL;
size_t j;
double range1 = FindMinimizationDistance(_x1);
double range2 = FindMinimizationDistance(_x2);
......@@ -2252,7 +2253,6 @@ avtPoincareFilter::ContinueExecute()
}
// We have minimized!!!
else{
//std::vector<avtPoincareIC *>::iterator it = children->begin();
if (range1 < range2)
{
// X1 is our minimum
......@@ -2732,7 +2732,7 @@ avtPoincareFilter::ClassifyRationals(std::vector<avtIntegralCurve *> &ics)
for( inneritr = curves.begin(); inneritr != curves.end(); ++inneritr )
{
numRationalCurves++;
// If all the curves for a rational are waiting
// If all the curves for a rational are waiting???
if( rationalCounts[(*inneritr)->src_rational_ic->id] ==
waitingCounts[(*inneritr)->src_rational_ic->id] )
{
......@@ -2895,10 +2895,6 @@ avtPoincareFilter::CreatePoincareOutput( avtDataTree *dt,
unsigned int islandGroups = properties.islandGroups;
unsigned int nnodes = properties.nnodes;
//std::vector< avtVector > &seedPoints = properties.seedPoints;
//bool completeIslands = true;
if( summaryFlag )
{
double safetyFactor;
......@@ -3374,8 +3370,6 @@ avtPoincareFilter::CreatePoincareOutput( avtDataTree *dt,
if( showLines )
nnodes = 2;
//bool tmpPoints = showPoints;
// Loop through each island.
for( unsigned int j=0; j<toroidalWinding; j++ )
{
......@@ -3394,7 +3388,6 @@ avtPoincareFilter::CreatePoincareOutput( avtDataTree *dt,
}
}
//bool VALID = true;
// Sanity check
for( unsigned int j=0; j<toroidalWinding; ++j )
......@@ -3410,7 +3403,6 @@ avtPoincareFilter::CreatePoincareOutput( avtDataTree *dt,
<< " number of points " << puncturePts[p][j].size()
<< std::endl;