From a71b5965797c89e6bc9ee6f0119d94752df29c9c Mon Sep 17 00:00:00 2001
From: Emilie Marchandise <emilie.marchandise@uclouvain.be>
Date: Mon, 21 Jan 2013 13:56:18 +0000
Subject: [PATCH] hex stuff
---
Geo/GModelFactory.cpp | 1 +
Mesh/meshGEdge.cpp | 4 ++--
Mesh/meshGRegion.cpp | 4 ++++
Mesh/yamakawa.cpp | 2 +-
Plugin/MathEval.cpp | 2 +-
Post/PViewData.cpp | 2 +-
benchmarks/centerlines/aorta_centerlines.geo | 4 ++--
benchmarks/hex/cube.geo | 5 +++--
benchmarks/hex/quartCyl.geo | 18 +++++-------------
benchmarks/hex/twoHoles.geo | 6 ++----
10 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/Geo/GModelFactory.cpp b/Geo/GModelFactory.cpp
index d6403dcdc0..3a4a2a8b7c 100644
--- a/Geo/GModelFactory.cpp
+++ b/Geo/GModelFactory.cpp
@@ -198,6 +198,7 @@ GRegion* GeoFactory::addVolume (GModel *gm, std::vector<std::vector<GFace *> > f
Tree_Add(gm->getGEOInternals()->Volumes, &v);
v->Typ = MSH_VOLUME;
v->Num = numv;
+ v->Recombine3D = 0;
//gmsh volume
GRegion *gr = new gmshRegion(gm,v);
diff --git a/Mesh/meshGEdge.cpp b/Mesh/meshGEdge.cpp
index 14614042d8..329c80fa33 100644
--- a/Mesh/meshGEdge.cpp
+++ b/Mesh/meshGEdge.cpp
@@ -372,7 +372,7 @@ void meshGEdge::operator() (GEdge *ge)
N = ge->meshAttributes.nbPointsTransfinite;
}
else{
- if (CTX::instance()->mesh.algo2d == ALGO_2D_BAMG || CTX::instance()->mesh.algo2d == ALGO_2D_PACK_PRLGRMS || blf){
+ if (CTX::instance()->mesh.algo2d == ALGO_2D_BAMG || blf ){ // CTX::instance()->mesh.algo2d == ALGO_2D_PACK_PRLGRMS
a = Integration(ge, t_begin, t_end, F_Lc_aniso, Points,
CTX::instance()->mesh.lcIntegrationPrecision);
}
@@ -388,7 +388,7 @@ void meshGEdge::operator() (GEdge *ge)
pt.xp = der.norm();
}
a = smoothPrimitive(ge, sqrt(CTX::instance()->mesh.smoothRatio), Points);
- N = std::max(ge->minimumMeshSegments() + 1, (int)(a + 1.));
+ N = std::max(ge->minimumMeshSegments() + 1, (int)(a + 1.99));
}
// force odd number of points for if blossom is used for recombination
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index 8373261a73..81a89951eb 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -677,6 +677,10 @@ void MeshDelaunayVolume(std::vector<GRegion*> ®ions)
// sprintf(opts, "-q1.5pY%c", (Msg::GetVerbosity() < 3) ? 'Q':
// (Msg::GetVerbosity() > 6) ? 'V': '\0');
}
+ else if (CTX::instance()->mesh.algo3d == ALGO_3D_RTREE){
+ sprintf(opts, "-S0Ype%c", (Msg::GetVerbosity() < 3) ? 'Q':
+ (Msg::GetVerbosity() > 6) ? 'V': '\0');
+ }
else {
sprintf(opts, "Ype%c", (Msg::GetVerbosity() < 3) ? 'Q':
(Msg::GetVerbosity() > 6) ? 'V': '\0');
diff --git a/Mesh/yamakawa.cpp b/Mesh/yamakawa.cpp
index 092d815c91..5dc99e5736 100755
--- a/Mesh/yamakawa.cpp
+++ b/Mesh/yamakawa.cpp
@@ -792,7 +792,7 @@ void Recombinator::improved_merge(GRegion* gr){
continue;
}
- printf("%d - %d/%d - %f\n",count,i,(int)potential.size(),hex.get_quality());
+ //printf("%d - %d/%d - %f\n",count,i,(int)potential.size(),hex.get_quality());
quality = quality + hex.get_quality();
for(it=parts.begin();it!=parts.end();it++){
element = *it;
diff --git a/Plugin/MathEval.cpp b/Plugin/MathEval.cpp
index c667419b4a..7fbf6a0f43 100644
--- a/Plugin/MathEval.cpp
+++ b/Plugin/MathEval.cpp
@@ -66,7 +66,7 @@ std::string GMSH_MathEvalPlugin::getHelp() const
"the time steps in the view.\n\n"
"If `View' < 0, the plugin is run on the current view.\n\n"
"Plugin(MathEval) creates one new view."
- "If `PhysicalRegion' < 0, the plugin is run"
+ "If `PhysicalRegion' < 0, the plugin is run "
"on all physical regions.\n\n"
"Plugin(MathEval) creates one new view.";
}
diff --git a/Post/PViewData.cpp b/Post/PViewData.cpp
index ddadfae85e..6bcc7c11af 100644
--- a/Post/PViewData.cpp
+++ b/Post/PViewData.cpp
@@ -97,7 +97,7 @@ void PViewData::setValue(int step, int ent, int ele, int nod, int comp, double v
GModel *PViewData::getModel(int step)
{
- Msg::Error("Cannot get entity from this view");
+ Msg::Error("Cannot get model from this view");
return 0;
}
diff --git a/benchmarks/centerlines/aorta_centerlines.geo b/benchmarks/centerlines/aorta_centerlines.geo
index 99d8274a67..b57b1d4aad 100644
--- a/benchmarks/centerlines/aorta_centerlines.geo
+++ b/benchmarks/centerlines/aorta_centerlines.geo
@@ -1,5 +1,5 @@
-Mesh.Algorithm = 7; //(1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=bamg, 8=delquad)
-Mesh.Algorithm3D = 7; //(1=tetgen, 4=netgen, 5=FrontalDel, 6=FrontalHex, 7=MMG3D, 9=R-tree
+Mesh.Algorithm = 5; //(1=MeshAdapt, 2=Automatic, 5=Delaunay, 6=Frontal, 7=bamg, 8=delquad)
+Mesh.Algorithm3D = 1; //(1=tetgen, 4=netgen, 5=FrontalDel, 6=FrontalHex, 7=MMG3D, 9=R-tree
Mesh.LcIntegrationPrecision = 1.e-3;
diff --git a/benchmarks/hex/cube.geo b/benchmarks/hex/cube.geo
index 783217c2d1..b10cf147f1 100644
--- a/benchmarks/hex/cube.geo
+++ b/benchmarks/hex/cube.geo
@@ -1,8 +1,9 @@
-Mesh.Algorithm = 8; //8 = delquad or 9= 2D R-tree
+Mesh.Algorithm = 9; //8 = delquad or 9= 2D R-tree
Mesh.Algorithm3D = 9; // 3D R-tree
Mesh.Recombine3DAll = 1;
+Mesh.Smoothing = 0;
-c1 = 0.125;
+c1 = 0.25; //125;
c2 = 0.25;
Point(1) = {1, 1, -1, c1};
Point(2) = {-1, 1, -1, c1};
diff --git a/benchmarks/hex/quartCyl.geo b/benchmarks/hex/quartCyl.geo
index 51522e3de8..f721b36fd3 100644
--- a/benchmarks/hex/quartCyl.geo
+++ b/benchmarks/hex/quartCyl.geo
@@ -1,7 +1,8 @@
-Mesh.Algorithm = 8; //8 = delquad or 9= 2D R-tree
+Mesh.Algorithm = 9; //8 = delquad or 9= 2D R-tree
Mesh.Algorithm3D = 9; // 3D R-tree
Mesh.Recombine3DAll = 1;
-//Mesh.Lloyd = 10;
+Mesh.Lloyd = 10;
+Mesh.Smoothing = 0;
c1 = 0.1;
c2 = 0.05;
@@ -40,15 +41,6 @@ Ruled Surface(22) = {21};
Line Loop(23) = {8, -4, 11, 3};
Ruled Surface(24) = {23};
-Mesh.RemeshParametrization=1; //(0) harmonic (1) conformal
-Mesh.RemeshAlgorithm=0; //(0) nosplit (1) automatic (2) split metis
-Compound Surface(114)={14};
-Compound Surface(116)={16};
-Compound Surface(118)={18};
-Compound Surface(120)={20};
-Compound Surface(122)={22};
-Compound Surface(124)={24};
-
-Surface Loop(25) = {114, 116, 122, 120, 118, 124};
+Surface Loop(25) = {14, 16, 22, 20, 18, 24};
Volume(26) = {25};
-Physical Volume(126)={26};
\ No newline at end of file
+
diff --git a/benchmarks/hex/twoHoles.geo b/benchmarks/hex/twoHoles.geo
index c263af5ca0..f98e2ee424 100644
--- a/benchmarks/hex/twoHoles.geo
+++ b/benchmarks/hex/twoHoles.geo
@@ -1,8 +1,9 @@
// original model from Zaqueu Ernesto da Silva (zaqueu at les.ufpb.br)
// rewritten by CG
-Mesh.Algorithm = 8; //8 = delquad or 9= 2D R-tree
+Mesh.Algorithm = 9; //8 = delquad or 9= 2D R-tree
Mesh.Algorithm3D = 9; // 3D R-tree
Mesh.Recombine3DAll = 1;
+Mesh.Smoothing = 0;
lc = 1;
e = 6; // thickness
@@ -71,6 +72,3 @@ Plane Surface(115) = {113,114};
Surface Loop(116) = {47,-12,27,31,-115,64,39,112,85,90,95,100,51,-106,59,-109,-84,-72,-76,-80};
Volume(117) = {116};
-//DEBUT DES AJOUTS
-//Physical Volume(1117) = {117};
-//FIN DES AJOUTS
--
GitLab