diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp index 97c9a858acfa6c4d6f7b586858b570099e5388c7..46698fa382033aba04b70762682436a59baae997 100644 --- a/Geo/GFaceCompound.cpp +++ b/Geo/GFaceCompound.cpp @@ -2167,8 +2167,8 @@ Pair<SVector3,SVector3> GFaceCompound::firstDer(const SPoint2 ¶m) const MTriangle *tri=NULL; if (lt) tri = lt->tri; else { - printf("FIRSTDER POINT NOT FOUND --> kdtree \n"); - printf("uv=%g %g \n", param.x(), param.y()); + //printf("FIRSTDER POINT NOT FOUND --> kdtree \n"); + //printf("uv=%g %g \n", param.x(), param.y()); double pt[3] = {param.x(), param.y(), 0.0}; ANNidx index[2]; ANNdist dist[2]; diff --git a/Geo/gmshLevelset.cpp b/Geo/gmshLevelset.cpp index d729f107831b70328094ed151bc802b3973697fa..8e293f5b662a3ec2d57f1018807793e6fd7314e9 100644 --- a/Geo/gmshLevelset.cpp +++ b/Geo/gmshLevelset.cpp @@ -319,7 +319,7 @@ gLevelset::gLevelset(const gLevelset &lv) } gLevelsetSphere::gLevelsetSphere(const double &x, const double &y, const double &z, - const double &R, int tag=1) + const double &R, int tag) : gLevelsetPrimitive(tag), xc(x), yc(y), zc(z), r(R) { _hasDerivatives = true; diff --git a/Geo/gmshLevelset.h b/Geo/gmshLevelset.h index 51efa0814e21f2b6e704fccc0f87433b8def8e62..7aae70f3e29bb24fdc6bf485b7674dc163a8ae56 100644 --- a/Geo/gmshLevelset.h +++ b/Geo/gmshLevelset.h @@ -139,7 +139,7 @@ class gLevelsetSphere : public gLevelsetPrimitive protected: double xc, yc, zc, r; public: - gLevelsetSphere (const double &x, const double &y, const double &z, const double &R, int tag); + gLevelsetSphere (const double &x, const double &y, const double &z, const double &R, int tag=1); virtual double operator () (double x, double y, double z) const { if(r >= 0.) diff --git a/Mesh/CenterlineField.cpp b/Mesh/CenterlineField.cpp index c4a6e3a9eedfa3fbfc14c608b333693ca4b756a2..dc7c1c0551630c097b6024aa65657ab946a3bcf3 100644 --- a/Mesh/CenterlineField.cpp +++ b/Mesh/CenterlineField.cpp @@ -900,7 +900,7 @@ void Centerline::cutMesh() double AR = L/D; // printf("*** Centerline branch %d (AR=%.1f) \n", edges[i].tag, AR); - int nbSplit = (int)floor(AR/2 + 0.9); //AR/2 + 0.9 + int nbSplit = (int)ceil(AR/2 + 1.1); //AR/2 + 0.9 if( nbSplit > 1 ){ //printf("->> cut branch in %d parts \n", nbSplit); double li = L/nbSplit; diff --git a/benchmarks/centerlines/aneurysm_centerlines.geo b/benchmarks/centerlines/aneurysm_centerlines.geo index b7986715fb26c54ab9e66b7776bf9c305b5cf3ed..240329683ba6fe1e748eb4b007f615e496209dcb 100644 --- a/benchmarks/centerlines/aneurysm_centerlines.geo +++ b/benchmarks/centerlines/aneurysm_centerlines.geo @@ -1,16 +1,16 @@ -Mesh.Algorithm = 6; //(1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=bamg, 8=delquad -Mesh.Algorithm3D = 7; //(1=tetgen, 4=netgen, 7=mmg3D +Mesh.Algorithm = 1; //(1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=bamg, 8=delquad) +Mesh.Algorithm3D = 1; //(1=tetgen, 4=netgen, 7=mmg3D) Mesh.LcIntegrationPrecision = 1.e-2; -Mesh.RecombineAll = 1; +//Mesh.RecombineAll = 1; //Mesh.Bunin = 120; Merge "aneu_ext.stl"; Field[1] = Centerline; Field[1].FileName = "centerlinesANEU.vtk"; -Field[1].nbPoints = 25; +Field[1].nbPoints = 22; Field[1].nbElemLayer = 4; Field[1].hLayer = 0.2;//percent of vessel radius diff --git a/benchmarks/centerlines/aorta_centerlines.geo b/benchmarks/centerlines/aorta_centerlines.geo index 5e93be28df8c33f1f86db036ab6a7a4034d0f0e8..233f082a762c3c65d0dcea8a45e13894030dd5bc 100644 --- a/benchmarks/centerlines/aorta_centerlines.geo +++ b/benchmarks/centerlines/aorta_centerlines.geo @@ -1,4 +1,4 @@ -Mesh.Algorithm = 8; //(1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=bamg, 8=delquad) +Mesh.Algorithm = 8; //(1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=bamg, 8=delquad, 9=R-tree) Mesh.Algorithm3D = 1; //(1=tetgen, 4=netgen, 5=FrontalDel, 6=FrontalHex, 7=MMG3D, 9=R-tree //Mesh.SmoothCrossField = 20; diff --git a/benchmarks/centerlines/carotid_centerlines.geo b/benchmarks/centerlines/carotid_centerlines.geo index 8b4816e93ff003d2a73a991d97fb25f8bc277a82..4f8394648587134299214632edb03769704164f9 100644 --- a/benchmarks/centerlines/carotid_centerlines.geo +++ b/benchmarks/centerlines/carotid_centerlines.geo @@ -1,7 +1,7 @@ -Mesh.Algorithm = 9; //(1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=bamg, 8=delquad) +Mesh.Algorithm = 8; //(1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=bamg, 8=delquad, 9=R-tree) Mesh.Algorithm3D = 1;//(1=tetgen, 4=netgen, 5=FrontalDel, 6=FrontalHex, 7=MMG3D, 9=R-tree -//Mesh.SmoothCrossField = 20; +Mesh.SmoothCrossField = 20; //Mesh.Smoothing=0; Mesh.LcIntegrationPrecision = 1.e-5;