From 92bfc810fa987227f976b846519efb02ec1a50b7 Mon Sep 17 00:00:00 2001
From: Jonathan Lambrechts <jonathan.lambrechts@uclouvain.be>
Date: Fri, 11 Apr 2014 13:56:40 +0000
Subject: [PATCH] meshGFace : remove 2 memory leaks (other still remain)
---
Mesh/meshGFace.cpp | 5 +++--
Mesh/meshGFaceDelaunayInsertion.cpp | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index 251b169b58..5da3b577d9 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -1389,8 +1389,9 @@ bool meshGenerator(GFace *gf, int RECUR_ITER,
Msg::Debug("Delaunizing the initial mesh");
delaunayizeBDS(gf, *m, nb_swap);
}
- gf->triangles.clear();
- gf->quadrangles.clear();
+ //gf->triangles.clear();
+ //gf->quadrangles.clear();
+ gf->deleteMesh();
Msg::Debug("Starting to add internal points");
// start mesh generation
diff --git a/Mesh/meshGFaceDelaunayInsertion.cpp b/Mesh/meshGFaceDelaunayInsertion.cpp
index 2b3088c177..63f25b52c5 100644
--- a/Mesh/meshGFaceDelaunayInsertion.cpp
+++ b/Mesh/meshGFaceDelaunayInsertion.cpp
@@ -792,7 +792,7 @@ bool insertVertexB (std::list<edgeXface> &shell,
// _printTris("new_cavity.pos", new_cavity.begin(), new_cavity.end(), Us, Vs, false);
// _printTris("newTris.pos", &newTris[0], newTris+shell.size(), Us, Vs, false);
// _printTris("allTris.pos", allTets.begin(),allTets.end(), Us, Vs, false);
- for (unsigned int i = 0; i < shell.size(); i++) delete newTris[i];
+ for (unsigned int i = 0; i < shell.size(); i++) {delete newTris[i]->tri(), delete newTris[i];}
delete [] newTris;
// throw;
// double t2 = Cpu();
--
GitLab