From 88ff2f27c5714dd580b013c168e55ecc1b52a844 Mon Sep 17 00:00:00 2001
From: Emilie Marchandise <emilie.marchandise@uclouvain.be>
Date: Fri, 16 Dec 2011 11:20:08 +0000
Subject: [PATCH] meshmetric desctuctor
---
Geo/GModel.cpp | 5 ++++-
Mesh/meshMetric.cpp | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index 11f90e472c..1e9e2b3095 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -537,10 +537,12 @@ int GModel::adaptMesh(int technique, simpleFunction<double> *f, std::vector<doub
opt_mesh_algo2d(0, GMSH_SET, 7.0); //bamg
opt_mesh_algo3d(0, GMSH_SET, 7.0); //mmg3d
+ opt_mesh_lc_from_points(0, GMSH_SET, 0.0); //do not mesh lines with lc
GenerateMesh(this, getDim());
nbElems = getNumMeshElements();
- if (fields) fields->deleteField(1);
+ //if (fields) fields->deleteField(1);
+ fields->reset();
if (++ITER >= niter) break;
if (ITER > 5 && fabs((double)(nbElems - nbElemsOld)) < 0.005 * nbElemsOld) break;
@@ -555,6 +557,7 @@ int GModel::adaptMesh(int technique, simpleFunction<double> *f, std::vector<doub
nbElemsOld = nbElems;
}
+ fields->reset();
}
else{
diff --git a/Mesh/meshMetric.cpp b/Mesh/meshMetric.cpp
index bd70e2c80b..1a8f082580 100644
--- a/Mesh/meshMetric.cpp
+++ b/Mesh/meshMetric.cpp
@@ -62,7 +62,7 @@ meshMetric::meshMetric(GModel *gm, int technique, simpleFunction<double> *fct, s
}
meshMetric::~meshMetric(){
- if (_octree) delete _octree;
+ //if (_octree) delete _octree;
}
void meshMetric::computeValues( v2t_cont adj){
--
GitLab