Commit 37147472 authored by bonnell's avatar bonnell

Reduce compile warnings on windows.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23709 18c085ea-50e0-402c-830e-de6fd14e8384
parent 131c38cf
......@@ -132,7 +132,7 @@ public:
unsigned int GetDegree() const
{
return size()-1;
return (unsigned int)size()-1;
}
const double& GetT0() const
......@@ -157,13 +157,13 @@ public:
avtVector GetV0() const
{
const unsigned int d = size()-1;
const unsigned int d = (unsigned int)size()-1;
return d / (t1 - t0) * ((*this)[d] - (*this)[d-1]);
}
avtVector GetV1() const
{
const unsigned int d = size()-1;
const unsigned int d = (unsigned int)size()-1;
return d / (t1 - t0) * ((*this)[1]-(*this)[0]);
}
......
......@@ -77,12 +77,12 @@ public:
unsigned int degree() const
{
return size()-1;
return (unsigned int)size()-1;
}
unsigned int order() const
{
return size();
return (unsigned int)size();
}
avtVector firstV() const
......
......@@ -477,8 +477,8 @@ VisitInteractor::MatrixMult(const double m1[3][3], double const m2[3][3],
inline void
VisitInteractor::MatrixPrint(const char *name, const double m[3][3]) const
{
int i;
int nSpaces = strlen(name) + 3;
size_t i;
size_t nSpaces = strlen(name) + 3;
cout << name << " = ";
cout << m[0][0] << ", " << m[0][1] << ", " << m[0][2] << endl;
......
#ifndef WIN32
#pragma GCC diagnostic warning "-Wall"
#endif
/*****************************************************************************
*
......@@ -1470,7 +1472,7 @@ avtChomboFileFormat::CalculateDomainNesting(void)
//
int t1 = visitTimer->StartTimer();
avtStructuredDomainNesting *dn = new avtStructuredDomainNesting(
dimension < 4 ? totalPatches : listOfRepresentativeBoxes.size(), num_levels);
dimension < 4 ? totalPatches : (int)listOfRepresentativeBoxes.size(), num_levels);
//
// Calculate what the refinement ratio is from one level to the next.
......@@ -1548,7 +1550,7 @@ avtChomboFileFormat::CalculateDomainNesting(void)
e[4] = lowK[patch];
e[5] = hiK[patch];
rdb->SetIndicesForAMRPatch(patchNo, my_level, e);
rdb->SetIndicesForAMRPatch((int)patchNo, my_level, e);
}
}
rdb->CalculateBoundaries();
......@@ -1677,7 +1679,7 @@ avtChomboFileFormat::CalculateDomainNesting(void)
logExts[2] = lowK[patch];
logExts[5] = hiK[patch]-1;
dn->SetNestingForDomain(patchNo, my_level, childPatches[patch], logExts);
dn->SetNestingForDomain((int)patchNo, my_level, childPatches[patch], logExts);
}
}
......@@ -1783,7 +1785,7 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
avtMeshMetaData *mesh = new avtMeshMetaData;
mesh->name = mesh_name;
mesh->meshType = AVT_AMR_MESH;
mesh->numBlocks = dimension < 4 ? totalPatches : listOfRepresentativeBoxes.size();
mesh->numBlocks = dimension < 4 ? totalPatches : (int)listOfRepresentativeBoxes.size();
mesh->blockOrigin = 0;
mesh->spatialDimension = dimension;
mesh->topologicalDimension = dimension;
......@@ -1853,14 +1855,14 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
mesh->LODs = levels_of_detail;
this->resolution = levels_of_detail; // current acceptable res = max res.
md->Add(mesh);
md->AddGroupInformation(num_levels,listOfRepresentativeBoxes.size(), groupIds);
md->AddGroupInformation(num_levels,(int)listOfRepresentativeBoxes.size(), groupIds);
}
//
// Add each scalar variable.
//
std::list<std::string> addedExpressionNames;
int nVars = varnames.size();
int nVars = (int)varnames.size();
for (int i = 0; i < nVars; i++)
{
if (dimension == 4)
......@@ -2072,7 +2074,7 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
{
if (particleVarnames[j] == yName)
{
matchY = j;
matchY = (int)j;
break;
}
}
......@@ -2101,7 +2103,7 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
{
if (particleVarnames[j] == zName)
{
matchZ = j;
matchZ = (int)j;
break;
}
}
......@@ -2989,7 +2991,7 @@ avtChomboFileFormat::GetVar(int patch, const char *varname)
InitializeReader();
int varIdx = -1;
int nVars = varnames.size();
int nVars = (int)varnames.size();
for (i = 0 ; i < nVars ; i++)
{
if (varnames[i] == varname)
......@@ -3299,7 +3301,7 @@ avtChomboFileFormat::GetVectorVar(int patch, const char *varname)
InitializeReader();
int varIdx = -1;
int nVars = varnames.size();
int nVars = (int)varnames.size();
for (i = 0 ; i < nVars ; i++)
{
if (varnames[i] == varname)
......@@ -3613,7 +3615,7 @@ avtChomboFileFormat::GetAuxiliaryData(const char *var, int dom,
}
else
{
itree = new avtIntervalTree(listOfRepresentativeBoxes.size(), 3);
itree = new avtIntervalTree((int)listOfRepresentativeBoxes.size(), 3);
for (std::vector<int>::iterator it = listOfRepresentativeBoxes.begin(); it != listOfRepresentativeBoxes.end(); ++it)
{
double bounds[6];
......@@ -3752,7 +3754,7 @@ avtChomboFileFormat::GetMaterial(const char *var, int patch,
mix_next[mix_next.size() - 1] = 0;
}
int mixed_size = mix_zone.size();
int mixed_size =(int) mix_zone.size();
// get pointers to pass to avtMaterial. Windows will except if
// an empty std::vector's zeroth item is dereferenced.
int *ml = NULL, *mixm = NULL, *mixn = NULL, *mixz = NULL;
......
......@@ -395,7 +395,7 @@ avtCurve2DFileFormat::ReadFile(void)
curveNames.push_back(str2);
headerName = "";
}
int len = xl.size();
size_t len = xl.size();
bool shouldAddPoint = true;
if (len > 0)
{
......@@ -678,7 +678,7 @@ avtCurve2DFileFormat::GetPoint(ifstream &ifile, float &x, float &y, string &ln)
// Parenthesis are special characters for variables names, etc, so just
// change them to square brackets to "go with the flow"...
//
int i, nchars = strlen(line);
size_t i, nchars = strlen(line);
for (i = 0 ; i < nchars ; i++)
{
if (line[i] == '(')
......@@ -696,7 +696,7 @@ avtCurve2DFileFormat::GetPoint(ifstream &ifile, float &x, float &y, string &ln)
return HEADER;
}
bool allSpace = true;
int len = strlen(line);
size_t len = strlen(line);
for (i = 0 ; i < len ; i++)
{
if (!isspace(line[i]))
......
......@@ -463,7 +463,7 @@ avtClipFilter::ComputeAccurateClip(vtkDataSet *inDS, vtkDataSet **outDS,
inversePlane->SetNormal(n);
inversePlanes.push_back(inversePlane);
}
int planeCount = planes.size();
int planeCount = (int)planes.size();
// Check if we have any work to do.
if (planeCount == 0)
......
......@@ -860,16 +860,16 @@ void QvisCreateBondsWindow::secondElementChanged(int element)
int QvisCreateBondsWindow::GetListLength()
{
int n1 = atts->GetAtomicNumber1().size();
int n2 = atts->GetAtomicNumber2().size();
int n3 = atts->GetMinDist().size();
int n4 = atts->GetMaxDist().size();
size_t n1 = atts->GetAtomicNumber1().size();
size_t n2 = atts->GetAtomicNumber2().size();
size_t n3 = atts->GetMinDist().size();
size_t n4 = atts->GetMaxDist().size();
if (n1 != n2 || n1 != n3 || n1 != n4)
{
EXCEPTION1(ImproperUseException,
"Bond list data arrays were not all the same length.");
}
return n1;
return (int)n1;
}
// ****************************************************************************
......
......@@ -189,18 +189,18 @@ avtCreateBondsFilter::AtomBondDistances(int elementA, int elementB,
vector<int> &element1 = atts.GetAtomicNumber1();
vector<int> &element2 = atts.GetAtomicNumber2();
int n1 = atts.GetAtomicNumber1().size();
int n2 = atts.GetAtomicNumber2().size();
int n3 = atts.GetMinDist().size();
int n4 = atts.GetMaxDist().size();
size_t n1 = atts.GetAtomicNumber1().size();
size_t n2 = atts.GetAtomicNumber2().size();
size_t n3 = atts.GetMinDist().size();
size_t n4 = atts.GetMaxDist().size();
if (n1 != n2 || n1 != n3 || n1 != n4)
{
EXCEPTION1(ImproperUseException,
"Bond list data arrays were not all the same length.");
}
int n = n1;
size_t n = n1;
for (int i=0; i<n; i++)
for (size_t i=0; i<n; i++)
{
// a -1 in the element list means "any"
int e1 = element1[i];
......@@ -602,7 +602,7 @@ avtCreateBondsFilter::ExecuteData_Fast(vtkPolyData *in, float maxBondDist,
for (int k=1; k<nk-1; k++)
{
int index1 = i + ni*(j + nj*(k));
int nla1 = atomgrid[index1].size();
int nla1 = (int)atomgrid[index1].size();
// for each atom in each box
for (int la1=0; la1<nla1; la1++)
{
......@@ -636,7 +636,7 @@ avtCreateBondsFilter::ExecuteData_Fast(vtkPolyData *in, float maxBondDist,
// add this extra layer of boxes, though.
int index2 = ii + ni*(jj + nj*(kk));
int nla2 = atomgrid[index2].size();
int nla2 = (int)atomgrid[index2].size();
for (int la2=0; la2<nla2 && ctr<max_per_atom; la2++)
{
if (index1==index2 && la1==la2)
......
......@@ -2037,8 +2037,8 @@ avtIntegralCurveFilter::GenerateSeedPointsFromPointList(std::vector<avtVector> &
"multiple of 3 (X, Y, Z).");
}
int npts = listOfPoints.size() / 3;
for (int i = 0 ; i < npts ; i++)
size_t npts = listOfPoints.size() / 3;
for (size_t i = 0 ; i < npts ; i++)
{
avtVector p(listOfPoints[3*i], listOfPoints[3*i+1], listOfPoints[3*i+2]);
pts.push_back(p);
......@@ -2064,8 +2064,8 @@ avtIntegralCurveFilter::GenerateSeedPointsFromSelection(std::vector<avtVector> &
}
else
{
int npts = allPts.size();
for (int i = 0 ; i < npts ; i+= sampleDensity[0])
size_t npts = allPts.size();
for (size_t i = 0 ; i < npts ; i+= sampleDensity[0])
pts.push_back(allPts[i]);
}
}
......@@ -2098,7 +2098,7 @@ avtIntegralCurveFilter::GetFieldForDomain(const BlockIDType& dom, vtkDataSet* ds
if( dataValue == IntegralCurveAttributes::Variable &&
!dataVariable.empty() )
{
field->SetScalarVariable( secondaryVariables.size(), dataVariable );
field->SetScalarVariable( (unsigned char)secondaryVariables.size(), dataVariable );
}
for( unsigned int i=0; i<secondaryVariables.size(); ++i )
......@@ -2128,7 +2128,7 @@ avtIntegralCurveFilter::GetFieldForDomain(const BlockIDType& dom, vtkDataSet* ds
void
avtIntegralCurveFilter::ReportWarnings(std::vector<avtIntegralCurve *> &ics)
{
int numICs = ics.size();
int numICs = (int)ics.size();
// int numPts = 0;
int numEarlyTerminators = 0;
int numStiff = 0;
......@@ -2285,7 +2285,7 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
if (ics.size() == 0)
return;
int numICs = ics.size(), numPts = 0;
int numICs = (int)ics.size(), numPts = 0;
if (DebugStream::Level5())
{
......@@ -2375,7 +2375,7 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
double cropBeginParam = 0.0, cropEndParam = 1.0;
int beginIndex = (cropBeginFlag ? -1 : 0);
int endIndex = (cropEndFlag ? -1 : nSamples-1);
int endIndex = (cropEndFlag ? -1 : (int)nSamples-1);
// Last crop value is need to obtain interpolation parametrization
// values.
......@@ -2413,10 +2413,10 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
if( cropBeginValue == crop_value )
{
if( cropBeginFlag && beginIndex < 0 )
beginIndex = j;
beginIndex = (int)j;
if( cropEndFlag )
endIndex = j;
endIndex = (int)j;
}
// Within range so take those indexes - this is an
......@@ -2430,13 +2430,13 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
// If not the first point interpolation will be needed.
if( 0 < j )
{
beginIndex = j - 1;
beginIndex = (int)j - 1;
cropBeginInterpolate = true;
}
// This happens when the crop value is smaller
// than the first value along the curve.
else
beginIndex = j;
beginIndex = (int)j;
}
if( cropEndFlag )
......@@ -2445,12 +2445,12 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
if( j < nSamples-1 )
{
cropEndInterpolate = true;
endIndex = j + 1;
endIndex = (int)j + 1;
}
// This happens when the crop value is larger
// than the last value along the curve.
else
endIndex = j;
endIndex = (int)j;
}
}
......@@ -2476,7 +2476,7 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
totalSamples = endIndex - beginIndex + 1;
}
else
totalSamples = nSamples;
totalSamples = (int)nSamples;
if( totalSamples < 2 )
continue;
......@@ -2514,8 +2514,6 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
distance /= nSamples;
}
double lastPhi = 0, angle = 0;
for (int j = beginIndex; j <= endIndex; j++)
{
if( cropBeginInterpolate && j == beginIndex )
......@@ -2781,7 +2779,7 @@ avtIntegralCurveFilter::ComputeCorrelationDistance(int idx,
double angTol,
double minDist)
{
int nSamps = ic->GetNumberOfSamples();
int nSamps = (int)ic->GetNumberOfSamples();
//Last point...
if (idx == nSamps-1)
......
......@@ -2807,14 +2807,14 @@ LCSAttributes::ChangesRequireRecalculation(const LCSAttributes &obj) const
}
if ((sourceType == RegularGrid) &&
UseDataSetStart == true &&
UseDataSetStart == Subset &&
POINT_DIFFERS(StartPosition, obj.StartPosition))
{
return true;
}
if ((sourceType == RegularGrid) &&
UseDataSetEnd == true &&
UseDataSetEnd == Subset &&
POINT_DIFFERS(EndPosition, obj.EndPosition))
{
return true;
......
......@@ -186,14 +186,14 @@ LCSAttributes::ChangesRequireRecalculation(const LCSAttributes &obj) const
}
if ((sourceType == RegularGrid) &&
UseDataSetStart == true &&
UseDataSetStart == Subset &&
POINT_DIFFERS(StartPosition, obj.StartPosition))
{
return true;
}
if ((sourceType == RegularGrid) &&
UseDataSetEnd == true &&
UseDataSetEnd == Subset &&
POINT_DIFFERS(EndPosition, obj.EndPosition))
{
return true;
......
......@@ -801,8 +801,8 @@ avtLCSFilter::GetInitialLocationsFromNativeMesh(avtDataTree_p inDT)
vtkDataSet *in_ds = inDT->GetDataRepresentation().GetDataVTK();
size_t pts = in_ds->GetNumberOfPoints();
int numberOfSeeds = seedPoints.size();
int totalNumberOfSeeds = numberOfSeeds + pts;
size_t numberOfSeeds = seedPoints.size();
size_t totalNumberOfSeeds = numberOfSeeds + pts;
seedPoints.resize( totalNumberOfSeeds );
......@@ -1090,9 +1090,9 @@ avtLCSFilter::SingleBlockSingleCalc( vtkDataSet *in_ds,
for(size_t i = 0; i < ics.size(); ++i)
{
size_t index = ics[i]->id;
int l = (index-offset);
size_t l = (index-offset);
//std::cout << "l = " << l << " " << nTuples << std::endl;
if(l >= 0 && (size_t)l < remapPoints.size())
if(l >= 0 && l < remapPoints.size())
{
// remapPoints[l] = ((avtLCSIC*)ics[i])->GetEndPoint() -
// ((avtLCSIC*)ics[i])->GetStartPoint();
......@@ -1282,16 +1282,16 @@ avtLCSFilter::RectilinearGridSingleCalc(std::vector<avtIntegralCurve*> &ics)
Barrier();
CollectIntArraysOnRootProc(all_indices, index_counts,
&indices.front(), indices.size());
&indices.front(), (int)indices.size());
CollectDoubleArraysOnRootProc(all_times, time_counts,
&times.front(), times.size());
&times.front(), (int)times.size());
CollectDoubleArraysOnRootProc(all_lengths, time_counts,
&lengths.front(), lengths.size());
&lengths.front(), (int)lengths.size());
CollectDoubleArraysOnRootProc(all_points, point_counts,
&points.front(), points.size());
&points.front(), (int)points.size());
Barrier();
......@@ -2094,10 +2094,10 @@ avtLCSFilter::SingleBlockIterativeCalc( vtkDataSet *out_ds,
avtStreamlineIC * ic = (avtStreamlineIC *) ics[i];
size_t index = ic->id;
int l = (index-offset);
size_t l = (index-offset);
//std::cout << "l = " << l << " " << nTuples << std::endl;
if(l >= 0 && (size_t)l < remapPoints.size())
if(l >= 0 && l < remapPoints.size())
{
// remapPoints[l] = ((avtLCSIC*)ics[i])->GetEndPoint() -
// ((avtLCSIC*)ics[i])->GetStartPoint();
......@@ -2163,7 +2163,7 @@ avtLCSFilter::SingleBlockIterativeCalc( vtkDataSet *out_ds,
avtStreamlineIC * ic = (avtStreamlineIC *) ics[i];
size_t index = ic->id;
int l = (index-offset);
size_t l = (index-offset);
if( ic->maxSteps < (unsigned int)maxSteps )
{
......@@ -2262,13 +2262,13 @@ avtLCSFilter::RectilinearGridIterativeCalc( std::vector<avtIntegralCurve*> &ics
Barrier();
CollectIntArraysOnRootProc(all_indices, index_counts,
&indices.front(), indices.size());
&indices.front(), (int)indices.size());
CollectDoubleArraysOnRootProc(all_points, point_counts,
&points.front(), points.size());
&points.front(), (int)points.size());
CollectDoubleArraysOnRootProc(all_times, time_counts,
&times.front(), times.size());
&times.front(), (int)times.size());
Barrier();
......@@ -2592,7 +2592,7 @@ avtLCSFilter::CreateNativeMeshIterativeCalcOutput(std::vector<avtIntegralCurve*>
CreateMultiBlockIterativeCalcOutput(GetInputDataTree(), GetDataTree(),
ics, offset, minv, maxv, count);
int nTuples = ics.size();
int nTuples = (int)ics.size();
if( 1 || count <= nTuples/10 )
{
......@@ -2751,7 +2751,7 @@ avtLCSFilter::CreateSingleBlockIterativeCalcOutput( vtkDataSet *in_ds,
avtStreamlineIC * ic = (avtStreamlineIC *) ics[i];
size_t index = ic->id;
int l = (index-offset);
size_t l = (index-offset);
double lambda = exponents->GetTuple1(l);
......@@ -2977,7 +2977,7 @@ avtLCSFilter::ReportWarnings(std::vector<avtIntegralCurve *> &ics)
if (ics.size() == 0)
return;
int numICs = ics.size();
int numICs = (int)ics.size();
// int numPts = 0;
int numEarlyTerminators = 0;
int numStiff = 0;
......
......@@ -281,7 +281,7 @@ avtLagrangianFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *> &
{
avtLagrangianIC *ic = (avtLagrangianIC*)ics[0];
int nSamps = ic->GetNumberOfSamples();
int nSamps = (int)ic->GetNumberOfSamples();
vtkRectilinearGrid *rg = vtkVisItUtility::Create1DRGrid(nSamps,VTK_FLOAT);
vtkFloatArray *vals = vtkFloatArray::New();
......
......@@ -2513,7 +2513,7 @@ avtLineSamplerFilter::checkWall( avtVector &startPoint,
// Get the wall points.
std::vector<double> wallList = atts.GetWallList();
int npts = wallList.size() / 2;
size_t npts = wallList.size() / 2;
// Need at least three point plus the first and last must be the
// same.
......@@ -2648,9 +2648,9 @@ avtLineSamplerFilter::CreateFinalOutput(void)
{
if( composite_ds ) composite_ds->Delete();
int nPts = lineSamples[0].size(), tPts = 0, nLines = lineSamples.size();
size_t nPts = lineSamples[0].size(), tPts = 0, nLines = lineSamples.size();
for( int i=0; i<nLines; ++i )
for( size_t i=0; i<nLines; ++i )
tPts += (int)lineSamples[i].size();
if( tPts != nPts * nLines )
......
......@@ -350,7 +350,7 @@ QvisModelFitWindow::UpdateWindow(bool doAll)
int cur_pos = 0;
for(size_t i = 0; i < numVars.size(); i++)
for(int j = 0; j < numVars[i]; j++)
guiVarNames.insert(std::pair<int, string>(i, Vars[cur_pos++]));
guiVarNames.insert(std::pair<int, string>((int)i, Vars[cur_pos++]));
theTable.clear();
char tableString[20];
......@@ -369,7 +369,7 @@ QvisModelFitWindow::UpdateWindow(bool doAll)
else
sprintf(tableString, "%.5lf", tuples[cur_pos]);
}
theTable.insert(std::pair<int, tableEntry>(i, tableEntry(j, k, tableString)));
theTable.insert(std::pair<int, tableEntry>((int)i, tableEntry(j, k, tableString)));
cur_pos++;
}
......
......@@ -833,7 +833,7 @@ avtModelFitFilter::grabOnePoint(doubleVector *point, int numVars, int var_index,
vtkDataArray *darray;
char secVarName[1024];
for(int i = point->size()-1; i >= 0; i--)
for(size_t i = point->size()-1; i >= 0; i--)
point->erase(point->begin()+i);
size_t varFinder;
......@@ -860,7 +860,7 @@ avtModelFitFilter::grabOnePoint(doubleVector *point, int numVars, int var_index,
varFinder, selectionType)); //11
}//11111111111111111111111111111111111111111111111111111111111111111111111111
for(int i = Vars.size()-1; i >=0; i--)
for(size_t i = Vars.size()-1; i >=0; i--)
Vars.erase(Vars.begin()+i);
}
......@@ -878,7 +878,7 @@ avtModelFitFilter::findMatches(doubleVector *mins, intVector *tup_match1, double
double delta;
// Is the relationship a fit at all? /////////////////
for(int i = mins->size()-1; i >= 0; i--)
for(size_t i = mins->size()-1; i >= 0; i--)
mins->erase(mins->begin()+i);
for(int j = 0; j < numVars; j++)
......@@ -901,7 +901,7 @@ avtModelFitFilter::findMatches(doubleVector *mins, intVector *tup_match1, double
}
//find all tuples which have a min for the first var in a relationship
for(int i = tup_match1->size()-1; i >= 0; i--)
for(size_t i = tup_match1->size()-1; i >= 0; i--)
tup_match1->erase(tup_match1->begin()+i);
for(int k = 0; k < numTups; k++)
......@@ -932,7 +932,7 @@ avtModelFitFilter::findMatches(doubleVector *mins, intVector *tup_match1, double
}
//make sure the min value comes from the same tuple for each variable
for(int k = tup_match1->size() - 1; k >= 0; k--)
for(size_t k = tup_match1->size() - 1; k >= 0; k--)
{
for(l = 0; l < (int)tup_match2.size(); l++)
if((*tup_match1)[k] == tup_match2[l])
......@@ -941,7 +941,7 @@ avtModelFitFilter::findMatches(doubleVector *mins, intVector *tup_match1, double
tup_match1->erase(tup_match1->begin()+k);
}
}
for(int i = tup_match2.size()-1; i >= 0; i--)
for(size_t i = tup_match2.size()-1; i >= 0; i--)
tup_match2.erase(tup_match2.begin()+i);
}
......@@ -973,7 +973,7 @@ avtModelFitFilter::calculateDistance(doubleVector mins, int distanceType)
return distance; /// TODO: check fix for return of non-void warning
}
double avtModelFitFilter::convertToVariableSpace(double value, int varFinder, int fromType)
double avtModelFitFilter::convertToVariableSpace(double value, size_t varFinder, int fromType)
{
if(!fromType)
return value;
......@@ -1017,7 +1017,7 @@ double avtModelFitFilter::convertToVariableSpace(double value, int varFinder, in
}
double
avtModelFitFilter::spaceConvert(double value, int varFinder, int selectType)
avtModelFitFilter::spaceConvert(double value, size_t varFinder, int selectType)
{
if(!selectType)
return value;
......
......@@ -115,8 +115,8 @@ class avtModelFitFilter : public avtPluginDataTreeIterator
void findMatches (doubleVector *, intVector *,
doubleVector, int, int, int, int);
double calculateDistance (doubleVector, int);
double spaceConvert (double, int, int);
double convertToVariableSpace(double, int, int);
double spaceConvert (double, size_t, int);
double convertToVariableSpace(double, size_t, int);
avtCentering Centering;
std::vector<vtkDataSet *>out_ds;
......
......@@ -73,7 +73,7 @@ avtMultiresControlFilter::ExecuteData(vtkDataSet *in_ds, int i, std::string s)
size_t lods =
GetTypedInput()->GetInfo().GetAttributes().GetLevelsOfDetail();
debug3 << "Setting max resolution to " << lods << "\n";
atts.SetMaxResolution(lods);
atts.SetMaxResolution((int)lods);
return in_ds;
}
......@@ -105,8 +105,8 @@ avtContract_p avtMultiresControlFilter::ModifyContract(avtContract_p contract)
std::vector<int> domain_list;
std::back_insert_iterator<std::vector<int> > doms(domain_list);
size_t max_domain = sdn->GetNumberOfDomains();
for(size_t dom=0; dom < max_domain; ++dom)
int max_domain = (int)sdn->GetNumberOfDomains();
for(int dom=0; dom < max_domain; ++dom)
{
int level = sdn->GetDomainLevel(dom);
if(level <= atts.GetResolution())
......
This diff is collapsed.
......@@ -51,7 +51,9 @@
#include <math.h>
#include <map>
#ifndef _USE_MATH_DEFINES
#define _USE_MATH_DEFINES
#endif
#include <avtVector.h>
#include <avtPoincareIC.h>
......
......@@ -950,8 +950,8 @@ avtPoincareFilter::GetIntegralCurvePoints(std::vector<avtIntegralCurve *> &ics)
// Only move the points needed over to the storage.
if( poincare_ic->points.size() < poincare_ic->GetNumberOfSamples() )