From 58e72fd56074c7104880d805d90ecb74015dbf8a Mon Sep 17 00:00:00 2001
From: Emilie Marchandise <emilie.marchandise@uclouvain.be>
Date: Thu, 15 Apr 2010 16:14:22 +0000
Subject: [PATCH]
---
Geo/GFaceCompound.cpp | 2 ++
Geo/GModel.cpp | 1 -
Mesh/Generator.cpp | 2 +-
Mesh/meshGFace.cpp | 4 ++--
Mesh/meshGFaceLloyd.cpp | 6 +++---
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index b4f3e01654..46bcf30383 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -344,6 +344,8 @@ void GFaceCompound::fillNeumannBCS() const
}
+
+
bool GFaceCompound::trivial() const
{
if(_compound.size() == 1 &&
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index a06251f2e7..8e6fb72a27 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -1139,7 +1139,6 @@ void GModel::createTopologyFromFaces(std::vector<discreteFace*> &discFaces)
std::map<MEdge, std::vector<int>, Less_Edge > map_edges;
for (std::vector<discreteFace*>::iterator it = discFaces.begin();
it != discFaces.end(); it++){
- printf("face %g recom =%d\n", (*it)->tag(),(*it)->meshAttributes.Recombine );
(*it)->findEdges(map_edges);
}
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 712018fa35..d80371fd38 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -424,7 +424,7 @@ static void Mesh2D(GModel *m)
for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it){
GFace *gf = *it;
int recombine = gf->meshAttributes.recombine;
- Msg::Info("LLoyd optimisation for face %d", gf->tag());
+ Msg::Info("Lloyd optimization for face %d", gf->tag());
gf->lloyd(40,recombine);
if(recombine) recombineIntoQuads(gf);
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 2bbc4c2c33..fa7a29eb5d 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -674,9 +674,8 @@ static bool meshGenerator(GFace *gf, int RECUR_ITER,
// delete the mesh
delete m;
- printf("to recombine gf->meshAttributes.recombine=%d \n", gf->meshAttributes.recombine);
+ //printf("to recombine gf->meshAttributes.recombine=%d \n", gf->meshAttributes.recombine);
if(gf->meshAttributes.recombine && CTX::instance()->mesh.optimize == 0){
- printf("in recombine \n");
recombineIntoQuads(gf);
}
@@ -1414,6 +1413,7 @@ void partitionAndRemesh(GFaceCompound *gf)
Msg::Info("Parametrize Compound Surface (%d) = %d discrete face", num_gfc, pf->tag() );
GFaceCompound *gfc = new GFaceCompound(gf->model(), num_gfc, f_compound,
b[0], b[1], b[2], b[3], 0, gf->getTypeOfMapping() );
+ gfc->meshAttributes.recombine = gf->meshAttributes.recombine;
gf->model()->add(gfc);
gfc->parametrize();
diff --git a/Mesh/meshGFaceLloyd.cpp b/Mesh/meshGFaceLloyd.cpp
index a22b7de4ea..d7e2546955 100644
--- a/Mesh/meshGFaceLloyd.cpp
+++ b/Mesh/meshGFaceLloyd.cpp
@@ -34,8 +34,8 @@ void lloydAlgorithm::operator () ( GFace * gf) {
const double LC2D = sqrt ((du.high()-du.low())*(du.high()-du.low()) +
(dv.high()-dv.low())*(dv.high()-dv.low()));
- printf("Lloyd on face %d %d elements %d nodes LC %g\n", gf->tag(),
- gf->getNumMeshElements(), (int)all.size(), LC2D);
+ //printf("Lloyd on face %d %d elements %d nodes LC %g\n", gf->tag(),
+ // gf->getNumMeshElements(), (int)all.size(), LC2D);
int i = 0;
@@ -104,7 +104,7 @@ void lloydAlgorithm::operator () ( GFace * gf) {
}
}
- Msg::Info("GFace %d Lloyd iteration %d energy %g",gf->tag(),ITER++,ENERGY);
+ Msg::Debug("GFace %d Lloyd iteration %d energy %g",gf->tag(),ITER++,ENERGY);
if (ITER > ITER_MAX)break;
// compute the Voronoi diagram
--
GitLab