From 760b38be080f3aacd44060fba0e246a13048015e Mon Sep 17 00:00:00 2001
From: Laurent Van Migroet <l.vanmiegroet@ulg.ac.be>
Date: Thu, 1 Apr 2010 12:17:04 +0000
Subject: [PATCH] remove some warning
---
Geo/MElementOctree.cpp | 2 +-
Geo/MPrism.cpp | 2 +-
Mesh/BackgroundMesh.cpp | 4 ++--
Mesh/qualityMeasures.cpp | 2 +-
Solver/function.cpp | 2 +-
Solver/function.h | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Geo/MElementOctree.cpp b/Geo/MElementOctree.cpp
index b16d8aebbd..5d71100df4 100644
--- a/Geo/MElementOctree.cpp
+++ b/Geo/MElementOctree.cpp
@@ -70,7 +70,7 @@ Octree *buildMElementOctree(std::vector<MElement*> &v)
{
SBoundingBox3d bb;
for (unsigned int i=0;i<v.size();i++){
- for(unsigned int j=0;j<v[i]->getNumVertices();j++){
+ for(int j=0;j<v[i]->getNumVertices();j++){
bb += SPoint3(v[i]->getVertex(j)->x(),
v[i]->getVertex(j)->y(),
v[i]->getVertex(j)->z());
diff --git a/Geo/MPrism.cpp b/Geo/MPrism.cpp
index 29de187248..36a2bf749a 100644
--- a/Geo/MPrism.cpp
+++ b/Geo/MPrism.cpp
@@ -56,7 +56,7 @@ const polynomialBasis* MPrism::getFunctionSpace(int o) const
double MPrism::getInnerRadius()
{
double dist[3], k = 0.;
- double triEdges[3] = {0,1,3};
+ int triEdges[3] = {0,1,3};
for (int i = 0; i < 3; i++){
MEdge e = getEdge(triEdges[i]);
dist[i] = e.getVertex(0)->distance(e.getVertex(1));
diff --git a/Mesh/BackgroundMesh.cpp b/Mesh/BackgroundMesh.cpp
index 07a866d73b..9deb77cb6b 100644
--- a/Mesh/BackgroundMesh.cpp
+++ b/Mesh/BackgroundMesh.cpp
@@ -300,7 +300,7 @@ backgroundMesh::backgroundMesh(GFace *_gf)
backgroundMesh::~backgroundMesh()
{
for (unsigned int i = 0; i < _vertices.size(); i++) delete _vertices[i];
- for (int i = 0; i < _triangles.size(); i++) delete _triangles[i];
+ for (unsigned int i = 0; i < _triangles.size(); i++) delete _triangles[i];
delete _octree;
}
@@ -501,7 +501,7 @@ void backgroundMesh::print (const std::string &filename, GFace *gf) const
{
FILE *f = fopen (filename.c_str(),"w");
fprintf(f,"View \"Background Mesh\"{\n");
- for(int i=0;i<_triangles.size();i++){
+ for(unsigned int i=0;i<_triangles.size();i++){
MVertex *v1 = _triangles[i]->getVertex(0);
MVertex *v2 = _triangles[i]->getVertex(1);
MVertex *v3 = _triangles[i]->getVertex(2);
diff --git a/Mesh/qualityMeasures.cpp b/Mesh/qualityMeasures.cpp
index 54b150ecf1..f7559c0480 100644
--- a/Mesh/qualityMeasures.cpp
+++ b/Mesh/qualityMeasures.cpp
@@ -398,7 +398,7 @@ double qmQuadrangleAngles (MQuadrangle *e) {
rot[0][0]=-1; rot[0][1]=1; rot[0][2]=0;
rot[1][0]=-1; rot[1][1]=0; rot[1][2]=0;
rot[2][0]= 0; rot[2][1]=0; rot[2][2]=1;
- double tmp[3][3];
+ //double tmp[3][3];
const double u[9] = {-1,-1, 1, 1, 0,0,1,-1,0};
const double v[9] = {-1, 1, 1,-1, -1,1,0,0,0};
diff --git a/Solver/function.cpp b/Solver/function.cpp
index 7771988a27..2769248eea 100644
--- a/Solver/function.cpp
+++ b/Solver/function.cpp
@@ -51,7 +51,7 @@ dataCacheDouble::dataCacheDouble(dataCacheMap *m, function *f):
_function = f;
_dependencies.resize ( _function->arguments.size());
_depM.resize (_function->arguments.size());
- for (int i=0;i<_function->arguments.size();i++)
+ for (unsigned int i=0;i<_function->arguments.size();i++)
_dependencies[i] = &m[_function->arguments[i].first].get(_function->arguments[i].second,this);
}
diff --git a/Solver/function.h b/Solver/function.h
index 1b9fadb881..54229be318 100644
--- a/Solver/function.h
+++ b/Solver/function.h
@@ -102,7 +102,7 @@ public :
// still virtual because it is overrided by conservation law terms, as soon as conservation law terms will be regular functions, we will remove this
virtual void _eval()
{
- for(int i=0;i<_dependencies.size(); i++)
+ for(unsigned int i=0;i<_dependencies.size(); i++)
_depM[i] = &(*_dependencies[i])();
_function->call(&_cacheMap, _value, _depM);
}
--
GitLab