mirror of
https://github.com/NGSolve/netgen.git
synced 2025-01-12 22:20:35 +05:00
typ is hardcoded to 1, so init pf directly as local variable
This commit is contained in:
parent
765dc6d86a
commit
2cc3908847
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user