diff --git a/Geo/ChainComplex.cpp b/Geo/ChainComplex.cpp
index f9b7572dc208a769608b38765d1d071c18a1c380..e15c8a0af6d057d52b09109d6db0657155e975a1 100644
--- a/Geo/ChainComplex.cpp
+++ b/Geo/ChainComplex.cpp
@@ -649,7 +649,7 @@ void ChainComplex::smoothenChain(std::map<Cell*, int, Less_Cell>& cells)
deImmuneCells(cells);
eraseNullCells(cells);
- if (size >= cells.size()) useless++;
+ if (size >= (int)cells.size()) useless++;
else useless = 0;
if (useless > 5) break;
}
@@ -942,7 +942,7 @@ gmp_matrix* HomologySequence::removeZeroCols(gmp_matrix* matrix) // FIXME
int k = 0;
for(int j = 1; j <= cols; j++){
- if(zcols.size()-1 < k) break;
+ if((int)zcols.size()-1 < k) break;
if(zcols.at(k) == j) { k++; continue; }
for(int i = 1; i <= rows; i++){
gmp_matrix_get_elem(elem, i, j, matrix);
diff --git a/Geo/ExtrudeParams.cpp b/Geo/ExtrudeParams.cpp
index ea12b7d9990d0de2bf7e6e489aa4a79b46cea1e2..03393e9f60c5bdb7337dca1fd9a3d05f70cbb8b6 100644
--- a/Geo/ExtrudeParams.cpp
+++ b/Geo/ExtrudeParams.cpp
@@ -182,7 +182,7 @@ void ExtrudeParams::ExtrusionElementMap::propagatePartitionInformation(std::vect
// // Msg::Warning("No element vector found!");
// continue;
// }
- for(int iE = 0;iE < extrudedElements.size();iE++) {
+ for(unsigned int iE = 0;iE < extrudedElements.size();iE++) {
if(extrudedElements[iE]) {
extrudedElements[iE]->setPartition(sourceElem->getPartition());
if (partitionSizes)
diff --git a/Geo/discreteEdge.cpp b/Geo/discreteEdge.cpp
index cfdb02623dccf249d650dd0f095b953bf98f5237..922d8741c0fe0ac9a91dbe0db2b30a43f6886b06 100644
--- a/Geo/discreteEdge.cpp
+++ b/Geo/discreteEdge.cpp
@@ -299,7 +299,7 @@ void discreteEdge::parametrize( std::map<GFace*, std::map<MVertex*, MVertex*, s
void discreteEdge::computeNormals () const
{
_normals.clear();
- for (int i= 0; i < mesh_vertices.size(); i++) _normals[mesh_vertices[i]] = SVector3(0.0,0.0,0.0);
+ for (unsigned int i= 0; i < mesh_vertices.size(); i++) _normals[mesh_vertices[i]] = SVector3(0.0,0.0,0.0);
_normals[getBeginVertex()->mesh_vertices[0]] = SVector3(0.0,0.0,0.0);
_normals[getBeginVertex()->mesh_vertices[0]] = SVector3(0.0,0.0,0.0);
double J[3][3];
diff --git a/Solver/elasticitySolver.cpp b/Solver/elasticitySolver.cpp
index a9ba9b975d90c18a77d463988b89fe7629d9248f..047e83fdbc4a798b4e94e2deb8bb7acd471acc7f 100644
--- a/Solver/elasticitySolver.cpp
+++ b/Solver/elasticitySolver.cpp
@@ -323,7 +323,6 @@ PView *elasticitySolver::buildVonMisesView(const std::string &postFileName)
{
MElement *e=*it;
double energ;
- double vol;
IntPt *GP;
int npts=Integ_Bulk.getIntPoints(e,&GP);
Elastic_Energy_Term.get(e,npts,GP,energ);
diff --git a/Solver/multiscaleLaplace.cpp b/Solver/multiscaleLaplace.cpp
index 7abbceeb700bf2206b69bf750aa81ae1eb4819e8..1ea041f29f85868b82047dcc2b1c7f2616d39732 100644
--- a/Solver/multiscaleLaplace.cpp
+++ b/Solver/multiscaleLaplace.cpp
@@ -127,7 +127,7 @@ static double getSizeBB(std::vector<MEdge> &me){
SOrientedBoundingBox obbox ;
std::vector<SPoint3> vertices;
- for (int i=0; i< me.size(); i++){
+ for (unsigned int i=0; i< me.size(); i++){
MVertex *v0 = me[i].getVertex(0);
MVertex *v1 = me[i].getVertex(1);
SPoint3 pt1(v0->x(),v0->y(), v0->z());
@@ -253,7 +253,7 @@ static void recur_compute_centers_ (double R, double a1, double a2,
std::vector<SPoint2> centersChild;
centersChild.clear();
- for (int i=0;i<root->children.size();i++){
+ for (unsigned int i=0;i<root->children.size();i++){
multiscaleLaplaceLevel* m = root->children[i];
centers.push_back(std::make_pair(m->center,m));
m->radius = 0.0;
@@ -277,13 +277,13 @@ static void recur_compute_centers_ (double R, double a1, double a2,
std::vector<MEdge> me = boundaries[i];
SPoint2 c(0.0,0.0);
double rad = 0.0;
- for(int j= 0; j< me.size(); j++){
+ for(unsigned int j= 0; j< me.size(); j++){
MVertex *v = me[j].getVertex(0);
std::map<MVertex *, SPoint2>::iterator it0 = root->coordinates.find(v);
c += it0->second;
}
c *= 1./((double)me.size());
- for(int j= 0; j< me.size(); j++){
+ for(unsigned int j= 0; j< me.size(); j++){
SPoint2 p = root->coordinates[me[j].getVertex(0)];
rad = std::max(rad,sqrt ((c.x() - p.x())*(c.x() - p.x())+
(c.y() - p.y())*(c.y() - p.y())));
@@ -315,7 +315,7 @@ static void recur_compute_centers_ (double R, double a1, double a2,
centers.insert(centers.begin(), std::make_pair(PL,zero));
centers.push_back(std::make_pair(PR,zero));
- for (int i=1;i<centers.size()-1;i++){
+ for (unsigned int i=1;i<centers.size()-1;i++){
multiscaleLaplaceLevel* m1 = centers[i-1].second;
multiscaleLaplaceLevel* m2 = centers[i].second;
multiscaleLaplaceLevel* m3 = centers[i+1].second;
@@ -341,7 +341,7 @@ static void recur_cut_edges_ (multiscaleLaplaceLevel * root,
const double EPS = 0.001;
std::vector<std::pair<SPoint2,multiscaleLaplaceLevel*> > ¢ers = root->cut;
- for (int i=0;i<centers.size()-1;i++){
+ for (unsigned int i=0;i<centers.size()-1;i++){
SPoint2 p1 = centers[i].first;
SPoint2 p2 = centers[i+1].first;
for (std::set <MEdge,Less_Edge>::iterator it = allEdges.begin();
@@ -541,7 +541,7 @@ static void recur_cut_ (double R, double a1, double a2,
}
pp *= 1./(double)root->elements[i]->getNumVertices();
int nbIntersect = 0;
- for (int j = 0; j < centers.size() - 1; j++){
+ for (unsigned int j = 0; j < centers.size() - 1; j++){
double x[2];
nbIntersect += intersection_segments (centers[j].first,centers[j+1].first,pp,farLeft,x);
}
@@ -551,7 +551,7 @@ static void recur_cut_ (double R, double a1, double a2,
right.push_back(root->elements[i]);
}
- for (int i = 1; i < centers.size() - 1; i++){
+ for (unsigned int i = 1; i < centers.size() - 1; i++){
multiscaleLaplaceLevel* m1 = centers[i-1].second;
multiscaleLaplaceLevel* m2 = centers[i].second;
multiscaleLaplaceLevel* m3 = centers[i+1].second;
@@ -575,7 +575,7 @@ static void connected_left_right (std::vector<MElement *> &left,
if (subRegionsL.size() > 0){
int maxSize= subRegionsL[0].size();
- for (int i=1;i< subRegionsL.size() ; i++){
+ for (unsigned int i=1;i< subRegionsL.size() ; i++){
int size = subRegionsL[i].size();
if(size > maxSize){
maxSize = size;
@@ -585,7 +585,7 @@ static void connected_left_right (std::vector<MElement *> &left,
}
left.clear();
- for (int i=0;i< subRegionsL.size() ; i++){
+ for (unsigned int i=0;i< subRegionsL.size() ; i++){
if (i == indexL)
left.insert(left.begin(), subRegionsL[i].begin(), subRegionsL[i].end());
else
@@ -599,7 +599,7 @@ static void connected_left_right (std::vector<MElement *> &left,
if (subRegionsR.size() > 0){
int maxSize= subRegionsR[0].size();
- for (int i=1;i< subRegionsR.size() ; i++){
+ for (unsigned int i=1;i< subRegionsR.size() ; i++){
int size = subRegionsR[i].size();
if(size > maxSize){
maxSize = size;
@@ -609,7 +609,7 @@ static void connected_left_right (std::vector<MElement *> &left,
}
right.clear();
- for (int i=0;i< subRegionsR.size() ; i++){
+ for (unsigned int i=0;i< subRegionsR.size() ; i++){
if (i == indexR)
right.insert(right.begin(), subRegionsR[i].begin(), subRegionsR[i].end());
else
@@ -617,9 +617,9 @@ static void connected_left_right (std::vector<MElement *> &left,
}
//assign partitions
- for (int i= 0; i< left.size(); i++)
+ for (unsigned int i= 0; i< left.size(); i++)
left[i]->setPartition(1);
- for (int i= 0; i< right.size(); i++)
+ for (unsigned int i= 0; i< right.size(); i++)
right[i]->setPartition(2);
}
@@ -666,7 +666,7 @@ static void printLevel(const char* fn,
static double localSize(MElement *e, std::map<MVertex*,SPoint2> &solution){
SBoundingBox3d local;
- for(unsigned int j = 0; j<e->getNumVertices(); ++j){
+ for(int j = 0; j<e->getNumVertices(); ++j){
SPoint2 p = solution[e->getVertex(j)];
local += SPoint3(p.x(),p.y(),0.0);
}
@@ -892,7 +892,7 @@ void multiscaleLaplace::fillCoordinates (multiscaleLaplaceLevel & level,
for(unsigned int i = 0; i < level.elements.size(); ++i){
MElement *e = level.elements[i];
- for(unsigned int j = 0; j<e->getNumVertices(); ++j){
+ for(int j = 0; j<e->getNumVertices(); ++j){
MVertex *v = e->getVertex(j);
SPoint2 coord = level.coordinates[v];
for (int k= iScale.size()-1; k > 0; k--){
@@ -903,7 +903,7 @@ void multiscaleLaplace::fillCoordinates (multiscaleLaplaceLevel & level,
}
- for (int i=0;i<level.children.size();i++){
+ for (unsigned int i=0;i<level.children.size();i++){
multiscaleLaplaceLevel* m = level.children[i];
fillCoordinates(*m, allCoordinates, iScale, iCenter);
}
@@ -918,7 +918,7 @@ void multiscaleLaplace::parametrize (multiscaleLaplaceLevel & level){
std::set<MVertex*> allNodes;
for(unsigned int i = 0; i < level.elements.size(); ++i){
MElement *e = level.elements[i];
- for(unsigned int j = 0; j<e->getNumVertices(); ++j){
+ for(int j = 0; j<e->getNumVertices(); ++j){
allNodes.insert(e->getVertex(j));
}
}
@@ -957,7 +957,7 @@ void multiscaleLaplace::parametrize (multiscaleLaplaceLevel & level){
if (regGoodSize.size() > 0){
int index=0;
int maxSize= regGoodSize[0].size();
- for (int i=1;i< regGoodSize.size() ; i++){
+ for (unsigned int i=1;i< regGoodSize.size() ; i++){
int size = regGoodSize[i].size();
if(size > maxSize){
index = i;
@@ -965,7 +965,7 @@ void multiscaleLaplace::parametrize (multiscaleLaplaceLevel & level){
}
}
goodSize.clear();
- for (int i=0;i< regGoodSize.size() ; i++){
+ for (unsigned int i=0;i< regGoodSize.size() ; i++){
if (i == index) goodSize.insert(goodSize.begin(), regGoodSize[i].begin(), regGoodSize[i].end());
else tooSmall.insert(tooSmall.begin(), regGoodSize[i].begin(), regGoodSize[i].end());
}
@@ -978,11 +978,11 @@ void multiscaleLaplace::parametrize (multiscaleLaplaceLevel & level){
std::vector<double> rads;
regions.clear(); regions_.clear();
connectedRegions (tooSmall,regions_);
- for (int i=0;i< regions_.size() ; i++){
+ for (unsigned int i=0;i< regions_.size() ; i++){
bool really_small_elements = false;
// double totArea = 0.0;
// SPoint2 center = (0.,0., 0.);
- for (int k=0; k<regions_[i].size() ; k++){
+ for (unsigned int k=0; k<regions_[i].size() ; k++){
MElement *e = regions_[i][k];
// SPoint2 p0 = solution[e->getVertex(0)];
// SPoint2 p1 = solution[e->getVertex(1)];
@@ -1058,7 +1058,7 @@ void multiscaleLaplace::parametrize (multiscaleLaplaceLevel & level){
std::set<MVertex*> goodSizev;
for(unsigned int i = 0; i < level.elements.size(); ++i){
MElement *e = level.elements[i];
- for(unsigned int j = 0; j<e->getNumVertices(); ++j){
+ for(int j = 0; j<e->getNumVertices(); ++j){
MVertex *v = e->getVertex(j);
goodSizev.insert(v);
level.coordinates[v] = solution[v];
@@ -1076,9 +1076,9 @@ void multiscaleLaplace::parametrize (multiscaleLaplaceLevel & level){
for (unsigned int i = 0; i < regions.size(); i++){
std::set<MVertex*> tooSmallv;
tooSmallv.clear();
- for (int k=0; k<regions[i].size() ; k++){
+ for (unsigned int k=0; k<regions[i].size() ; k++){
MElement *e = regions[i][k];
- for(unsigned int j = 0; j<e->getNumVertices(); ++j){
+ for(int j = 0; j<e->getNumVertices(); ++j){
tooSmallv.insert(e->getVertex(j));
}
}
diff --git a/Solver/solverField.h b/Solver/solverField.h
index 0160ff55ebd6b0a51fa40f8e2209eb3d07ee1122..bdd6f57b0d3c58e4e189e8e21e8e09f48ae2470a 100644
--- a/Solver/solverField.h
+++ b/Solver/solverField.h
@@ -48,7 +48,7 @@ class SolverField : public FunctionSpace<T> // being able to use it instead of a
dm->getDofValue(D,DMVals);
fs->f(ele,u,v,w,SFVals);
val=ValType();
- for (int i=0;i<D.size();++i)
+ for (unsigned int i=0;i<D.size();++i)
val+=SFVals[i]*DMVals[i];
}
@@ -68,7 +68,7 @@ class SolverField : public FunctionSpace<T> // being able to use it instead of a
dm->getDofValue(D,DMVals);
fs->gradf(ele,u,v,w,SFGrads);
grad=GradType();
- for (int i=0;i<D.size();++i)
+ for (unsigned int i=0;i<D.size();++i)
grad+= SFGrads[i] * DMVals[i];
}
diff --git a/Solver/terms.h b/Solver/terms.h
index 9db711b3df1067e84601e05f25480d25159c1292..893c9d9cef795999dd05b7721db2fcd859ed5509 100644
--- a/Solver/terms.h
+++ b/Solver/terms.h
@@ -298,7 +298,7 @@ template<class T1> class LoadTerm : public LinearTerm<T1>
virtual void get(MElement *ele,int npts,IntPt *GP,fullVector<double> &m)
{
- double nbFF=LinearTerm<T1>::space1.getNumKeys(ele);
+ int nbFF=LinearTerm<T1>::space1.getNumKeys(ele);
double jac[3][3];
m.resize(nbFF);
m.scale(0.);
diff --git a/contrib/cm3/MInterfaceElement.h b/contrib/cm3/MInterfaceElement.h
index a2c20e23076343079c4bcf477758ea8a747f5b65..6b30110e47f59011c5a0122693fe48441f7898f2 100644
--- a/contrib/cm3/MInterfaceElement.h
+++ b/contrib/cm3/MInterfaceElement.h
@@ -40,7 +40,7 @@ class MInterfaceElement : public MLineN{ // or don't derivate but in this case a
std::vector<MVertex*> vv;
for(int i = 0; i < nopv; i++){
_numElem[jj]->getEdgeVertices(i,vv);
- for(int j = 2; j < vv.size(); j++){
+ for(unsigned int j = 2; j < vv.size(); j++){
if(vv[j] == v[0]){
_numEdge[jj] = i;
if(v0 == vv[0]) _dir[jj] = true; // same orientation
@@ -62,7 +62,7 @@ class MInterfaceElement : public MLineN{ // or don't derivate but in this case a
std::vector<MVertex*> vv;
for(int i = 0; i < nopv; i++){
_numElem[jj]->getEdgeVertices(i,vv);
- for(int j = 2; j < vv.size(); j++){
+ for(unsigned int j = 2; j < vv.size(); j++){
if(vv[j] == v[2]){ // v[2] because it is the first interior node
_numEdge[jj] = i;
if(v[0] == vv[0]) _dir[jj] = true; // same orientation