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: ...@@ -132,7 +132,7 @@ public:
unsigned int GetDegree() const unsigned int GetDegree() const
{ {
return size()-1; return (unsigned int)size()-1;
} }
const double& GetT0() const const double& GetT0() const
...@@ -157,13 +157,13 @@ public: ...@@ -157,13 +157,13 @@ public:
avtVector GetV0() const 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]); return d / (t1 - t0) * ((*this)[d] - (*this)[d-1]);
} }
avtVector GetV1() const 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]); return d / (t1 - t0) * ((*this)[1]-(*this)[0]);
} }
......
...@@ -77,12 +77,12 @@ public: ...@@ -77,12 +77,12 @@ public:
unsigned int degree() const unsigned int degree() const
{ {
return size()-1; return (unsigned int)size()-1;
} }
unsigned int order() const unsigned int order() const
{ {
return size(); return (unsigned int)size();
} }
avtVector firstV() const avtVector firstV() const
......
...@@ -477,8 +477,8 @@ VisitInteractor::MatrixMult(const double m1[3][3], double const m2[3][3], ...@@ -477,8 +477,8 @@ VisitInteractor::MatrixMult(const double m1[3][3], double const m2[3][3],
inline void inline void
VisitInteractor::MatrixPrint(const char *name, const double m[3][3]) const VisitInteractor::MatrixPrint(const char *name, const double m[3][3]) const
{ {
int i; size_t i;
int nSpaces = strlen(name) + 3; size_t nSpaces = strlen(name) + 3;
cout << name << " = "; cout << name << " = ";
cout << m[0][0] << ", " << m[0][1] << ", " << m[0][2] << endl; cout << m[0][0] << ", " << m[0][1] << ", " << m[0][2] << endl;
......
#ifndef WIN32
#pragma GCC diagnostic warning "-Wall" #pragma GCC diagnostic warning "-Wall"
#endif
/***************************************************************************** /*****************************************************************************
* *
...@@ -1470,7 +1472,7 @@ avtChomboFileFormat::CalculateDomainNesting(void) ...@@ -1470,7 +1472,7 @@ avtChomboFileFormat::CalculateDomainNesting(void)
// //
int t1 = visitTimer->StartTimer(); int t1 = visitTimer->StartTimer();
avtStructuredDomainNesting *dn = new avtStructuredDomainNesting( 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. // Calculate what the refinement ratio is from one level to the next.
...@@ -1548,7 +1550,7 @@ avtChomboFileFormat::CalculateDomainNesting(void) ...@@ -1548,7 +1550,7 @@ avtChomboFileFormat::CalculateDomainNesting(void)
e[4] = lowK[patch]; e[4] = lowK[patch];
e[5] = hiK[patch]; e[5] = hiK[patch];
rdb->SetIndicesForAMRPatch(patchNo, my_level, e); rdb->SetIndicesForAMRPatch((int)patchNo, my_level, e);
} }
} }
rdb->CalculateBoundaries(); rdb->CalculateBoundaries();
...@@ -1677,7 +1679,7 @@ avtChomboFileFormat::CalculateDomainNesting(void) ...@@ -1677,7 +1679,7 @@ avtChomboFileFormat::CalculateDomainNesting(void)
logExts[2] = lowK[patch]; logExts[2] = lowK[patch];
logExts[5] = hiK[patch]-1; 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) ...@@ -1783,7 +1785,7 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
avtMeshMetaData *mesh = new avtMeshMetaData; avtMeshMetaData *mesh = new avtMeshMetaData;
mesh->name = mesh_name; mesh->name = mesh_name;
mesh->meshType = AVT_AMR_MESH; mesh->meshType = AVT_AMR_MESH;
mesh->numBlocks = dimension < 4 ? totalPatches : listOfRepresentativeBoxes.size(); mesh->numBlocks = dimension < 4 ? totalPatches : (int)listOfRepresentativeBoxes.size();
mesh->blockOrigin = 0; mesh->blockOrigin = 0;
mesh->spatialDimension = dimension; mesh->spatialDimension = dimension;
mesh->topologicalDimension = dimension; mesh->topologicalDimension = dimension;
...@@ -1853,14 +1855,14 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md) ...@@ -1853,14 +1855,14 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
mesh->LODs = levels_of_detail; mesh->LODs = levels_of_detail;
this->resolution = levels_of_detail; // current acceptable res = max res. this->resolution = levels_of_detail; // current acceptable res = max res.
md->Add(mesh); md->Add(mesh);
md->AddGroupInformation(num_levels,listOfRepresentativeBoxes.size(), groupIds); md->AddGroupInformation(num_levels,(int)listOfRepresentativeBoxes.size(), groupIds);
} }
// //
// Add each scalar variable. // Add each scalar variable.
// //
std::list<std::string> addedExpressionNames; std::list<std::string> addedExpressionNames;
int nVars = varnames.size(); int nVars = (int)varnames.size();
for (int i = 0; i < nVars; i++) for (int i = 0; i < nVars; i++)
{ {
if (dimension == 4) if (dimension == 4)
...@@ -2072,7 +2074,7 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md) ...@@ -2072,7 +2074,7 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
{ {
if (particleVarnames[j] == yName) if (particleVarnames[j] == yName)
{ {
matchY = j; matchY = (int)j;
break; break;
} }
} }
...@@ -2101,7 +2103,7 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md) ...@@ -2101,7 +2103,7 @@ avtChomboFileFormat::PopulateDatabaseMetaData(avtDatabaseMetaData *md)
{ {
if (particleVarnames[j] == zName) if (particleVarnames[j] == zName)
{ {
matchZ = j; matchZ = (int)j;
break; break;
} }
} }
...@@ -2989,7 +2991,7 @@ avtChomboFileFormat::GetVar(int patch, const char *varname) ...@@ -2989,7 +2991,7 @@ avtChomboFileFormat::GetVar(int patch, const char *varname)
InitializeReader(); InitializeReader();
int varIdx = -1; int varIdx = -1;
int nVars = varnames.size(); int nVars = (int)varnames.size();
for (i = 0 ; i < nVars ; i++) for (i = 0 ; i < nVars ; i++)
{ {
if (varnames[i] == varname) if (varnames[i] == varname)
...@@ -3299,7 +3301,7 @@ avtChomboFileFormat::GetVectorVar(int patch, const char *varname) ...@@ -3299,7 +3301,7 @@ avtChomboFileFormat::GetVectorVar(int patch, const char *varname)
InitializeReader(); InitializeReader();
int varIdx = -1; int varIdx = -1;
int nVars = varnames.size(); int nVars = (int)varnames.size();
for (i = 0 ; i < nVars ; i++) for (i = 0 ; i < nVars ; i++)
{ {
if (varnames[i] == varname) if (varnames[i] == varname)
...@@ -3613,7 +3615,7 @@ avtChomboFileFormat::GetAuxiliaryData(const char *var, int dom, ...@@ -3613,7 +3615,7 @@ avtChomboFileFormat::GetAuxiliaryData(const char *var, int dom,
} }
else 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) for (std::vector<int>::iterator it = listOfRepresentativeBoxes.begin(); it != listOfRepresentativeBoxes.end(); ++it)
{ {
double bounds[6]; double bounds[6];
...@@ -3752,7 +3754,7 @@ avtChomboFileFormat::GetMaterial(const char *var, int patch, ...@@ -3752,7 +3754,7 @@ avtChomboFileFormat::GetMaterial(const char *var, int patch,
mix_next[mix_next.size() - 1] = 0; 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 // get pointers to pass to avtMaterial. Windows will except if
// an empty std::vector's zeroth item is dereferenced. // an empty std::vector's zeroth item is dereferenced.
int *ml = NULL, *mixm = NULL, *mixn = NULL, *mixz = NULL; int *ml = NULL, *mixm = NULL, *mixn = NULL, *mixz = NULL;
......
...@@ -395,7 +395,7 @@ avtCurve2DFileFormat::ReadFile(void) ...@@ -395,7 +395,7 @@ avtCurve2DFileFormat::ReadFile(void)
curveNames.push_back(str2); curveNames.push_back(str2);
headerName = ""; headerName = "";
} }
int len = xl.size(); size_t len = xl.size();
bool shouldAddPoint = true; bool shouldAddPoint = true;
if (len > 0) if (len > 0)
{ {
...@@ -678,7 +678,7 @@ avtCurve2DFileFormat::GetPoint(ifstream &ifile, float &x, float &y, string &ln) ...@@ -678,7 +678,7 @@ avtCurve2DFileFormat::GetPoint(ifstream &ifile, float &x, float &y, string &ln)
// Parenthesis are special characters for variables names, etc, so just // Parenthesis are special characters for variables names, etc, so just
// change them to square brackets to "go with the flow"... // 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++) for (i = 0 ; i < nchars ; i++)
{ {
if (line[i] == '(') if (line[i] == '(')
...@@ -696,7 +696,7 @@ avtCurve2DFileFormat::GetPoint(ifstream &ifile, float &x, float &y, string &ln) ...@@ -696,7 +696,7 @@ avtCurve2DFileFormat::GetPoint(ifstream &ifile, float &x, float &y, string &ln)
return HEADER; return HEADER;
} }
bool allSpace = true; bool allSpace = true;
int len = strlen(line); size_t len = strlen(line);
for (i = 0 ; i < len ; i++) for (i = 0 ; i < len ; i++)
{ {
if (!isspace(line[i])) if (!isspace(line[i]))
......
...@@ -463,7 +463,7 @@ avtClipFilter::ComputeAccurateClip(vtkDataSet *inDS, vtkDataSet **outDS, ...@@ -463,7 +463,7 @@ avtClipFilter::ComputeAccurateClip(vtkDataSet *inDS, vtkDataSet **outDS,
inversePlane->SetNormal(n); inversePlane->SetNormal(n);
inversePlanes.push_back(inversePlane); inversePlanes.push_back(inversePlane);
} }
int planeCount = planes.size(); int planeCount = (int)planes.size();
// Check if we have any work to do. // Check if we have any work to do.
if (planeCount == 0) if (planeCount == 0)
......
...@@ -860,16 +860,16 @@ void QvisCreateBondsWindow::secondElementChanged(int element) ...@@ -860,16 +860,16 @@ void QvisCreateBondsWindow::secondElementChanged(int element)
int QvisCreateBondsWindow::GetListLength() int QvisCreateBondsWindow::GetListLength()
{ {
int n1 = atts->GetAtomicNumber1().size(); size_t n1 = atts->GetAtomicNumber1().size();
int n2 = atts->GetAtomicNumber2().size(); size_t n2 = atts->GetAtomicNumber2().size();
int n3 = atts->GetMinDist().size(); size_t n3 = atts->GetMinDist().size();
int n4 = atts->GetMaxDist().size(); size_t n4 = atts->GetMaxDist().size();
if (n1 != n2 || n1 != n3 || n1 != n4) if (n1 != n2 || n1 != n3 || n1 != n4)
{ {
EXCEPTION1(ImproperUseException, EXCEPTION1(ImproperUseException,
"Bond list data arrays were not all the same length."); "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, ...@@ -189,18 +189,18 @@ avtCreateBondsFilter::AtomBondDistances(int elementA, int elementB,
vector<int> &element1 = atts.GetAtomicNumber1(); vector<int> &element1 = atts.GetAtomicNumber1();
vector<int> &element2 = atts.GetAtomicNumber2(); vector<int> &element2 = atts.GetAtomicNumber2();
int n1 = atts.GetAtomicNumber1().size(); size_t n1 = atts.GetAtomicNumber1().size();
int n2 = atts.GetAtomicNumber2().size(); size_t n2 = atts.GetAtomicNumber2().size();
int n3 = atts.GetMinDist().size(); size_t n3 = atts.GetMinDist().size();
int n4 = atts.GetMaxDist().size(); size_t n4 = atts.GetMaxDist().size();
if (n1 != n2 || n1 != n3 || n1 != n4) if (n1 != n2 || n1 != n3 || n1 != n4)
{ {
EXCEPTION1(ImproperUseException, EXCEPTION1(ImproperUseException,
"Bond list data arrays were not all the same length."); "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" // a -1 in the element list means "any"
int e1 = element1[i]; int e1 = element1[i];
...@@ -602,7 +602,7 @@ avtCreateBondsFilter::ExecuteData_Fast(vtkPolyData *in, float maxBondDist, ...@@ -602,7 +602,7 @@ avtCreateBondsFilter::ExecuteData_Fast(vtkPolyData *in, float maxBondDist,
for (int k=1; k<nk-1; k++) for (int k=1; k<nk-1; k++)
{ {
int index1 = i + ni*(j + nj*(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 each atom in each box
for (int la1=0; la1<nla1; la1++) for (int la1=0; la1<nla1; la1++)
{ {
...@@ -636,7 +636,7 @@ avtCreateBondsFilter::ExecuteData_Fast(vtkPolyData *in, float maxBondDist, ...@@ -636,7 +636,7 @@ avtCreateBondsFilter::ExecuteData_Fast(vtkPolyData *in, float maxBondDist,
// add this extra layer of boxes, though. // add this extra layer of boxes, though.
int index2 = ii + ni*(jj + nj*(kk)); 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++) for (int la2=0; la2<nla2 && ctr<max_per_atom; la2++)
{ {
if (index1==index2 && la1==la2) if (index1==index2 && la1==la2)
......
...@@ -2037,8 +2037,8 @@ avtIntegralCurveFilter::GenerateSeedPointsFromPointList(std::vector<avtVector> & ...@@ -2037,8 +2037,8 @@ avtIntegralCurveFilter::GenerateSeedPointsFromPointList(std::vector<avtVector> &
"multiple of 3 (X, Y, Z)."); "multiple of 3 (X, Y, Z).");
} }
int npts = listOfPoints.size() / 3; size_t npts = listOfPoints.size() / 3;
for (int i = 0 ; i < npts ; i++) for (size_t i = 0 ; i < npts ; i++)
{ {
avtVector p(listOfPoints[3*i], listOfPoints[3*i+1], listOfPoints[3*i+2]); avtVector p(listOfPoints[3*i], listOfPoints[3*i+1], listOfPoints[3*i+2]);
pts.push_back(p); pts.push_back(p);
...@@ -2064,8 +2064,8 @@ avtIntegralCurveFilter::GenerateSeedPointsFromSelection(std::vector<avtVector> & ...@@ -2064,8 +2064,8 @@ avtIntegralCurveFilter::GenerateSeedPointsFromSelection(std::vector<avtVector> &
} }
else else
{ {
int npts = allPts.size(); size_t npts = allPts.size();
for (int i = 0 ; i < npts ; i+= sampleDensity[0]) for (size_t i = 0 ; i < npts ; i+= sampleDensity[0])
pts.push_back(allPts[i]); pts.push_back(allPts[i]);
} }
} }
...@@ -2098,7 +2098,7 @@ avtIntegralCurveFilter::GetFieldForDomain(const BlockIDType& dom, vtkDataSet* ds ...@@ -2098,7 +2098,7 @@ avtIntegralCurveFilter::GetFieldForDomain(const BlockIDType& dom, vtkDataSet* ds
if( dataValue == IntegralCurveAttributes::Variable && if( dataValue == IntegralCurveAttributes::Variable &&
!dataVariable.empty() ) !dataVariable.empty() )
{ {
field->SetScalarVariable( secondaryVariables.size(), dataVariable ); field->SetScalarVariable( (unsigned char)secondaryVariables.size(), dataVariable );
} }
for( unsigned int i=0; i<secondaryVariables.size(); ++i ) for( unsigned int i=0; i<secondaryVariables.size(); ++i )
...@@ -2128,7 +2128,7 @@ avtIntegralCurveFilter::GetFieldForDomain(const BlockIDType& dom, vtkDataSet* ds ...@@ -2128,7 +2128,7 @@ avtIntegralCurveFilter::GetFieldForDomain(const BlockIDType& dom, vtkDataSet* ds
void void
avtIntegralCurveFilter::ReportWarnings(std::vector<avtIntegralCurve *> &ics) avtIntegralCurveFilter::ReportWarnings(std::vector<avtIntegralCurve *> &ics)
{ {
int numICs = ics.size(); int numICs = (int)ics.size();
// int numPts = 0; // int numPts = 0;
int numEarlyTerminators = 0; int numEarlyTerminators = 0;
int numStiff = 0; int numStiff = 0;
...@@ -2285,7 +2285,7 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve * ...@@ -2285,7 +2285,7 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
if (ics.size() == 0) if (ics.size() == 0)
return; return;
int numICs = ics.size(), numPts = 0; int numICs = (int)ics.size(), numPts = 0;
if (DebugStream::Level5()) if (DebugStream::Level5())
{ {
...@@ -2375,7 +2375,7 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve * ...@@ -2375,7 +2375,7 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
double cropBeginParam = 0.0, cropEndParam = 1.0; double cropBeginParam = 0.0, cropEndParam = 1.0;
int beginIndex = (cropBeginFlag ? -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 // Last crop value is need to obtain interpolation parametrization
// values. // values.
...@@ -2413,10 +2413,10 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve * ...@@ -2413,10 +2413,10 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
if( cropBeginValue == crop_value ) if( cropBeginValue == crop_value )
{ {
if( cropBeginFlag && beginIndex < 0 ) if( cropBeginFlag && beginIndex < 0 )
beginIndex = j; beginIndex = (int)j;
if( cropEndFlag ) if( cropEndFlag )
endIndex = j; endIndex = (int)j;
} }
// Within range so take those indexes - this is an // Within range so take those indexes - this is an
...@@ -2430,13 +2430,13 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve * ...@@ -2430,13 +2430,13 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
// If not the first point interpolation will be needed. // If not the first point interpolation will be needed.
if( 0 < j ) if( 0 < j )
{ {
beginIndex = j - 1; beginIndex = (int)j - 1;
cropBeginInterpolate = true; cropBeginInterpolate = true;
} }
// This happens when the crop value is smaller // This happens when the crop value is smaller
// than the first value along the curve. // than the first value along the curve.
else else
beginIndex = j; beginIndex = (int)j;
} }
if( cropEndFlag ) if( cropEndFlag )
...@@ -2445,12 +2445,12 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve * ...@@ -2445,12 +2445,12 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
if( j < nSamples-1 ) if( j < nSamples-1 )
{ {
cropEndInterpolate = true; cropEndInterpolate = true;
endIndex = j + 1; endIndex = (int)j + 1;
} }
// This happens when the crop value is larger // This happens when the crop value is larger
// than the last value along the curve. // than the last value along the curve.
else else
endIndex = j; endIndex = (int)j;
} }
} }
...@@ -2476,7 +2476,7 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve * ...@@ -2476,7 +2476,7 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
totalSamples = endIndex - beginIndex + 1; totalSamples = endIndex - beginIndex + 1;
} }
else else
totalSamples = nSamples; totalSamples = (int)nSamples;
if( totalSamples < 2 ) if( totalSamples < 2 )
continue; continue;
...@@ -2514,8 +2514,6 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve * ...@@ -2514,8 +2514,6 @@ avtIntegralCurveFilter::CreateIntegralCurveOutput(std::vector<avtIntegralCurve *
distance /= nSamples; distance /= nSamples;
} }
double lastPhi = 0, angle = 0;
for (int j = beginIndex; j <= endIndex; j++) for (int j = beginIndex; j <= endIndex; j++)
{ {
if( cropBeginInterpolate && j == beginIndex ) if( cropBeginInterpolate && j == beginIndex )
...@@ -2781,7 +2779,7 @@ avtIntegralCurveFilter::ComputeCorrelationDistance(int idx, ...@@ -2781,7 +2779,7 @@ avtIntegralCurveFilter::ComputeCorrelationDistance(int idx,
double angTol, double angTol,
double minDist) double minDist)
{ {
int nSamps = ic->GetNumberOfSamples(); int nSamps = (int)ic->GetNumberOfSamples();
//Last point... //Last point...
if (idx == nSamps-1) if (idx == nSamps-1)
......
...@@ -2807,14 +2807,14 @@ LCSAttributes::ChangesRequireRecalculation(const LCSAttributes &obj) const ...@@ -2807,14 +2807,14 @@ LCSAttributes::ChangesRequireRecalculation(const LCSAttributes &obj) const
} }
if ((sourceType == RegularGrid) && if ((sourceType == RegularGrid) &&
UseDataSetStart == true && UseDataSetStart == Subset &&
POINT_DIFFERS(StartPosition, obj.StartPosition)) POINT_DIFFERS(StartPosition, obj.StartPosition))
{ {
return true; return true;
} }
if ((sourceType == RegularGrid) && if ((sourceType == RegularGrid) &&
UseDataSetEnd == true && UseDataSetEnd == Subset &&
POINT_DIFFERS(EndPosition, obj.EndPosition)) POINT_DIFFERS(EndPosition, obj.EndPosition))
{ {
return true; return true;
......
...@@ -186,14 +186,14 @@ LCSAttributes::ChangesRequireRecalculation(const LCSAttributes &obj) const ...@@ -186,14 +186,14 @@ LCSAttributes::ChangesRequireRecalculation(const LCSAttributes &obj) const
} }
if ((sourceType == RegularGrid) && if ((sourceType == RegularGrid) &&
UseDataSetStart == true && UseDataSetStart == Subset &&
POINT_DIFFERS(StartPosition, obj.StartPosition)) POINT_DIFFERS(StartPosition, obj.StartPosition))
{ {
return true; return true;
} }
if ((sourceType == RegularGrid) && if ((sourceType == RegularGrid) &&
UseDataSetEnd == true && UseDataSetEnd == Subset &&
POINT_DIFFERS(EndPosition, obj.EndPosition)) POINT_DIFFERS(EndPosition, obj.EndPosition))
{ {
return true; return true;
......
...@@ -801,8 +801,8 @@ avtLCSFilter::GetInitialLocationsFromNativeMesh(avtDataTree_p inDT) ...@@ -801,8 +801,8 @@ avtLCSFilter::GetInitialLocationsFromNativeMesh(avtDataTree_p inDT)
vtkDataSet *in_ds = inDT->GetDataRepresentation().GetDataVTK(); vtkDataSet *in_ds = inDT->GetDataRepresentation().GetDataVTK();
size_t pts = in_ds->GetNumberOfPoints(); size_t pts = in_ds->GetNumberOfPoints();
int numberOfSeeds = seedPoints.size(); size_t numberOfSeeds = seedPoints.size();
int totalNumberOfSeeds = numberOfSeeds + pts; size_t totalNumberOfSeeds = numberOfSeeds + pts;
seedPoints.resize( totalNumberOfSeeds ); seedPoints.resize( totalNumberOfSeeds );
...@@ -1090,9 +1090,9 @@ avtLCSFilter::SingleBlockSingleCalc( vtkDataSet *in_ds, ...@@ -1090,9 +1090,9 @@ avtLCSFilter::SingleBlockSingleCalc( vtkDataSet *in_ds,
for(size_t i = 0; i < ics.size(); ++i) for(size_t i = 0; i < ics.size(); ++i)
{ {
size_t index = ics[i]->id; size_t index = ics[i]->id;
int l = (index-offset); size_t l = (index-offset);
//std::cout << "l = " << l << " " << nTuples << std::endl; //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() - // remapPoints[l] = ((avtLCSIC*)ics[i])->GetEndPoint() -
// ((avtLCSIC*)ics[i])->GetStartPoint(); // ((avtLCSIC*)ics[i])->GetStartPoint();
...@@ -1282,16 +1282,16 @@ avtLCSFilter::RectilinearGridSingleCalc(std::vector<avtIntegralCurve*> &ics) ...@@ -1282,16 +1282,16 @@ avtLCSFilter::RectilinearGridSingleCalc(std::vector<avtIntegralCurve*> &ics)
Barrier(); Barrier();
CollectIntArraysOnRootProc(all_indices, index_counts, CollectIntArraysOnRootProc(all_indices, index_counts,
&indices.front(), indices.size()); &indices.front(), (int)indices.size());
CollectDoubleArraysOnRootProc(all_times, time_counts, CollectDoubleArraysOnRootProc(all_times, time_counts,
&times.front(), times.size()); &times.front(), (int)times.size());
CollectDoubleArraysOnRootProc(all_lengths, time_counts, CollectDoubleArraysOnRootProc(all_lengths, time_counts,
&lengths.front(), lengths.size()); &lengths.front(), (int)lengths.size());
CollectDoubleArraysOnRootProc(all_points, point_counts, CollectDoubleArraysOnRootProc(all_points, point_counts,
&points.front(), points.size()); &points.front(), (int)points.size());
Barrier(); Barrier();
...@@ -2094,10 +2094,10 @@ avtLCSFilter::SingleBlockIterativeCalc( vtkDataSet *out_ds, ...@@ -2094,10 +2094,10 @@ avtLCSFilter::SingleBlockIterativeCalc( vtkDataSet *out_ds,
avtStreamlineIC * ic = (avtStreamlineIC *) ics[i];