Skip to content
Snippets Groups Projects
Commit 09dd6cb2 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

cleaned last gcc warnings

tagging gmsh_2_0_0
parent 53081bd4
No related branches found
No related tags found
No related merge requests found
......@@ -79,7 +79,7 @@ class Vertex {
double lc, u, w;
Coord Pos;
Vertex(double X=0., double Y=0., double Z=0., double l=1., double W=1.)
: geometry(0), Visible(1), lc(l), w(W)
: geometry(0), Num(0), Visible(1), lc(l), u(0.), w(W)
{
Pos.X = X;
Pos.Y = Y;
......
......@@ -58,7 +58,7 @@ class MVertex{
// get the "polynomial order" of the vertex
inline int getPolynomialOrder(){ return _order; }
inline int setPolynomialOrder(char order){ _order = order; }
inline void setPolynomialOrder(char order){ _order = order; }
// get/set the coordinates
inline double x() const { return _x; }
......
// $Id: gmshSurface.cpp,v 1.3 2007-02-02 17:16:46 remacle Exp $
// $Id: gmshSurface.cpp,v 1.4 2007-02-03 13:06:44 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
......@@ -28,19 +28,18 @@ gmshSurface * gmshSphere :: NewSphere ( int iSphere , double x, double y, double
{
gmshSphere *sph = new gmshSphere(x, y, z, r);
if (allGmshSurfaces.find(iSphere) != allGmshSurfaces.end())
{
if(allGmshSurfaces.find(iSphere) != allGmshSurfaces.end()){
Msg(GERROR,"gmshSurface %d already exists",iSphere);
}
allGmshSurfaces[iSphere] = sph;
return sph;
}
gmshSurface * gmshSurface::surfaceByTag(int iSurface)
{
std::map<int, gmshSurface*>::iterator it = allGmshSurfaces.find(iSurface);
if (it == allGmshSurfaces.end())
{
if(it == allGmshSurfaces.end()){
Msg(GERROR,"gmshSurface %d does not exist",iSurface);
return 0;
}
......
......@@ -34,7 +34,9 @@ class gmshSurface
protected:
static std::map<int, gmshSurface*> allGmshSurfaces;
public:
static void reset () {
virtual ~gmshSurface(){}
static void reset ()
{
std::map<int,gmshSurface*>::iterator it = allGmshSurfaces.begin();
for (; it != allGmshSurfaces.end(); ++it)
delete it->second;
......@@ -53,8 +55,7 @@ public:
};
virtual gmshSurface::gmshSurfaceType geomType() const = 0;
virtual SPoint3 point(double par1, double par2) const = 0;
virtual SPoint3 point (const SPoint2 &p) const
{return point(p.x(),p.y()); }
virtual SPoint3 point(const SPoint2 &p) const { return point(p.x(), p.y()); }
virtual SPoint2 parFromPoint(double x, double y, double z) const = 0;
// Return the normal to the face at the given parameter location.
virtual SVector3 normal(const SPoint2 &param) const = 0;
......@@ -62,19 +63,19 @@ public:
virtual Pair<SVector3,SVector3> firstDer(const SPoint2 &param) const = 0;
};
class gmshSphere : public gmshSurface
{
double xc, yc, zc, r;
gmshSphere(double _x, double _y, double _z, double _r) : xc(_x), yc(_y), zc(_z), r(_r){}
public:
static gmshSurface *NewSphere(int _iSphere, double _x, double _y, double _z, double _r);
virtual Range<double> parBounds(int i) const {
virtual Range<double> parBounds(int i) const
{
if(i == 0) return Range<double>(0., 2 * M_PI);
if(i == 1) return Range<double>(0., M_PI);
throw;
}
/// Underlying geometric representation of this entity.
// Underlying geometric representation of this entity.
virtual gmshSurface::gmshSurfaceType geomType() const { return gmshSurface::Sphere; }
virtual SPoint3 point(double par1, double par2) const;
virtual SPoint2 parFromPoint(double x, double y, double z) const
......
// $Id: meshGRegionDelaunayInsertion.cpp,v 1.14 2007-01-31 12:27:18 remacle Exp $
// $Id: meshGRegionDelaunayInsertion.cpp,v 1.15 2007-02-03 13:06:44 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
......@@ -304,9 +304,9 @@ bool find_triangle_in_model ( GModel *model , MTriangle *tri, GFace **gfound, bo
static compareMTriangleLexicographic cmp;
GEntity *g1 = tri->getVertex(0)->onWhat();
GEntity *g2 = tri->getVertex(1)->onWhat();
GEntity *g3 = tri->getVertex(2)->onWhat();
// GEntity *g1 = tri->getVertex(0)->onWhat();
// GEntity *g2 = tri->getVertex(1)->onWhat();
// GEntity *g3 = tri->getVertex(2)->onWhat();
// if (g1 && g2 && g3 && !force)
// {
......
......@@ -25,7 +25,7 @@ generator with built-in pre- and post-processing facilities</h1>
<p>
<h3 align="center">Christophe Geuzaine and Jean-Franois Remacle</h3>
<p>
<h3 align=center>Version 2.0, January XX 2006</h3>
<h3 align=center>Version 2.0, February 5 2006</h3>
<p>
<center>
<a href="#Description">Description</a> |
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment