diff --git a/Geo/GEdge.h b/Geo/GEdge.h index a44d5504cf9ad440b95f7c145bdd08f139758a02..ca677e92320a707e95a30971da652a06d223b4e0 100644 --- a/Geo/GEdge.h +++ b/Geo/GEdge.h @@ -119,12 +119,12 @@ class GEdge : public GEntity { virtual void resetMeshAttributes(); struct { - char Method; + char Method; double coeffTransfinite; double meshSize; - int nbPointsTransfinite; - int typeTransfinite; - int minimumMeshSegments; + int nbPointsTransfinite; + int typeTransfinite; + int minimumMeshSegments; // the extrusion parameters (if any) ExtrudeParams *extrude; } meshAttributes ; diff --git a/Geo/gmshEdge.cpp b/Geo/gmshEdge.cpp index 9b1b21a347ec5304a1e9f295ff571c69bd1f2472..d267fa83d23949eef5888482cfc54a1046e18be7 100644 --- a/Geo/gmshEdge.cpp +++ b/Geo/gmshEdge.cpp @@ -1,4 +1,4 @@ -// $Id: gmshEdge.cpp,v 1.46 2008-02-23 16:21:51 remacle Exp $ +// $Id: gmshEdge.cpp,v 1.47 2008-02-23 17:38:34 geuzaine Exp $ // // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // @@ -114,7 +114,7 @@ int gmshEdge::minimumMeshSegments () const (double)CTX.mesh.min_circ_points / Pi) - 1; else np = CTX.mesh.min_curv_points - 1; - return std::max(np,meshAttributes.minimumMeshSegments); + return std::max(np, meshAttributes.minimumMeshSegments); } int gmshEdge::minimumDrawSegments () const diff --git a/Geo/gmshFace.cpp b/Geo/gmshFace.cpp index a91f5bb6f0a6b730530e94294d8474cbda27b774..e25d5ff2dc7a260eb65979141cae0e6972b88826 100644 --- a/Geo/gmshFace.cpp +++ b/Geo/gmshFace.cpp @@ -1,4 +1,4 @@ -// $Id: gmshFace.cpp,v 1.52 2008-02-23 16:31:06 remacle Exp $ +// $Id: gmshFace.cpp,v 1.53 2008-02-23 17:38:34 geuzaine Exp $ // // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // @@ -31,7 +31,7 @@ gmshFace::gmshFace(GModel *m, Surface *face) { resetMeshAttributes(); - for(int i = 0 ; i < List_Nbr(s->Generatrices); i++){ + for(int i = 0; i < List_Nbr(s->Generatrices); i++){ Curve *c; List_Read(s->Generatrices, i, &c); GEdge *e = m->getEdgeByTag(abs(c->Num)); @@ -42,7 +42,7 @@ gmshFace::gmshFace(GModel *m, Surface *face) l_dirs.push_back((c->Num > 0) ? 1 : -1); if (List_Nbr(s->Generatrices) == 2){ e->meshAttributes.minimumMeshSegments = - std::max(e->meshAttributes.minimumMeshSegments,2); + std::max(e->meshAttributes.minimumMeshSegments, 2); } } else @@ -63,7 +63,7 @@ gmshFace::gmshFace(GModel *m, Surface *face) } if(s->EmbeddedCurves){ - for(int i = 0 ; i < List_Nbr(s->EmbeddedCurves); i++){ + for(int i = 0; i < List_Nbr(s->EmbeddedCurves); i++){ Curve *c; List_Read(s->EmbeddedCurves, i, &c); GEdge *e = m->getEdgeByTag(abs(c->Num)); @@ -74,7 +74,7 @@ gmshFace::gmshFace(GModel *m, Surface *face) } } if(s->EmbeddedPoints){ - for(int i = 0 ; i < List_Nbr(s->EmbeddedPoints); i++){ + for(int i = 0; i < List_Nbr(s->EmbeddedPoints); i++){ Vertex *v; List_Read(s->EmbeddedPoints, i, &v); GVertex *gv = m->getVertexByTag(v->Num); @@ -84,8 +84,6 @@ gmshFace::gmshFace(GModel *m, Surface *face) Msg(GERROR, "Unknown point %d", v->Num); } } - // face->print_info(); - } double gmshFace::getMetricEigenvalue(const SPoint2 &pt)