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

*** empty log message ***

parent b8d179f9
Branches
Tags
No related merge requests found
// $Id: meshGEdge.cpp,v 1.57 2008-03-20 11:44:08 geuzaine Exp $ // $Id: meshGEdge.cpp,v 1.58 2008-03-21 22:22:49 geuzaine Exp $
// //
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
// //
...@@ -36,8 +36,7 @@ typedef struct{ ...@@ -36,8 +36,7 @@ typedef struct{
double t, lc, p; double t, lc, p;
} IntPoint; } IntPoint;
struct xi2lc struct xi2lc {
{
double xi, lc; double xi, lc;
xi2lc(const double &_xi, const double _lc) xi2lc(const double &_xi, const double _lc)
: xi(_xi), lc(_lc) : xi(_xi), lc(_lc)
...@@ -282,7 +281,6 @@ void meshGEdge::operator() (GEdge *ge) ...@@ -282,7 +281,6 @@ void meshGEdge::operator() (GEdge *ge)
if(ge->geomType() == GEntity::DiscreteCurve) return; if(ge->geomType() == GEntity::DiscreteCurve) return;
if(ge->geomType() == GEntity::BoundaryLayerCurve) return; if(ge->geomType() == GEntity::BoundaryLayerCurve) return;
deMeshGEdge dem; deMeshGEdge dem;
dem(ge); dem(ge);
...@@ -301,20 +299,22 @@ void meshGEdge::operator() (GEdge *ge) ...@@ -301,20 +299,22 @@ void meshGEdge::operator() (GEdge *ge)
// first compute the length of the curve by integrating one // first compute the length of the curve by integrating one
SPoint3 p1 = ge->model()->bounds().min(); SPoint3 p1 = ge->model()->bounds().min();
SPoint3 p2 = ge->model()->bounds().max(); SPoint3 p2 = ge->model()->bounds().max();
double length = Integration(ge, t_begin, t_end, F_One, Points, 1.e-8*p1.distance(p2)); double length = Integration(ge, t_begin, t_end, F_One, Points,
1.e-8 * p1.distance(p2));
ge->setLength(length); ge->setLength(length);
// Send a messsage to the GMSH environment
if(length == 0.0) if(length == 0.0)
Msg(DEBUG2, "Curve %d has a zero length", ge->tag()); Msg(DEBUG2, "Curve %d has a zero length", ge->tag());
List_Reset(Points); List_Reset(Points);
// Integrate detJ/lc du // Integrate detJ/lc du
double a; double a;
int N; int N;
if (ge->degenerate(0)){N=1;a=0.0;} if (ge->degenerate(0)){
a = 0.;
N = 1;
}
else if(ge->meshAttributes.Method == TRANSFINI){ else if(ge->meshAttributes.Method == TRANSFINI){
a = Integration(ge, t_begin, t_end, F_Transfinite, Points, 1.e-8); a = Integration(ge, t_begin, t_end, F_Transfinite, Points, 1.e-8);
N = ge->meshAttributes.nbPointsTransfinite; N = ge->meshAttributes.nbPointsTransfinite;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment