From 359e1e895f6969c870f191fbce12e3f3573d2ece Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 23 Feb 2008 17:38:34 +0000
Subject: [PATCH] pp
---
Geo/GEdge.h | 8 ++++----
Geo/gmshEdge.cpp | 4 ++--
Geo/gmshFace.cpp | 12 +++++-------
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/Geo/GEdge.h b/Geo/GEdge.h
index a44d5504cf..ca677e9232 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 9b1b21a347..d267fa83d2 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 a91f5bb6f0..e25d5ff2dc 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)
--
GitLab