From 2cc39088474f604125834cd94aaa25a5219f1dd0 Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Tue, 16 Jul 2019 12:14:19 +0200 Subject: [PATCH] typ is hardcoded to 1, so init pf directly as local variable --- libsrc/meshing/smoothing3.cpp | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/libsrc/meshing/smoothing3.cpp b/libsrc/meshing/smoothing3.cpp index fd814fec..0a117c11 100644 --- a/libsrc/meshing/smoothing3.cpp +++ b/libsrc/meshing/smoothing3.cpp @@ -1357,8 +1357,6 @@ void Mesh :: ImproveMesh (const MeshingParameters & mp, OPTIMIZEGOAL goal) { static Timer t("Mesh::ImproveMesh"); RegionTimer reg(t); - int typ = 1; - (*testout) << "Improve Mesh" << "\n"; PrintMessage (3, "ImproveMesh"); @@ -1407,16 +1405,9 @@ void Mesh :: ImproveMesh (const MeshingParameters & mp, OPTIMIZEGOAL goal) //int uselocalh = mparam.uselocalh; - PointFunction * pf; - - if (typ == 1) - pf = new PointFunction(points, volelements, mp); - else - pf = new CheapPointFunction(points, volelements, mp); - - // pf->SetLocalH (h); + PointFunction pf(points, volelements, mp); - Opti3FreeMinFunction freeminf(*pf); + Opti3FreeMinFunction freeminf(pf); OptiParameters par; par.maxit_linsearch = 20; @@ -1470,11 +1461,11 @@ void Mesh :: ImproveMesh (const MeshingParameters & mp, OPTIMIZEGOAL goal) if ( (pi+1-PointIndex::BASE) % printmod == 0) PrintDot (printdot); double lh = pointh[pi]; - pf->SetLocalH (lh); + pf.SetLocalH (lh); par.typx = lh; freeminf.SetPoint (points[pi]); - pf->SetPointIndex (pi); + pf.SetPointIndex (pi); x = 0; int pok; @@ -1482,10 +1473,10 @@ void Mesh :: ImproveMesh (const MeshingParameters & mp, OPTIMIZEGOAL goal) if (!pok) { - pok = pf->MovePointToInner (); + pok = pf.MovePointToInner (); freeminf.SetPoint (points[pi]); - pf->SetPointIndex (pi); + pf.SetPointIndex (pi); } if (pok) @@ -1500,8 +1491,6 @@ void Mesh :: ImproveMesh (const MeshingParameters & mp, OPTIMIZEGOAL goal) } PrintDot ('\n'); - delete pf; - multithread.task = savetask; if (goal == OPT_QUALITY)