2009-01-13 04:40:13 +05:00
|
|
|
#include <mystdlib.h>
|
|
|
|
|
|
|
|
#include "meshing.hpp"
|
|
|
|
#include <opti.hpp>
|
|
|
|
|
|
|
|
|
|
|
|
namespace netgen
|
|
|
|
{
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
class Neighbour
|
|
|
|
{
|
|
|
|
int nr[3];
|
|
|
|
int orient[3];
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
public:
|
|
|
|
Neighbour () { ; }
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
void SetNr (int side, int anr) { nr[side] = anr; }
|
|
|
|
int GetNr (int side) { return nr[side]; }
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
void SetOrientation (int side, int aorient) { orient[side] = aorient; }
|
|
|
|
int GetOrientation (int side) { return orient[side]; }
|
|
|
|
};
|
|
|
|
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
|
|
|
|
class trionedge
|
|
|
|
{
|
|
|
|
public:
|
2019-08-18 16:10:58 +05:00
|
|
|
SurfaceElementIndex tnr;
|
2009-11-16 13:18:00 +05:00
|
|
|
int sidenr;
|
|
|
|
|
|
|
|
trionedge () { tnr = 0; sidenr = 0; }
|
2019-08-18 16:10:58 +05:00
|
|
|
trionedge (SurfaceElementIndex atnr, int asidenr)
|
2009-01-13 04:40:13 +05:00
|
|
|
{ tnr = atnr; sidenr = asidenr; }
|
2009-11-16 13:18:00 +05:00
|
|
|
};
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
void MeshOptimize2d :: EdgeSwapping (Mesh & mesh, int usemetric)
|
|
|
|
{
|
|
|
|
if (!faceindex)
|
|
|
|
{
|
|
|
|
if (usemetric)
|
|
|
|
PrintMessage (3, "Edgeswapping, metric");
|
|
|
|
else
|
|
|
|
PrintMessage (3, "Edgeswapping, topological");
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
for (faceindex = 1; faceindex <= mesh.GetNFD(); faceindex++)
|
|
|
|
{
|
|
|
|
EdgeSwapping (mesh, usemetric);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (multithread.terminate)
|
|
|
|
throw NgException ("Meshing stopped");
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
faceindex = 0;
|
|
|
|
mesh.CalcSurfacesOfNode();
|
|
|
|
return;
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
static int timer = NgProfiler::CreateTimer ("EdgeSwapping 2D");
|
|
|
|
NgProfiler::RegionTimer reg1 (timer);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
static int timerstart = NgProfiler::CreateTimer ("EdgeSwapping 2D start");
|
|
|
|
NgProfiler::StartTimer (timerstart);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2019-08-08 11:44:59 +05:00
|
|
|
Array<SurfaceElementIndex> seia;
|
2009-11-16 13:18:00 +05:00
|
|
|
mesh.GetSurfaceElementsOfFace (faceindex, seia);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-08 11:44:59 +05:00
|
|
|
/*
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int i = 0; i < seia.Size(); i++)
|
|
|
|
if (mesh[seia[i]].GetNP() != 3)
|
|
|
|
{
|
|
|
|
GenericImprove (mesh);
|
|
|
|
return;
|
|
|
|
}
|
2019-08-08 11:44:59 +05:00
|
|
|
*/
|
|
|
|
for (SurfaceElementIndex sei : seia)
|
|
|
|
if (mesh[sei].GetNP() != 3)
|
|
|
|
{
|
|
|
|
GenericImprove (mesh);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
int surfnr = mesh.GetFaceDescriptor (faceindex).SurfNr();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-18 15:20:43 +05:00
|
|
|
Array<Neighbour> neighbors(mesh.GetNSE());
|
2019-08-18 16:10:58 +05:00
|
|
|
INDEX_2_HASHTABLE<trionedge> other(2*seia.Size() + 2);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2019-08-18 15:20:43 +05:00
|
|
|
Array<bool> swapped(mesh.GetNSE());
|
2019-07-09 13:39:16 +05:00
|
|
|
NgArray<int,PointIndex::BASE> pdef(mesh.GetNP());
|
|
|
|
NgArray<double,PointIndex::BASE> pangle(mesh.GetNP());
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
// int e;
|
|
|
|
// double d;
|
|
|
|
// Vec3d nv1, nv2;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
// double loch(-1);
|
|
|
|
static const double minangle[] = { 0, 1.481, 2.565, 3.627, 4.683, 5.736, 7, 9 };
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int i = 0; i < seia.Size(); i++)
|
|
|
|
{
|
|
|
|
const Element2d & sel = mesh[seia[i]];
|
|
|
|
for (int j = 0; j < 3; j++)
|
|
|
|
pangle[sel[j]] = 0.0;
|
|
|
|
}
|
|
|
|
// pangle = 0;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int i = 0; i < seia.Size(); i++)
|
|
|
|
{
|
|
|
|
const Element2d & sel = mesh[seia[i]];
|
|
|
|
for (int j = 0; j < 3; j++)
|
|
|
|
{
|
|
|
|
POINTTYPE typ = mesh[sel[j]].Type();
|
|
|
|
if (typ == FIXEDPOINT || typ == EDGEPOINT)
|
|
|
|
{
|
|
|
|
pangle[sel[j]] +=
|
|
|
|
Angle (mesh[sel[(j+1)%3]] - mesh[sel[j]],
|
|
|
|
mesh[sel[(j+2)%3]] - mesh[sel[j]]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
// for (PointIndex pi = PointIndex::BASE;
|
|
|
|
// pi < mesh.GetNP()+PointIndex::BASE; pi++)
|
|
|
|
|
|
|
|
// pdef = 0;
|
|
|
|
for (int i = 0; i < seia.Size(); i++)
|
|
|
|
{
|
|
|
|
const Element2d & sel = mesh[seia[i]];
|
|
|
|
for (int j = 0; j < 3; j++)
|
|
|
|
{
|
|
|
|
PointIndex pi = sel[j];
|
|
|
|
if (mesh[pi].Type() == INNERPOINT || mesh[pi].Type() == SURFACEPOINT)
|
|
|
|
pdef[pi] = -6;
|
|
|
|
else
|
|
|
|
for (int j = 0; j < 8; j++)
|
|
|
|
if (pangle[pi] >= minangle[j])
|
|
|
|
pdef[pi] = -1-j;
|
|
|
|
}
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-18 15:20:43 +05:00
|
|
|
/*
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int i = 0; i < seia.Size(); i++)
|
|
|
|
{
|
|
|
|
const Element2d & sel = mesh[seia[i]];
|
|
|
|
for (int j = 0; j < 3; j++)
|
|
|
|
pdef[sel[j]]++;
|
|
|
|
}
|
2019-08-18 15:20:43 +05:00
|
|
|
*/
|
|
|
|
for (SurfaceElementIndex sei : seia)
|
|
|
|
for (PointIndex pi : mesh[sei].PNums<3>())
|
|
|
|
pdef[pi]++;
|
|
|
|
|
|
|
|
// for (int i = 0; i < seia.Size(); i++)
|
|
|
|
for (SurfaceElementIndex sei : seia)
|
|
|
|
for (int j = 0; j < 3; j++)
|
|
|
|
{
|
|
|
|
neighbors[sei].SetNr (j, -1);
|
|
|
|
neighbors[sei].SetOrientation (j, 0);
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
/*
|
2019-07-09 13:39:16 +05:00
|
|
|
NgArray<Vec3d> normals(mesh.GetNP());
|
2009-11-16 13:18:00 +05:00
|
|
|
for (i = 1; i <= mesh.GetNSE(); i++)
|
|
|
|
{
|
2009-01-13 04:40:13 +05:00
|
|
|
Element2d & hel = mesh.SurfaceElement(i);
|
|
|
|
if (hel.GetIndex() == faceindex)
|
2009-11-16 13:18:00 +05:00
|
|
|
for (k = 1; k <= 3; k++)
|
|
|
|
{
|
|
|
|
int pi = hel.PNum(k);
|
|
|
|
SelectSurfaceOfPoint (mesh.Point(pi), hel.GeomInfoPi(k));
|
|
|
|
int surfi = mesh.GetFaceDescriptor(faceindex).SurfNr();
|
|
|
|
GetNormalVector (surfi, mesh.Point(pi), normals.Elem(pi));
|
|
|
|
normals.Elem(pi) /= normals.Elem(pi).Length();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*/
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-18 16:10:58 +05:00
|
|
|
/*
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int i = 0; i < seia.Size(); i++)
|
|
|
|
{
|
|
|
|
const Element2d & sel = mesh[seia[i]];
|
2019-08-18 16:10:58 +05:00
|
|
|
*/
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-18 16:10:58 +05:00
|
|
|
for (SurfaceElementIndex sei : seia)
|
|
|
|
{
|
|
|
|
const Element2d & sel = mesh[sei];
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int j = 0; j < 3; j++)
|
|
|
|
{
|
|
|
|
PointIndex pi1 = sel.PNumMod(j+2);
|
|
|
|
PointIndex pi2 = sel.PNumMod(j+3);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
// double loch = mesh.GetH(mesh[pi1]);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-18 16:10:58 +05:00
|
|
|
// INDEX_2 edge(pi1, pi2);
|
|
|
|
// edge.Sort();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (mesh.IsSegment (pi1, pi2))
|
|
|
|
continue;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
/*
|
|
|
|
if (segments.Used (edge))
|
|
|
|
continue;
|
|
|
|
*/
|
|
|
|
INDEX_2 ii2 (pi1, pi2);
|
|
|
|
if (other.Used (ii2))
|
|
|
|
{
|
|
|
|
// INDEX_2 i2s(ii2);
|
|
|
|
// i2s.Sort();
|
2019-08-18 16:10:58 +05:00
|
|
|
|
|
|
|
/*
|
2009-11-16 13:18:00 +05:00
|
|
|
int i2 = other.Get(ii2).tnr;
|
|
|
|
int j2 = other.Get(ii2).sidenr;
|
2019-08-18 16:10:58 +05:00
|
|
|
*/
|
|
|
|
auto othertrig = other.Get(ii2);
|
|
|
|
SurfaceElementIndex i2 = othertrig.tnr;
|
|
|
|
int j2 = othertrig.sidenr;
|
|
|
|
|
|
|
|
neighbors[sei].SetNr (j, i2);
|
|
|
|
neighbors[sei].SetOrientation (j, j2);
|
|
|
|
neighbors[i2].SetNr (j2, sei);
|
2009-11-16 13:18:00 +05:00
|
|
|
neighbors[i2].SetOrientation (j2, j);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-08-18 16:10:58 +05:00
|
|
|
other.Set (INDEX_2 (pi2, pi1), trionedge (sei, j));
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-18 15:20:43 +05:00
|
|
|
for (SurfaceElementIndex sei : seia)
|
|
|
|
swapped[sei] = false;
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
NgProfiler::StopTimer (timerstart);
|
|
|
|
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
int t = 4;
|
2019-08-08 10:36:26 +05:00
|
|
|
bool done = false;
|
2009-11-16 13:18:00 +05:00
|
|
|
while (!done && t >= 2)
|
|
|
|
{
|
|
|
|
for (int i = 0; i < seia.Size(); i++)
|
|
|
|
{
|
|
|
|
SurfaceElementIndex t1 = seia[i];
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (mesh[t1].IsDeleted())
|
|
|
|
continue;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (mesh[t1].GetIndex() != faceindex)
|
|
|
|
continue;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (multithread.terminate)
|
|
|
|
throw NgException ("Meshing stopped");
|
|
|
|
|
|
|
|
for (int o1 = 0; o1 < 3; o1++)
|
|
|
|
{
|
|
|
|
bool should;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
SurfaceElementIndex t2 = neighbors[t1].GetNr (o1);
|
|
|
|
int o2 = neighbors[t1].GetOrientation (o1);
|
|
|
|
|
|
|
|
if (t2 == -1) continue;
|
|
|
|
if (swapped[t1] || swapped[t2]) continue;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
PointIndex pi1 = mesh[t1].PNumMod(o1+1+1);
|
|
|
|
PointIndex pi2 = mesh[t1].PNumMod(o1+1+2);
|
|
|
|
PointIndex pi3 = mesh[t1].PNumMod(o1+1);
|
|
|
|
PointIndex pi4 = mesh[t2].PNumMod(o2+1);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
PointGeomInfo gi1 = mesh[t1].GeomInfoPiMod(o1+1+1);
|
|
|
|
PointGeomInfo gi2 = mesh[t1].GeomInfoPiMod(o1+1+2);
|
|
|
|
PointGeomInfo gi3 = mesh[t1].GeomInfoPiMod(o1+1);
|
|
|
|
PointGeomInfo gi4 = mesh[t2].GeomInfoPiMod(o2+1);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
bool allowswap = true;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
Vec<3> auxvec1 = mesh[pi3]-mesh[pi4];
|
|
|
|
Vec<3> auxvec2 = mesh[pi1]-mesh[pi4];
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
allowswap = allowswap && fabs(1.-(auxvec1*auxvec2)/(auxvec1.Length()*auxvec2.Length())) > 1e-4;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if(!allowswap)
|
|
|
|
continue;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
// normal of new
|
|
|
|
Vec<3> nv1 = Cross (auxvec1, auxvec2);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
auxvec1 = mesh.Point(pi4)-mesh.Point(pi3);
|
|
|
|
auxvec2 = mesh.Point(pi2)-mesh.Point(pi3);
|
|
|
|
allowswap = allowswap && fabs(1.-(auxvec1*auxvec2)/(auxvec1.Length()*auxvec2.Length())) > 1e-4;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if(!allowswap)
|
|
|
|
continue;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
Vec<3> nv2 = Cross (auxvec1, auxvec2);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
// normals of original
|
|
|
|
Vec<3> nv3 = Cross (mesh[pi1]-mesh[pi4], mesh[pi2]-mesh[pi4]);
|
|
|
|
Vec<3> nv4 = Cross (mesh[pi2]-mesh[pi3], mesh[pi1]-mesh[pi3]);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
nv3 *= -1;
|
|
|
|
nv4 *= -1;
|
|
|
|
nv3.Normalize();
|
|
|
|
nv4.Normalize();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
nv1.Normalize();
|
|
|
|
nv2.Normalize();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
Vec<3> nvp3, nvp4;
|
|
|
|
SelectSurfaceOfPoint (mesh.Point(pi3), gi3);
|
|
|
|
GetNormalVector (surfnr, mesh.Point(pi3), gi3, nvp3);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
nvp3.Normalize();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
SelectSurfaceOfPoint (mesh.Point(pi4), gi4);
|
|
|
|
GetNormalVector (surfnr, mesh.Point(pi4), gi4, nvp4);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
nvp4.Normalize();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
double critval = cos (M_PI / 6); // 30 degree
|
|
|
|
allowswap = allowswap &&
|
|
|
|
(nv1 * nvp3 > critval) &&
|
|
|
|
(nv1 * nvp4 > critval) &&
|
|
|
|
(nv2 * nvp3 > critval) &&
|
|
|
|
(nv2 * nvp4 > critval) &&
|
|
|
|
(nvp3 * nv3 > critval) &&
|
|
|
|
(nvp4 * nv4 > critval);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2019-08-10 03:21:37 +05:00
|
|
|
double horder = Dist (mesh[pi1], mesh[pi2]);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if ( // nv1 * nv2 >= 0 &&
|
|
|
|
nv1.Length() > 1e-3 * horder * horder &&
|
|
|
|
nv2.Length() > 1e-3 * horder * horder &&
|
|
|
|
allowswap )
|
|
|
|
{
|
|
|
|
if (!usemetric)
|
|
|
|
{
|
|
|
|
int e = pdef[pi1] + pdef[pi2] - pdef[pi3] - pdef[pi4];
|
|
|
|
double d =
|
2019-08-10 03:21:37 +05:00
|
|
|
Dist2 (mesh[pi1], mesh[pi2]) -
|
|
|
|
Dist2 (mesh[pi3], mesh[pi4]);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
should = e >= t && (e > 2 || d > 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
double loch = mesh.GetH(mesh[pi1]);
|
|
|
|
should =
|
2019-08-08 10:36:26 +05:00
|
|
|
CalcTriangleBadness (mesh[pi4], mesh[pi3], mesh[pi1], metricweight, loch) +
|
|
|
|
CalcTriangleBadness (mesh[pi3], mesh[pi4], mesh[pi2], metricweight, loch) <
|
|
|
|
CalcTriangleBadness (mesh[pi1], mesh[pi2], mesh[pi3], metricweight, loch) +
|
|
|
|
CalcTriangleBadness (mesh[pi2], mesh[pi1], mesh[pi4], metricweight, loch);
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (allowswap)
|
|
|
|
{
|
|
|
|
Element2d sw1 (pi4, pi3, pi1);
|
|
|
|
Element2d sw2 (pi3, pi4, pi2);
|
|
|
|
|
|
|
|
int legal1 =
|
2019-08-08 11:44:59 +05:00
|
|
|
mesh.LegalTrig (mesh[t1]) +
|
|
|
|
mesh.LegalTrig (mesh[t2]);
|
2009-11-16 13:18:00 +05:00
|
|
|
int legal2 =
|
|
|
|
mesh.LegalTrig (sw1) + mesh.LegalTrig (sw2);
|
|
|
|
|
2019-08-08 10:36:26 +05:00
|
|
|
if (legal1 < legal2) should = true;
|
|
|
|
if (legal2 < legal1) should = false;
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (should)
|
|
|
|
{
|
|
|
|
// do swapping !
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-08 10:36:26 +05:00
|
|
|
done = true;
|
|
|
|
|
|
|
|
/*
|
|
|
|
mesh[t1] = { pi1, pi4, pi3 };
|
|
|
|
mesh[t2] = { pi2, pi3, pi4 };
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
mesh[t1].GeomInfoPi(1) = gi1;
|
|
|
|
mesh[t1].GeomInfoPi(2) = gi4;
|
|
|
|
mesh[t1].GeomInfoPi(3) = gi3;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
mesh[t2].GeomInfoPi(1) = gi2;
|
|
|
|
mesh[t2].GeomInfoPi(2) = gi3;
|
|
|
|
mesh[t2].GeomInfoPi(3) = gi4;
|
2019-08-08 10:36:26 +05:00
|
|
|
*/
|
|
|
|
mesh[t1] = { { pi1, gi1 }, { pi4, gi4 }, { pi3, gi3 } };
|
|
|
|
mesh[t2] = { { pi2, gi2 }, { pi3, gi3 }, { pi4, gi4 } };
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
pdef[pi1]--;
|
|
|
|
pdef[pi2]--;
|
|
|
|
pdef[pi3]++;
|
|
|
|
pdef[pi4]++;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-08 10:36:26 +05:00
|
|
|
swapped[t1] = true;
|
|
|
|
swapped[t2] = true;
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
t--;
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
mesh.SetNextTimeStamp();
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
void MeshOptimize2d :: CombineImprove (Mesh & mesh)
|
|
|
|
{
|
|
|
|
if (!faceindex)
|
|
|
|
{
|
|
|
|
PrintMessage (3, "Combine improve");
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
for (faceindex = 1; faceindex <= mesh.GetNFD(); faceindex++)
|
|
|
|
{
|
|
|
|
CombineImprove (mesh);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (multithread.terminate)
|
|
|
|
throw NgException ("Meshing stopped");
|
|
|
|
}
|
|
|
|
faceindex = 0;
|
|
|
|
return;
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
static int timer = NgProfiler::CreateTimer ("Combineimprove 2D");
|
|
|
|
NgProfiler::RegionTimer reg (timer);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
static int timerstart = NgProfiler::CreateTimer ("Combineimprove 2D start");
|
|
|
|
NgProfiler::StartTimer (timerstart);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
static int timerstart1 = NgProfiler::CreateTimer ("Combineimprove 2D start1");
|
|
|
|
NgProfiler::StartTimer (timerstart1);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-08 11:44:59 +05:00
|
|
|
|
|
|
|
Array<SurfaceElementIndex> seia;
|
2009-11-16 13:18:00 +05:00
|
|
|
mesh.GetSurfaceElementsOfFace (faceindex, seia);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2019-08-08 11:44:59 +05:00
|
|
|
for (SurfaceElementIndex sei : seia)
|
|
|
|
if (mesh[sei].GetNP() != 3)
|
2009-11-16 13:18:00 +05:00
|
|
|
return;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
int surfnr = 0;
|
|
|
|
if (faceindex)
|
|
|
|
surfnr = mesh.GetFaceDescriptor (faceindex).SurfNr();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
Vec<3> nv;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
int np = mesh.GetNP();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
TABLE<SurfaceElementIndex,PointIndex::BASE> elementsonnode(np);
|
2019-08-18 15:20:43 +05:00
|
|
|
Array<SurfaceElementIndex> hasonepi, hasbothpi;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-10 03:21:37 +05:00
|
|
|
for (SurfaceElementIndex sei : seia)
|
2019-08-18 15:20:43 +05:00
|
|
|
for (PointIndex pi : mesh[sei].PNums<3>())
|
|
|
|
elementsonnode.Add (pi, sei);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-10 03:21:37 +05:00
|
|
|
Array<bool,PointIndex> fixed(np);
|
2009-11-16 13:18:00 +05:00
|
|
|
fixed = false;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
NgProfiler::StopTimer (timerstart1);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
/*
|
|
|
|
for (SegmentIndex si = 0; si < mesh.GetNSeg(); si++)
|
|
|
|
{
|
|
|
|
INDEX_2 i2(mesh[si][0], mesh[si][1]);
|
|
|
|
fixed[i2.I1()] = true;
|
|
|
|
fixed[i2.I2()] = true;
|
|
|
|
}
|
|
|
|
*/
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-10 03:21:37 +05:00
|
|
|
for (SurfaceElementIndex sei : seia)
|
2009-11-16 13:18:00 +05:00
|
|
|
{
|
2019-08-10 03:21:37 +05:00
|
|
|
Element2d & sel = mesh[sei];
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int j = 0; j < sel.GetNP(); j++)
|
|
|
|
{
|
|
|
|
PointIndex pi1 = sel.PNumMod(j+2);
|
|
|
|
PointIndex pi2 = sel.PNumMod(j+3);
|
|
|
|
if (mesh.IsSegment (pi1, pi2))
|
|
|
|
{
|
|
|
|
fixed[pi1] = true;
|
|
|
|
fixed[pi2] = true;
|
2009-01-13 04:40:13 +05:00
|
|
|
}
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2019-08-10 03:21:37 +05:00
|
|
|
/*
|
2009-11-16 13:18:00 +05:00
|
|
|
for(int i = 0; i < mesh.LockedPoints().Size(); i++)
|
|
|
|
fixed[mesh.LockedPoints()[i]] = true;
|
2019-08-10 03:21:37 +05:00
|
|
|
*/
|
|
|
|
for (PointIndex pi : mesh.LockedPoints())
|
|
|
|
fixed[pi] = true;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2019-08-18 15:20:43 +05:00
|
|
|
Array<Vec<3>,PointIndex> normals(np);
|
2009-11-16 13:18:00 +05:00
|
|
|
|
2019-08-07 10:47:08 +05:00
|
|
|
// for (PointIndex pi = mesh.Points().Begin(); pi < mesh.Points().End(); pi++)
|
|
|
|
for (PointIndex pi : mesh.Points().Range())
|
2009-11-16 13:18:00 +05:00
|
|
|
{
|
|
|
|
if (elementsonnode[pi].Size())
|
|
|
|
{
|
|
|
|
Element2d & hel = mesh[elementsonnode[pi][0]];
|
|
|
|
for (int k = 0; k < 3; k++)
|
|
|
|
if (hel[k] == pi)
|
|
|
|
{
|
|
|
|
SelectSurfaceOfPoint (mesh[pi], hel.GeomInfoPi(k+1));
|
|
|
|
GetNormalVector (surfnr, mesh[pi], hel.GeomInfoPi(k+1), normals[pi]);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
NgProfiler::StopTimer (timerstart);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int i = 0; i < seia.Size(); i++)
|
|
|
|
{
|
|
|
|
SurfaceElementIndex sei = seia[i];
|
|
|
|
Element2d & elem = mesh[sei];
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int j = 0; j < 3; j++)
|
|
|
|
{
|
2019-08-19 19:58:53 +05:00
|
|
|
if (elem.IsDeleted()) continue;
|
2009-11-16 13:18:00 +05:00
|
|
|
PointIndex pi1 = elem[j];
|
|
|
|
PointIndex pi2 = elem[(j+1) % 3];
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-08 02:32:14 +05:00
|
|
|
/*
|
2009-11-16 13:18:00 +05:00
|
|
|
if (pi1 < PointIndex::BASE ||
|
|
|
|
pi2 < PointIndex::BASE)
|
|
|
|
continue;
|
2019-08-08 02:32:14 +05:00
|
|
|
*/
|
|
|
|
if (!pi1.IsValid() || !pi2.IsValid())
|
|
|
|
continue;
|
2009-11-16 13:18:00 +05:00
|
|
|
/*
|
|
|
|
INDEX_2 i2(pi1, pi2);
|
|
|
|
i2.Sort();
|
|
|
|
if (segmentht.Used(i2))
|
|
|
|
continue;
|
|
|
|
*/
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
bool debugflag = 0;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (debugflag)
|
|
|
|
{
|
|
|
|
(*testout) << "Combineimprove, face = " << faceindex
|
|
|
|
<< "pi1 = " << pi1 << " pi2 = " << pi2 << endl;
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
/*
|
|
|
|
// save version:
|
|
|
|
if (fixed.Get(pi1) || fixed.Get(pi2))
|
2009-01-13 04:40:13 +05:00
|
|
|
continue;
|
2009-11-16 13:18:00 +05:00
|
|
|
if (pi2 < pi1) swap (pi1, pi2);
|
|
|
|
*/
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
// more general
|
|
|
|
if (fixed[pi2])
|
|
|
|
Swap (pi1, pi2);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (fixed[pi2])
|
|
|
|
continue;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
double loch = mesh.GetH (mesh[pi1]);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-08 02:32:14 +05:00
|
|
|
// INDEX_2 si2 (pi1, pi2);
|
|
|
|
// si2.Sort();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
/*
|
|
|
|
if (edgetested.Used (si2))
|
|
|
|
continue;
|
|
|
|
edgetested.Set (si2, 1);
|
|
|
|
*/
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
hasonepi.SetSize(0);
|
|
|
|
hasbothpi.SetSize(0);
|
|
|
|
|
2019-08-18 15:20:43 +05:00
|
|
|
// for (int k = 0; k < elementsonnode[pi1].Size(); k++)
|
|
|
|
for (SurfaceElementIndex sei2 : elementsonnode[pi1])
|
2009-01-13 04:40:13 +05:00
|
|
|
{
|
2019-08-18 15:20:43 +05:00
|
|
|
const Element2d & el2 = mesh[sei2];
|
2009-11-16 13:18:00 +05:00
|
|
|
|
|
|
|
if (el2.IsDeleted()) continue;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (el2[0] == pi2 || el2[1] == pi2 || el2[2] == pi2)
|
|
|
|
{
|
2019-08-18 15:20:43 +05:00
|
|
|
hasbothpi.Append (sei2);
|
2009-11-16 13:18:00 +05:00
|
|
|
nv = Cross (Vec3d (mesh[el2[0]], mesh[el2[1]]),
|
|
|
|
Vec3d (mesh[el2[0]], mesh[el2[2]]));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-08-18 15:20:43 +05:00
|
|
|
hasonepi.Append (sei2);
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
Element2d & hel = mesh[hasbothpi[0]];
|
|
|
|
for (int k = 0; k < 3; k++)
|
|
|
|
if (hel[k] == pi1)
|
|
|
|
{
|
|
|
|
SelectSurfaceOfPoint (mesh[pi1],
|
|
|
|
hel.GeomInfoPi(k+1));
|
|
|
|
GetNormalVector (surfnr, mesh[pi1], hel.GeomInfoPi(k+1), nv);
|
|
|
|
break;
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
// nv = normals.Get(pi1);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2019-08-18 15:20:43 +05:00
|
|
|
for (SurfaceElementIndex sei2 : elementsonnode[pi2])
|
2009-11-16 13:18:00 +05:00
|
|
|
{
|
2019-08-18 15:20:43 +05:00
|
|
|
const Element2d & el2 = mesh[sei2];
|
2009-11-16 13:18:00 +05:00
|
|
|
if (el2.IsDeleted()) continue;
|
2019-08-18 15:20:43 +05:00
|
|
|
if (!el2.PNums<3>().Contains (pi1))
|
|
|
|
hasonepi.Append (sei2);
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
|
|
|
|
2019-08-08 11:44:59 +05:00
|
|
|
double bad1 = 0;
|
2009-11-16 13:18:00 +05:00
|
|
|
int illegal1 = 0, illegal2 = 0;
|
2019-08-18 15:20:43 +05:00
|
|
|
/*
|
|
|
|
for (SurfaceElementIndex sei : hasonepi)
|
|
|
|
{
|
|
|
|
const Element2d & el = mesh[sei];
|
2009-11-16 13:18:00 +05:00
|
|
|
bad1 += CalcTriangleBadness (mesh[el[0]], mesh[el[1]], mesh[el[2]],
|
|
|
|
nv, -1, loch);
|
|
|
|
illegal1 += 1-mesh.LegalTrig(el);
|
|
|
|
}
|
2019-08-18 15:20:43 +05:00
|
|
|
*/
|
|
|
|
for (const Element2d & el : mesh.SurfaceElements()[hasonepi])
|
|
|
|
{
|
|
|
|
bad1 += CalcTriangleBadness (mesh[el[0]], mesh[el[1]], mesh[el[2]],
|
|
|
|
nv, -1, loch);
|
|
|
|
illegal1 += 1-mesh.LegalTrig(el);
|
|
|
|
}
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int k = 0; k < hasbothpi.Size(); k++)
|
|
|
|
{
|
|
|
|
const Element2d & el = mesh[hasbothpi[k]];
|
|
|
|
bad1 += CalcTriangleBadness (mesh[el[0]], mesh[el[1]], mesh[el[2]],
|
|
|
|
nv, -1, loch);
|
|
|
|
illegal1 += 1-mesh.LegalTrig(el);
|
|
|
|
}
|
|
|
|
bad1 /= (hasonepi.Size()+hasbothpi.Size());
|
|
|
|
|
|
|
|
MeshPoint p1 = mesh[pi1];
|
|
|
|
MeshPoint p2 = mesh[pi2];
|
|
|
|
|
|
|
|
MeshPoint pnew = p1;
|
|
|
|
mesh[pi1] = pnew;
|
|
|
|
mesh[pi2] = pnew;
|
|
|
|
|
2019-08-08 11:44:59 +05:00
|
|
|
double bad2 = 0;
|
2009-11-16 13:18:00 +05:00
|
|
|
for (int k = 0; k < hasonepi.Size(); k++)
|
|
|
|
{
|
|
|
|
Element2d & el = mesh[hasonepi[k]];
|
|
|
|
double err =
|
|
|
|
CalcTriangleBadness (mesh[el[0]], mesh[el[1]], mesh[el[2]],
|
|
|
|
nv, -1, loch);
|
|
|
|
bad2 += err;
|
|
|
|
|
|
|
|
Vec<3> hnv = Cross (Vec3d (mesh[el[0]],
|
|
|
|
mesh[el[1]]),
|
|
|
|
Vec3d (mesh[el[0]],
|
|
|
|
mesh[el[2]]));
|
|
|
|
if (hnv * nv < 0)
|
2009-01-13 04:40:13 +05:00
|
|
|
bad2 += 1e10;
|
2009-11-16 13:18:00 +05:00
|
|
|
|
|
|
|
for (int l = 0; l < 3; l++)
|
|
|
|
if ( (normals[el[l]] * nv) < 0.5)
|
|
|
|
bad2 += 1e10;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
illegal2 += 1-mesh.LegalTrig(el);
|
|
|
|
}
|
|
|
|
bad2 /= hasonepi.Size();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
mesh[pi1] = p1;
|
|
|
|
mesh[pi2] = p2;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (debugflag)
|
|
|
|
{
|
|
|
|
(*testout) << "bad1 = " << bad1 << ", bad2 = " << bad2 << endl;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool should = (bad2 < bad1 && bad2 < 1e4);
|
|
|
|
if (bad2 < 1e4)
|
|
|
|
{
|
2019-08-08 10:36:26 +05:00
|
|
|
if (illegal1 > illegal2) should = true;
|
|
|
|
if (illegal2 > illegal1) should = false;
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
if (should)
|
|
|
|
{
|
2014-12-02 18:23:36 +05:00
|
|
|
/*
|
|
|
|
(*testout) << "combine !" << endl;
|
|
|
|
(*testout) << "bad1 = " << bad1 << ", bad2 = " << bad2 << endl;
|
|
|
|
(*testout) << "illegal1 = " << illegal1 << ", illegal2 = " << illegal2 << endl;
|
|
|
|
(*testout) << "loch = " << loch << endl;
|
|
|
|
*/
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
mesh[pi1] = pnew;
|
|
|
|
PointGeomInfo gi;
|
2012-07-05 19:02:01 +06:00
|
|
|
// bool gi_set(false);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2019-08-08 10:36:26 +05:00
|
|
|
/*
|
2009-11-16 13:18:00 +05:00
|
|
|
Element2d *el1p(NULL);
|
|
|
|
int l = 0;
|
2019-08-08 02:32:14 +05:00
|
|
|
while(mesh[elementsonnode[pi1][l]].IsDeleted() && l<elementsonnode[pi1].Size()) l++;
|
|
|
|
if(l<elementsonnode[pi1].Size())
|
2009-11-16 13:18:00 +05:00
|
|
|
el1p = &mesh[elementsonnode[pi1][l]];
|
|
|
|
else
|
|
|
|
cerr << "OOPS!" << endl;
|
|
|
|
|
|
|
|
for (l = 0; l < el1p->GetNP(); l++)
|
|
|
|
if ((*el1p)[l] == pi1)
|
2009-01-13 04:40:13 +05:00
|
|
|
{
|
2009-11-16 13:18:00 +05:00
|
|
|
gi = el1p->GeomInfoPi (l+1);
|
2012-07-05 19:02:01 +06:00
|
|
|
// gi_set = true;
|
2009-01-13 04:40:13 +05:00
|
|
|
}
|
2019-08-08 10:36:26 +05:00
|
|
|
*/
|
|
|
|
for (SurfaceElementIndex sei : elementsonnode[pi1])
|
|
|
|
{
|
|
|
|
const Element2d & el1p = mesh[sei];
|
|
|
|
if (el1p.IsDeleted()) continue;
|
|
|
|
|
|
|
|
for (int l = 0; l < el1p.GetNP(); l++)
|
|
|
|
if (el1p[l] == pi1)
|
|
|
|
// gi = el1p.GeomInfoPi (l+1);
|
|
|
|
gi = el1p.GeomInfo()[l];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
// (*testout) << "Connect point " << pi2 << " to " << pi1 << "\n";
|
2019-08-08 10:36:26 +05:00
|
|
|
// for (int k = 0; k < elementsonnode[pi2].Size(); k++)
|
|
|
|
for (SurfaceElementIndex sei2 : elementsonnode[pi2])
|
2009-11-16 13:18:00 +05:00
|
|
|
{
|
2019-08-08 10:36:26 +05:00
|
|
|
Element2d & el = mesh[sei2];
|
2019-08-08 11:44:59 +05:00
|
|
|
if (el.IsDeleted()) continue;
|
2019-08-08 10:36:26 +05:00
|
|
|
if (el.PNums().Contains(pi1)) continue;
|
2019-08-08 11:44:59 +05:00
|
|
|
|
|
|
|
elementsonnode.Add (pi1, sei2);
|
2019-08-08 10:36:26 +05:00
|
|
|
|
2019-08-08 11:44:59 +05:00
|
|
|
for (auto l : Range(el.GetNP()))
|
2009-11-16 13:18:00 +05:00
|
|
|
{
|
|
|
|
if (el[l] == pi2)
|
|
|
|
{
|
|
|
|
el[l] = pi1;
|
2019-08-08 11:44:59 +05:00
|
|
|
el.GeomInfo()[l] = gi;
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
|
|
|
|
|
|
|
fixed[el[l]] = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-08 10:36:26 +05:00
|
|
|
for (auto sei : hasbothpi)
|
|
|
|
mesh[sei].Delete();
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
// mesh.Compress();
|
|
|
|
mesh.SetNextTimeStamp();
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
|
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
void MeshOptimize2d :: CheckMeshApproximation (Mesh & mesh)
|
|
|
|
{
|
|
|
|
// Check angles between elements and normals at corners
|
|
|
|
/*
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
int i, j;
|
|
|
|
int ne = mesh.GetNSE();
|
|
|
|
int surfnr;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
Vec3d n, ng;
|
2019-07-09 13:39:16 +05:00
|
|
|
NgArray<Vec3d> ngs(3);
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2017-12-05 02:32:47 +05:00
|
|
|
(*mycout) << "Check Surface Approximation" << endl;
|
|
|
|
(*testout) << "Check Surface Approximation" << endl;
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
for (i = 1; i <= ne; i++)
|
2009-01-13 04:40:13 +05:00
|
|
|
{
|
2009-11-16 13:18:00 +05:00
|
|
|
const Element2d & el = mesh.SurfaceElement(i);
|
|
|
|
surfnr = mesh.GetFaceDescriptor (el.GetIndex()).SurfNr();
|
|
|
|
Vec3d n = Cross (mesh.Point (el.PNum(1)) - mesh.Point (el.PNum(2)),
|
|
|
|
mesh.Point (el.PNum(1)) - mesh.Point (el.PNum(3)));
|
|
|
|
n /= n.Length();
|
2009-01-13 04:40:13 +05:00
|
|
|
|
2009-11-16 13:18:00 +05:00
|
|
|
for (j = 1; j <= el.GetNP(); j++)
|
|
|
|
{
|
|
|
|
SelectSurfaceOfPoint (mesh.Point(el.PNum(j)), el.GeomInfoPi(j));
|
|
|
|
GetNormalVector (surfnr, mesh.Point(el.PNum(j)), ng);
|
|
|
|
ng /= ng.Length();
|
|
|
|
ngs.Elem(j) = ng;
|
|
|
|
|
|
|
|
double angle = (180.0 / M_PI) * Angle (n, ng);
|
|
|
|
if (angle > 60)
|
|
|
|
{
|
|
|
|
(*testout) << "el " << i << " node " << el.PNum(j)
|
|
|
|
<< "has angle = " << angle << endl;
|
2009-01-13 04:40:13 +05:00
|
|
|
}
|
2009-11-16 13:18:00 +05:00
|
|
|
}
|
|
|
|
|
|
|
|
for (j = 1; j <= 3; j++)
|
|
|
|
{
|
|
|
|
double angle = (180.0 / M_PI) * Angle (ngs.Get(j), ngs.Get(j%3+1));
|
|
|
|
if (angle > 60)
|
|
|
|
{
|
|
|
|
(*testout) << "el " << i << " node-node "
|
|
|
|
<< ngs.Get(j) << " - " << ngs.Get(j%3+1)
|
|
|
|
<< " has angle = " << angle << endl;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*/
|
|
|
|
}
|
2009-01-13 04:40:13 +05:00
|
|
|
}
|