diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 337d58dd83a511c8291ff772ac6ace420f65a97e..2173d69915a52b597dc075f4db0cc47eee4e9588 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.574 2008-03-24 20:51:04 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.575 2008-03-28 22:18:47 remacle Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -1158,7 +1158,7 @@ void mesh_options_ok_cb(CALLBACK_ARGS)
opt_mesh_point_type(0, GMSH_SET, WID->mesh_choice[0]->value());
opt_mesh_algo2d(0, GMSH_SET,
- (WID->mesh_choice[2]->value() == 0) ? ALGO_2D_MESHADAPT :
+ (WID->mesh_choice[2]->value() == 0) ? ALGO_2D_FRONTAL :
(WID->mesh_choice[2]->value() == 1) ? ALGO_2D_DELAUNAY :
ALGO_2D_MESHADAPT_DELAUNAY);
opt_mesh_algo3d(0, GMSH_SET,
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index eac905f68a6bbf08a539aa5df7442b74a7059cba..f7bc1499b3c0e097b2966483458ddd5310254700 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.668 2008-03-21 18:27:38 geuzaine Exp $
+// $Id: GUI.cpp,v 1.669 2008-03-28 22:18:48 remacle Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -2404,7 +2404,7 @@ void GUI::create_option_window()
o->hide();
static Fl_Menu_Item menu_2d_algo[] = {
- {"MeshAdapt", 0, 0, 0},
+ {"Frontal", 0, 0, 0},
{"Delaunay", 0, 0, 0},
{"MeshAdapt+Delaunay", 0, 0, 0},
{0}
diff --git a/Mesh/BackgroundMesh.cpp b/Mesh/BackgroundMesh.cpp
index e114a2be5388299ea6f5a8a727aa72d1b75ab719..a7b8c4f1999ce04e8c06ab0a790a709a13255460 100644
--- a/Mesh/BackgroundMesh.cpp
+++ b/Mesh/BackgroundMesh.cpp
@@ -1,4 +1,4 @@
-// $Id: BackgroundMesh.cpp,v 1.47 2008-03-25 20:25:35 remacle Exp $
+// $Id: BackgroundMesh.cpp,v 1.48 2008-03-28 22:18:48 remacle Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -191,8 +191,8 @@ double BGM_MeshSize(GEntity *ge, double U, double V, double X, double Y, double
bool Extend1dMeshIn2dSurfaces()
{
if(GModel::current()->getFields()->background_field!=-1)return false;
- if(!CTX.mesh.constrained_bgmesh) return true;
- return false;
+ if(CTX.mesh.constrained_bgmesh) return true;
+ return true;
}
bool Extend2dMeshIn3dVolumes()
diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp
index be204b094bc7750c3e82b3da5805f9215c28dcfd..a64ba7a6286c617174f32f2db29506ac884d6468 100644
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/Mesh/meshGFaceDelaunayInsertion.cpp
@@ -1,4 +1,4 @@
-// $Id: meshGFaceDelaunayInsertion.cpp,v 1.20 2008-03-27 08:42:20 remacle Exp $
+// $Id: meshGFaceDelaunayInsertion.cpp,v 1.21 2008-03-28 22:18:48 remacle Exp $
//
// Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
//
@@ -743,18 +743,16 @@ void gmshBowyerWatsonFrontal(GFace *gf){
2*dir[1]*dir[0]*metric[1]+
dir[1]*dir[1]*metric[2]);
- // printf("ratio = %12.5E %g %g %g\n",RATIO,metric[0],metric[1],metric[2]);
+ // printf("ratio = %12.5E dir %g %g m %g %g %g\n",RATIO,dir[0],dir[1],metric[0],metric[1],metric[2]);
- const double p = 0.5*length_metric (P,Q,metric) / RATIO;
+ const double p = 0.5*length_metric (P,Q,metric);// / RATIO;
// const double p = 0.5*sqrt(DSQR(P[0]-Q[0])+DSQR(P[1]-Q[1]));//length_metric (P,Q,metric);
// const double q = length_metric (center,midpoint,metric);
- const double rhoM = 0.5 * (vSizes[base->getVertex(ip1)->getNum()] + vSizes[base->getVertex(ip2)->getNum()] ) / sqrt(3) * RATIO;
-
- // printf("%g vs %g\n",2*p,rhoM);
+ const double rhoM = 0.5 * (vSizes[base->getVertex(ip1)->getNum()] + vSizes[base->getVertex(ip2)->getNum()] ) / sqrt(3);// * RATIO;
// const double rhoM_hat = std::max(rhoM,2*p);
const double rhoM_hat = std::min(std::max(rhoM,p),(p*p+q*q)/(2*q));
- const double d = rhoM_hat + sqrt (rhoM_hat*rhoM_hat - p*p);
+ const double d = (rhoM_hat + sqrt (rhoM_hat*rhoM_hat - p*p))/RATIO;
double newPoint[2] =
{
@@ -765,9 +763,9 @@ void gmshBowyerWatsonFrontal(GFace *gf){
// printf("%g %g -- %g %g -- %g %g\n",midpoint[0],midpoint[1],pa[0],pa[1],newPoint[0],newPoint[1]);
// ITER++;
-// char name[245];
-// sprintf(name,"pt%d.pos",ITER++);
-// _printTris (name, AllTris, Us,Vs,false);
+// char name[245];
+// sprintf(name,"pt%d.pos",ITER);
+// _printTris (name, AllTris, Us,Vs,false);
insertAPoint(gf,it,newPoint,metric,Us,Vs,vSizes,vSizesBGM,AllTris);
// if (ITER++ == 5)break;
diff --git a/benchmarks/2d/naca12_2d.geo b/benchmarks/2d/naca12_2d.geo
index 621cc2dd76ad5225ca78aaf9bfc96a594251ff9b..dbc2c9f090229fb5e47c19d5d11beb3fcccc1eaf 100644
--- a/benchmarks/2d/naca12_2d.geo
+++ b/benchmarks/2d/naca12_2d.geo
@@ -1,7 +1,7 @@
lc = 0.2;
-lc2 = 1.5;
-lc3 = 0.2;
-Point(1) = {1.000000e+00,0.000000e+00,0.000000e+00,lc};
+lc2 = 10;
+lc3 = 0.02;
+Point(1) = {1.000000e+00,0.000000e+00,0.000000e+00,lc3};
Point(2) = {9.997533e-01,0.000000e+00,-3.498543e-05,lc};
Point(3) = {9.990134e-01,0.000000e+00,-1.398841e-04,lc};
Point(4) = {9.977810e-01,0.000000e+00,-3.143904e-04,lc};
@@ -50,8 +50,8 @@ Point(46) = {5.782179e-01,0.000000e+00,-4.655984e-02,lc};
Point(47) = {5.626673e-01,0.000000e+00,-4.777199e-02,lc};
Point(48) = {5.470549e-01,0.000000e+00,-4.894463e-02,lc};
Point(49) = {5.313960e-01,0.000000e+00,-5.007425e-02,lc};
-Point(50) = {5.157061e-01,0.000000e+00,-5.115728e-02,lc3};
-Point(51) = {5.000008e-01,0.000000e+00,-5.219014e-02,lc3};
+Point(50) = {5.157061e-01,0.000000e+00,-5.115728e-02,lc};
+Point(51) = {5.000008e-01,0.000000e+00,-5.219014e-02,lc};
Point(52) = {4.842954e-01,0.000000e+00,-5.316926e-02,lc};
Point(53) = {4.686055e-01,0.000000e+00,-5.409108e-02,lc};
Point(54) = {4.529467e-01,0.000000e+00,-5.495201e-02,lc};
@@ -101,7 +101,7 @@ Point(97) = {3.942788e-03,0.000000e+00,-1.083471e-02,lc};
Point(98) = {2.219111e-03,0.000000e+00,-8.185687e-03,lc};
Point(99) = {9.866953e-04,0.000000e+00,-5.496060e-03,lc};
Point(100) = {2.467632e-04,0.000000e+00,-2.767267e-03,lc};
-Point(101) = {0.000000e+00,0.000000e+00,1.911503e-39,lc};
+Point(101) = {0.000000e+00,0.000000e+00,1.911503e-39,lc3};
Point(102) = {2.467632e-04,0.000000e+00,2.767267e-03,lc};
Point(103) = {9.866953e-04,0.000000e+00,5.496060e-03,lc};
Point(104) = {2.219111e-03,0.000000e+00,8.185687e-03,lc};
@@ -151,7 +151,7 @@ Point(147) = {4.373342e-01,0.000000e+00,5.574857e-02,lc};
Point(148) = {4.529467e-01,0.000000e+00,5.495201e-02,lc};
Point(149) = {4.686055e-01,0.000000e+00,5.409108e-02,lc};
Point(150) = {4.842954e-01,0.000000e+00,5.316926e-02,lc};
-Point(151) = {5.000008e-01,0.000000e+00,5.219014e-02,lc3};
+Point(151) = {5.000008e-01,0.000000e+00,5.219014e-02,lc};
Point(152) = {5.157061e-01,0.000000e+00,5.115728e-02,lc};
Point(153) = {5.313960e-01,0.000000e+00,5.007425e-02,lc};
Point(154) = {5.470549e-01,0.000000e+00,4.894463e-02,lc};
@@ -210,10 +210,11 @@ Spline(4) = { 151 ... 200, 1};
Rotate { {1,0,0},{0,0,0},Pi/2 } { Line{1,2,3,4}; }
Translate {-0.5,0,0} { Line{1,2,3,4}; }
-Point(1000) = {2,2,0,lc2};
-Point(1001) = {-2,2,0,lc2};
-Point(1002) = {-2,-2,0,lc2};
-Point(1003) = {2,-2,0,lc2};
+d=10;
+Point(1000) = {d,d,0,lc2};
+Point(1001) = {-d,d,0,lc2};
+Point(1002) = {-d,-d,0,lc2};
+Point(1003) = {d,-d,0,lc2};
Line(5) = {1000,1001};
Line(6) = {1001,1002};
Line(7) = {1002,1003};
@@ -225,3 +226,5 @@ Plane Surface(11) = {9,10};
Point(9999) = {0.6,0,0,1};
+//Recombine Surface {11};
+