From e02f4cba17a6ea3a17d73550615946e9a34d55b8 Mon Sep 17 00:00:00 2001
From: Emilie Marchandise <emilie.marchandise@uclouvain.be>
Date: Thu, 15 Dec 2011 16:58:38 +0000
Subject: [PATCH] adaptMesh allDim, still 1D mesh to be fixed (JF?)
---
Geo/GModel.cpp | 6 +-----
Mesh/meshMetric.cpp | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index e5ae492a0c..11f90e472c 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -530,7 +530,6 @@ int GModel::adaptMesh(int technique, simpleFunction<double> *f, std::vector<doub
if (meshAll){
- meshMetric *bgm = 0;
FieldManager *fields = getFields();
fields->reset();
while(1){
@@ -545,10 +544,8 @@ int GModel::adaptMesh(int technique, simpleFunction<double> *f, std::vector<doub
if (++ITER >= niter) break;
if (ITER > 5 && fabs((double)(nbElems - nbElemsOld)) < 0.005 * nbElemsOld) break;
- //if(bgm) delete bgm ; //do not do this since we have already deleted the field
- bgm = new meshMetric(this, technique, f, parameters);
int id = fields->newId();
- (*fields)[id] = bgm;
+ (*fields)[id] = new meshMetric(this, technique, f, parameters);;
fields->background_field = id;
std::for_each(firstEdge(), lastEdge(), deMeshGEdge());
@@ -558,7 +555,6 @@ int GModel::adaptMesh(int technique, simpleFunction<double> *f, std::vector<doub
nbElemsOld = nbElems;
}
- //if (bgm) delete bgm;
}
else{
diff --git a/Mesh/meshMetric.cpp b/Mesh/meshMetric.cpp
index 16f11ec54b..bd70e2c80b 100644
--- a/Mesh/meshMetric.cpp
+++ b/Mesh/meshMetric.cpp
@@ -142,7 +142,7 @@ void meshMetric::computeMetric(){
v2t_cont adj;
buildVertexToElement (_elements,adj);
- printf("%d elements are considered in the meshMetric \n",_elements.size());
+ //printf("%d elements are considered in the meshMetric \n",_elements.size());
computeValues(adj);
computeHessian(adj);
--
GitLab