From f9fd7d4fb11e3a4d922f43a684edb00a84cdaec1 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 21 Sep 2009 18:50:19 +0000
Subject: [PATCH] fix warnings
---
Geo/MElementCut.cpp | 2 +-
Mesh/highOrderSmoother.cpp | 2 +-
contrib/DiscreteIntegration/Integration3D.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Geo/MElementCut.cpp b/Geo/MElementCut.cpp
index db2583a770..fdecf9a670 100644
--- a/Geo/MElementCut.cpp
+++ b/Geo/MElementCut.cpp
@@ -723,7 +723,7 @@ static void elementCutMesh(MElement *e, gLevelset *ls,
MTriangle *tri;
if(p1 || p2) tri = new MTriangleBorder(mv[0], mv[1], mv[2], p1, p2, ++numEle, ePart);
else tri = new MTriangle(mv[0], mv[1], mv[2], ++numEle, ePart);
- double lsT = triangles[i].lsTag();
+ int lsT = triangles[i].lsTag();
int c = elements[2].count(lsT) + elements[3].count(lsT);
// suppose that the surfaces have been cut before the volumes!
int reg = getBorderTag(lsT, c, newtags[2][0], borderTags[1]);
diff --git a/Mesh/highOrderSmoother.cpp b/Mesh/highOrderSmoother.cpp
index 85c1e8850c..b371c53226 100644
--- a/Mesh/highOrderSmoother.cpp
+++ b/Mesh/highOrderSmoother.cpp
@@ -698,7 +698,7 @@ void highOrderSmoother::smooth(std::vector<MElement*> &all)
// assembly of the elasticity term on the
// set of elements
- for (int i = 0; i < v.size(); i++){
+ for (unsigned int i = 0; i < v.size(); i++){
SElement se(v[i]);
El.addToMatrix(myAssembler, &se);
}
diff --git a/contrib/DiscreteIntegration/Integration3D.h b/contrib/DiscreteIntegration/Integration3D.h
index 9875ebc066..e993da8e8f 100644
--- a/contrib/DiscreteIntegration/Integration3D.h
+++ b/contrib/DiscreteIntegration/Integration3D.h
@@ -74,7 +74,7 @@ class DI_Point
inline bool isInsideDomain () const {return Ls.back() < 0.;}
inline bool isOutsideDomain () const {return Ls.back() > 0.;}
inline bool isOnBorder () const {return Ls.back() == 0.;}
- inline double lsTag() const {
+ inline int lsTag() const {
if(isInsideDomain()) return 1;
if(isOutsideDomain()) return -1;
return 0;
--
GitLab