From c27e87772844eb435b5a9d375d849c8c98f0e1c7 Mon Sep 17 00:00:00 2001
From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be>
Date: Wed, 10 Oct 2007 13:59:30 +0000
Subject: [PATCH] *** empty log message ***
---
Mesh/BDS.cpp | 13 +++++++++----
Mesh/meshGFace.cpp | 23 +----------------------
Mesh/meshGFaceOptimize.cpp | 4 +---
3 files changed, 11 insertions(+), 29 deletions(-)
diff --git a/Mesh/BDS.cpp b/Mesh/BDS.cpp
index df8b3b5a07..75bef5ef98 100644
--- a/Mesh/BDS.cpp
+++ b/Mesh/BDS.cpp
@@ -1,4 +1,4 @@
-// $Id: BDS.cpp,v 1.78 2007-09-10 04:47:03 geuzaine Exp $
+// $Id: BDS.cpp,v 1.79 2007-10-10 13:59:30 remacle Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -236,7 +236,11 @@ BDS_Edge *BDS_Mesh::recover_edge(int num1, int num2,std::set<EdgeToRecover> *e2r
{
if (e2r && e2r->find(EdgeToRecover(e->p1->iD,e->p2->iD,0)) != e2r->end())
{
- Msg(GERROR," edge %d %d cannot be recovered because it intersects %d %d",num1,num2,e->p1->iD,e->p2->iD);
+ std::set<EdgeToRecover>::iterator itr1 = e2r->find(EdgeToRecover(e->p1->iD,e->p2->iD,0));
+ std::set<EdgeToRecover>::iterator itr2 = e2r->find(EdgeToRecover(num1,num2,0));
+ Msg(GERROR," edge %d %d on model edge %d cannot be recovered because it intersects %d %d on model edge %d",
+ num1,num2,itr2->ge->tag(),
+ e->p1->iD,e->p2->iD,itr1->ge->tag());
return false;
}
intersected.push_back(e);
@@ -1150,8 +1154,9 @@ void BDS_Mesh::recombineIntoQuads (const double angle_limit, GFace *gf)
smooth_point_parametric(*itpt,gf);
++itpt;
}
-
-
}
}
+void FullQuadMesh ()
+{
+}
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 1b0f5a6c16..1e584cf0ba 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGFace.cpp,v 1.90 2007-10-10 08:49:34 remacle Exp $
+// $Id: meshGFace.cpp,v 1.91 2007-10-10 13:59:30 remacle Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -401,27 +401,6 @@ void RefineMesh ( GFace *gf, BDS_Mesh &m , const int NIT)
int MAXNP = m.MAXPOINTNUMBER;
- // computecharacteristic lengths using 1D mesh edge spacing
- // those lengths will propagate in the 2D mesh.
- if (0 && NIT > 0)
- {
- std::set<BDS_Point*,PointLessThan>::iterator itp = m.points.begin();
- while (itp != m.points.end())
- {
- std::list<BDS_Edge*>::iterator it = (*itp)->edges.begin();
- std::list<BDS_Edge*>::iterator ite = (*itp)->edges.end();
- double L = 1.e22;
- while(it!=ite){
- double l = (*it)->length();
- if (l<L && (*it)->g && (*it)->g->classif_degree == 1)L=l;
- ++it;
- }
- (*itp)->lc() = L;
- (*itp)->lcBGM() = L;
- ++itp;
- }
- }
-
double OLDminL=1.E22,OLDmaxL=0;
double t_spl=0, t_sw=0,t_col=0,t_sm=0;
diff --git a/Mesh/meshGFaceOptimize.cpp b/Mesh/meshGFaceOptimize.cpp
index 01ddec5bbf..677b46dc83 100644
--- a/Mesh/meshGFaceOptimize.cpp
+++ b/Mesh/meshGFaceOptimize.cpp
@@ -188,10 +188,8 @@ void edgeSwappingLawson (GFace *gf)
e2t_cont :: iterator it = adj.begin();
while (it != adj.end())
- {
-
+ {
bool evalSwapLawson = edgeSwapTestDelaunay(it,gf);
-
if ( evalSwapLawson )
{
edgeSwap (adj, it ,gf );
--
GitLab