*** empty log message ***

Mesh/BDS.cpp

-// $Id: BDS.cpp,v 1.93 2008-01-22 17:24:29 remacle Exp $
+// $Id: BDS.cpp,v 1.94 2008-01-24 09:35:41 remacle Exp $
 //
 // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 //
@@ -1342,7 +1342,7 @@ void optimize_vertex_position (GFace *GF, BDS_Point *data, double su, double sv)
 }
 
 
-bool BDS_Mesh::smooth_point_centroid(BDS_Point * p, GFace *gf)
+bool BDS_Mesh::smooth_point_centroid(BDS_Point * p, GFace *gf, bool test_quality)
 {
 
   if (!p->config_modified)return false;
@@ -1392,6 +1392,9 @@ bool BDS_Mesh::smooth_point_centroid(BDS_Point * p, GFace *gf)
 
   it = ts.begin();
   double s1=0,s2=0;
+
+  double newWorst = 1.0;
+  double oldWorst = 1.0;
   while(it != ite) {
     BDS_Face *t = *it;   
     BDS_Point *n[4];
@@ -1407,17 +1410,16 @@ bool BDS_Mesh::smooth_point_centroid(BDS_Point * p, GFace *gf)
     //    printf("%22.15E %22.15E\n",snew,sold);
     if ( snew < .1 * sold) return false;
 
-//     if (!test_move_point_parametric_triangle ( p, U, V, t)){
-//       return false;    
-//     }
-//     p->X = gp.x();
-//     p->Y = gp.y();
-//     p->Z = gp.z();
-//     newWorst = std::min(newWorst,qmTriangle(*it,QMTRI_RHO));
-//     p->X = oldX;
-//     p->Y = oldY;
-//     p->Z = oldZ;
-//     oldWorst = std::min(oldWorst,qmTriangle(*it,QMTRI_RHO));
+    if (test_quality){
+      p->X = gp.x();
+      p->Y = gp.y();
+      p->Z = gp.z();
+      newWorst = std::min(newWorst,qmTriangle(*it,QMTRI_RHO));
+      p->X = oldX;
+      p->Y = oldY;
+      p->Z = oldZ;
+      oldWorst = std::min(oldWorst,qmTriangle(*it,QMTRI_RHO));
+    }
     ++it;
   }
   
@@ -1425,11 +1427,9 @@ bool BDS_Mesh::smooth_point_centroid(BDS_Point * p, GFace *gf)
   if (fabs(s2-s1) > 1.e-14 * (s2+s1))return false;
   
 
-//   if (newWorst < 1.e-2)
-//     {
-//       printf("chmoochiong %g %g\n",oldWorst,newWorst);
-//       //      return false;
-//     }
+   if (test_quality && newWorst < oldWorst){
+     return false;
+   }
   
   p->u = U;
   p->v = V;

Mesh/BDS.h

@@ -463,7 +463,7 @@ public:
   void snap_point(BDS_Point* , BDS_Mesh *geom = 0);
   bool smooth_point(BDS_Point* , BDS_Mesh *geom = 0);
   bool smooth_point_parametric(BDS_Point * p, GFace *gf);
-  bool smooth_point_centroid(BDS_Point * p, GFace *gf);
+  bool smooth_point_centroid(BDS_Point * p, GFace *gf, bool test_quality = false);
   bool move_point(BDS_Point *p , double X, double Y, double Z);
   bool split_edge(BDS_Edge *, BDS_Point *);
   void saturate_edge(BDS_Edge *, std::vector<BDS_Point *>&);

Mesh/Makefile

-# $Id: Makefile,v 1.198 2008-01-23 07:45:28 geuzaine Exp $
+# $Id: Makefile,v 1.199 2008-01-24 09:35:41 remacle Exp $
 #
 # Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
 #
@@ -39,6 +39,7 @@ SRC = Generator.cpp \
         meshGFace.cpp \
         meshGFaceTransfinite.cpp \
         meshGFaceExtruded.cpp \
+        meshGFaceBDS.cpp \
         meshGFaceDelaunayInsertion.cpp \
         meshGFaceOptimize.cpp \
         meshGRegion.cpp \

Mesh/meshGFaceBDS.h

+#ifndef _MESH_GFACEBDS_H_
+#define _MESH_GFACEBDS_H_
+
+// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+// 
+// Please report all bugs and problems to <gmsh@geuz.org>.
+
+#include <map>
+class GFace;
+class BDS_Mesh;
+class BDS_Point;
+class MVertex;
+
+void computeMeshSizeFieldAccuracy (GFace *gf, BDS_Mesh &m, double &avg, double &max_e, double &min_e, int &nE, int &GS);
+void computeElementShapes (GFace *gf, BDS_Mesh &m, double &worst, double &avg, double &best, int &nT, int &nbGQ);
+void gmshRefineMeshBDS (GFace *gf, 
+			BDS_Mesh &m, 
+			const int NIT, 
+			const bool computeNodalSizeField);
+void gmshOptimizeMeshBDS(GFace *gf, 
+			 BDS_Mesh &m, 
+			 const int NIT, 
+			 std::map<BDS_Point*,MVertex*> *recover_map = 0);
+
+void gmshDelaunayizeBDS ( GFace *gf, BDS_Mesh &m, int &nb_swap );
+#endif