ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2025-01-27 13:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

improvements for STL meshing

Browse Source
This commit is contained in:
Joachim Schoeberl 2012-10-22 13:13:57 +00:00
parent 9c151ce274
commit c7fb4b676f
14 changed files with 488 additions and 335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libsrc/general/hashtabl.hpp
View File

@ -87,7 +87,7 @@ public:
/// ///
void PrintStat (ostream & ost) const; void PrintStat (ostream & ost) const;
void BaseSetSize(int s) {hash.SetSize(s);} void BaseSetSize(int s) {hash.SetSize(s);}
protected: //protected:
/// ///
int HashValue (const INDEX_2 & ind) const int HashValue (const INDEX_2 & ind) const
{ {
@ -96,8 +96,7 @@ protected:
/// ///
int Position (int bnr, const INDEX_2 & ind) const int Position (int bnr, const INDEX_2 & ind) const
{ {
int i; for (int i = 1; i <= hash.EntrySize (bnr); i++)
for (i = 1; i <= hash.EntrySize (bnr); i++)
if (hash.Get(bnr, i) == ind) if (hash.Get(bnr, i) == ind)
return i; return i;
return 0; return 0;
@ -150,7 +149,7 @@ public:
/// ///
bool Used (const INDEX_2 & ahash) const bool Used (const INDEX_2 & ahash) const
{ {
return (Position (HashValue (ahash), ahash)) ? 1 : 0; return Position (HashValue (ahash), ahash) > 0;
} }
/// ///
int GetNBags () const int GetNBags () const

15
libsrc/meshing/adfront2.cpp
View File

@ -211,19 +211,6 @@ namespace netgen
} }
/*
void AdFront2 :: IncrementClass (int li)
{
lines[li].IncrementClass();
}
void AdFront2 :: ResetClass (int li)
{
lines[li].ResetClass();
}
*/
int AdFront2 :: SelectBaseLine (Point<3> & p1, Point<3> & p2, int AdFront2 :: SelectBaseLine (Point<3> & p1, Point<3> & p2,
const PointGeomInfo *& geominfo1, const PointGeomInfo *& geominfo1,
const PointGeomInfo *& geominfo2, const PointGeomInfo *& geominfo2,
@ -474,7 +461,7 @@ namespace netgen
DenseMatrix a(2), ainv(2); DenseMatrix a(2), ainv(2);
Vector b(2), u(2); Vector b(2), u(2);
// random numbers: // quasi-random numbers:
n(0) = 0.123871; n(0) = 0.123871;
n(1) = 0.15432; n(1) = 0.15432;

88
libsrc/meshing/meshclass.cpp
View File

@ -5,6 +5,7 @@ namespace netgen
{ {
Mesh :: Mesh () Mesh :: Mesh ()
: surfarea(*this)
{ {
// volelements.SetName ("vol elements"); // volelements.SetName ("vol elements");
// surfelements.SetName ("surf elements"); // surfelements.SetName ("surf elements");
@ -301,6 +302,9 @@ namespace netgen
surfelements.Last().next = facedecoding[el.index-1].firstelement; surfelements.Last().next = facedecoding[el.index-1].firstelement;
facedecoding[el.index-1].firstelement = si; facedecoding[el.index-1].firstelement = si;
if (SurfaceArea().Valid())
SurfaceArea().Add (el);
lock.UnLock(); lock.UnLock();
return si; return si;
} }
@ -2024,15 +2028,15 @@ namespace netgen
void Mesh :: FindOpenSegments (int surfnr) void Mesh :: FindOpenSegments (int surfnr)
{ {
int i, j, k; // int i, j, k;
// new version, general elemetns // new version, general elements
// hash index: pnum1-2 // hash index: pnum1-2
// hash data : surfnr, surfel-nr (pos) or segment nr(neg) // hash data : surfnr, surfel-nr (pos) or segment nr(neg)
INDEX_2_HASHTABLE<INDEX_2> faceht(4 * GetNSE()+GetNSeg()+1); INDEX_2_HASHTABLE<INDEX_2> faceht(4 * GetNSE()+GetNSeg()+1);
PrintMessage (5, "Test Opensegments"); PrintMessage (5, "Test Opensegments");
for (i = 1; i <= GetNSeg(); i++) for (int i = 1; i <= GetNSeg(); i++)
{ {
const Segment & seg = LineSegment (i); const Segment & seg = LineSegment (i);
@ -2052,7 +2056,7 @@ namespace netgen
} }
for (i = 1; i <= GetNSeg(); i++) for (int i = 1; i <= GetNSeg(); i++)
{ {
const Segment & seg = LineSegment (i); const Segment & seg = LineSegment (i);
@ -2067,15 +2071,17 @@ namespace netgen
} }
} }
// bool buggy = false;
// ofstream bout("buggy.out");
for (i = 1; i <= GetNSE(); i++) for (int i = 1; i <= GetNSE(); i++)
{ {
const Element2d & el = SurfaceElement(i); const Element2d & el = SurfaceElement(i);
if (el.IsDeleted()) continue; if (el.IsDeleted()) continue;
if (surfnr == 0 || el.GetIndex() == surfnr) if (surfnr == 0 || el.GetIndex() == surfnr)
{ {
for (j = 1; j <= el.GetNP(); j++) for (int j = 1; j <= el.GetNP(); j++)
{ {
INDEX_2 seg (el.PNumMod(j), el.PNumMod(j+1)); INDEX_2 seg (el.PNumMod(j), el.PNumMod(j+1));
INDEX_2 data; INDEX_2 data;
@ -2093,9 +2099,40 @@ namespace netgen
} }
else else
{ {
PrintSysError ("hash table si not fitting for segment: ", // buggy = true;
PrintWarning ("hash table si not fitting for segment: ",
seg.I1(), "-", seg.I2(), " other = ", seg.I1(), "-", seg.I2(), " other = ",
data.I2()); data.I2());
// cout << "me: index = " << el.GetIndex() << ", el = " << el << endl;
/*
bout << "has index = " << seg << endl;
bout << "hash value = " << faceht.HashValue (seg) << endl;
if (data.I2() > 0)
{
int io = data.I2();
cout << "other trig: index = " << SurfaceElement(io).GetIndex()
<< ", el = " << SurfaceElement(io) << endl;
}
else
{
cout << "other seg " << -data.I2() << ", si = " << data.I1() << endl;
}
bout << "me: index = " << el.GetIndex() << ", el = " << el << endl;
if (data.I2() > 0)
{
int io = data.I2();
bout << "other trig: index = " << SurfaceElement(io).GetIndex()
<< ", el = " << SurfaceElement(io) << endl;
}
else
{
bout << "other seg " << -data.I2() << ", si = " << data.I1() << endl;
}
*/
} }
} }
else else
@ -2110,10 +2147,35 @@ namespace netgen
} }
} }
/*
if (buggy)
{
for (int i = 1; i <= GetNSeg(); i++)
bout << "seg" << i << " " << LineSegment(i) << endl;
for (int i = 1; i <= GetNSE(); i++)
bout << "sel" << i << " " << SurfaceElement(i) << " ind = "
<< SurfaceElement(i).GetIndex() << endl;
bout << "hashtable: " << endl;
for (int j = 1; j <= faceht.GetNBags(); j++)
{
bout << "bag " << j << ":" << endl;
for (int k = 1; k <= faceht.GetBagSize(j); k++)
{
INDEX_2 i2, data;
faceht.GetData (j, k, i2, data);
bout << "key = " << i2 << ", data = " << data << endl;
}
}
exit(1);
}
*/
(*testout) << "open segments: " << endl; (*testout) << "open segments: " << endl;
opensegments.SetSize(0); opensegments.SetSize(0);
for (i = 1; i <= faceht.GetNBags(); i++) for (int i = 1; i <= faceht.GetNBags(); i++)
for (j = 1; j <= faceht.GetBagSize(i); j++) for (int j = 1; j <= faceht.GetBagSize(i); j++)
{ {
INDEX_2 i2; INDEX_2 i2;
INDEX_2 data; INDEX_2 data;
@ -2130,7 +2192,7 @@ namespace netgen
{ {
// segment due to triangle // segment due to triangle
const Element2d & el = SurfaceElement (data.I2()); const Element2d & el = SurfaceElement (data.I2());
for (k = 1; k <= el.GetNP(); k++) for (int k = 1; k <= el.GetNP(); k++)
{ {
if (seg[0] == el.PNum(k)) if (seg[0] == el.PNum(k))
seg.geominfo[0] = el.GeomInfoPi(k); seg.geominfo[0] = el.GeomInfoPi(k);
@ -2184,16 +2246,16 @@ namespace netgen
ptyps.Elem(seg[1]) = EDGEPOINT; ptyps.Elem(seg[1]) = EDGEPOINT;
} }
*/ */
for (i = 1; i <= points.Size(); i++) for (int i = 1; i <= points.Size(); i++)
points.Elem(i).SetType(SURFACEPOINT); points.Elem(i).SetType(SURFACEPOINT);
for (i = 1; i <= GetNSeg(); i++) for (int i = 1; i <= GetNSeg(); i++)
{ {
const Segment & seg = LineSegment (i); const Segment & seg = LineSegment (i);
points[seg[0]].SetType(EDGEPOINT); points[seg[0]].SetType(EDGEPOINT);
points[seg[1]].SetType(EDGEPOINT); points[seg[1]].SetType(EDGEPOINT);
} }
for (i = 1; i <= GetNOpenSegments(); i++) for (int i = 1; i <= GetNOpenSegments(); i++)
{ {
const Segment & seg = GetOpenSegment (i); const Segment & seg = GetOpenSegment (i);
points[seg[0]].SetType (EDGEPOINT); points[seg[0]].SetType (EDGEPOINT);

39
libsrc/meshing/meshclass.hpp
View File

@ -676,6 +676,45 @@ namespace netgen
const class AnisotropicClusters & GetClusters () const const class AnisotropicClusters & GetClusters () const
{ return *clusters; } { return *clusters; }
class CSurfaceArea
{
const Mesh & mesh;
bool valid;
double area;
public:
CSurfaceArea (const Mesh & amesh)
: mesh(amesh), valid(false) { ; }
void Add (const Element2d & sel)
{
if (sel.GetNP() == 3)
area += Cross ( mesh[sel[1]]-mesh[sel[0]],
mesh[sel[2]]-mesh[sel[0]] ).Length() / 2;
else
area += Cross (Vec3d (mesh.Point (sel.PNum(1)),
mesh.Point (sel.PNum(3))),
Vec3d (mesh.Point (sel.PNum(1)),
mesh.Point (sel.PNum(4)))).Length() / 2;;
}
void ReCalc ()
{
area = 0;
for (SurfaceElementIndex sei = 0; sei < mesh.GetNSE(); sei++)
Add (mesh[sei]);
valid = true;
}
operator double () const { return area; }
bool Valid() const { return valid; }
};
CSurfaceArea surfarea;
CSurfaceArea & SurfaceArea() { return surfarea; }
const CSurfaceArea & SurfaceArea() const { return surfarea; }
int GetTimeStamp() const { return timestamp; } int GetTimeStamp() const { return timestamp; }
void SetNextTimeStamp() void SetNextTimeStamp()
{ timestamp = NextTimeStamp(); } { timestamp = NextTimeStamp(); }

23
libsrc/meshing/meshing2.cpp
View File

@ -200,8 +200,15 @@ namespace netgen
static int timer1 = NgProfiler::CreateTimer ("surface meshing1"); static int timer1 = NgProfiler::CreateTimer ("surface meshing1");
static int timer2 = NgProfiler::CreateTimer ("surface meshing2"); static int timer2 = NgProfiler::CreateTimer ("surface meshing2");
static int timer3 = NgProfiler::CreateTimer ("surface meshing3"); static int timer3 = NgProfiler::CreateTimer ("surface meshing3");
static int ts1 = NgProfiler::CreateTimer ("surface meshing start 1");
static int ts2 = NgProfiler::CreateTimer ("surface meshing start 2");
static int ts3 = NgProfiler::CreateTimer ("surface meshing start 3");
NgProfiler::RegionTimer reg (timer); NgProfiler::RegionTimer reg (timer);
NgProfiler::StartTimer (ts1);
Array<int> pindex, lindex; Array<int> pindex, lindex;
Array<int> delpoints, dellines; Array<int> delpoints, dellines;
@ -267,7 +274,6 @@ namespace netgen
trigsonnode = 0; trigsonnode = 0;
illegalpoint = 0; illegalpoint = 0;
double totalarea = Area (); double totalarea = Area ();
double meshedarea = 0; double meshedarea = 0;
@ -302,14 +308,15 @@ namespace netgen
box.Set ( mesh[sel[0]] ); box.Set ( mesh[sel[0]] );
box.Add ( mesh[sel[1]] ); box.Add ( mesh[sel[1]] );
box.Add ( mesh[sel[2]] ); box.Add ( mesh[sel[2]] );
// surfeltree.Insert (box, i);
surfeltree.Insert (box, seia[i]); surfeltree.Insert (box, seia[i]);
} }
NgProfiler::StopTimer (ts1);
NgProfiler::StartTimer (ts2);
if (totalarea > 0 || maxarea > 0) if (totalarea > 0 || maxarea > 0)
meshedarea = mesh.SurfaceArea();
/*
for (SurfaceElementIndex sei = 0; sei < mesh.GetNSE(); sei++) for (SurfaceElementIndex sei = 0; sei < mesh.GetNSE(); sei++)
{ {
const Element2d & sel = mesh[sei]; const Element2d & sel = mesh[sei];
@ -326,9 +333,12 @@ namespace netgen
mesh.Point (sel.PNum(4)))).Length() / 2;; mesh.Point (sel.PNum(4)))).Length() / 2;;
meshedarea += trigarea; meshedarea += trigarea;
} }
*/
// cout << "meshedarea = " << meshedarea << " =?= "
// << mesh.SurfaceArea() << endl;
NgProfiler::StopTimer (ts2);
NgProfiler::StartTimer (ts3);
const char * savetask = multithread.task; const char * savetask = multithread.task;
multithread.task = "Surface meshing"; multithread.task = "Surface meshing";
@ -340,6 +350,7 @@ namespace netgen
double meshedarea_before = meshedarea; double meshedarea_before = meshedarea;
NgProfiler::StopTimer (ts3);
while (!adfront ->Empty() && !multithread.terminate) while (!adfront ->Empty() && !multithread.terminate)
{ {

179
libsrc/meshing/smoothing2.cpp
View File

@ -568,7 +568,6 @@ namespace netgen
faceindex = 0; faceindex = 0;
return; return;
} }
static int timer = NgProfiler::CreateTimer ("MeshSmoothing 2D"); static int timer = NgProfiler::CreateTimer ("MeshSmoothing 2D");
static int timer1 = NgProfiler::CreateTimer ("MeshSmoothing 2D start"); static int timer1 = NgProfiler::CreateTimer ("MeshSmoothing 2D start");
@ -580,7 +579,6 @@ namespace netgen
Opti2dLocalData ld; Opti2dLocalData ld;
// SurfaceElementIndex sei;
Array<SurfaceElementIndex> seia; Array<SurfaceElementIndex> seia;
mesh.GetSurfaceElementsOfFace (faceindex, seia); mesh.GetSurfaceElementsOfFace (faceindex, seia);
@ -593,23 +591,48 @@ namespace netgen
break; break;
} }
int loci; Vector x(2);
double fact;
int moveisok;
PointGeomInfo ngi;
Point3d origp;
Vec3d n1, n2;
Vector x(2), xedge(1);
Array<MeshPoint, PointIndex::BASE> savepoints(mesh.GetNP()); Array<MeshPoint, PointIndex::BASE> savepoints(mesh.GetNP());
ld.uselocalh = mp.uselocalh; ld.uselocalh = mp.uselocalh;
Array<int, PointIndex::BASE> compress(mesh.GetNP());
Array<PointIndex> icompress;
for (int i = 0; i < seia.Size(); i++)
{
const Element2d & el = mesh[seia[i]];
for (int j = 0; j < el.GetNP(); j++)
compress[el[j]] = -1;
}
for (int i = 0; i < seia.Size(); i++)
{
const Element2d & el = mesh[seia[i]];
for (int j = 0; j < el.GetNP(); j++)
if (compress[el[j]] == -1)
{
compress[el[j]] = icompress.Size();
icompress.Append(el[j]);
}
}
Array<int> cnta(icompress.Size());
cnta = 0;
for (int i = 0; i < seia.Size(); i++)
{
const Element2d & el = mesh[seia[i]];
for (int j = 0; j < el.GetNP(); j++)
cnta[compress[el[j]]]++;
}
TABLE<SurfaceElementIndex> elementsonpoint(cnta);
for (int i = 0; i < seia.Size(); i++)
{
const Element2d & el = mesh[seia[i]];
for (int j = 0; j < el.GetNP(); j++)
elementsonpoint.Add (compress[el[j]], seia[i]);
}
/*
Array<int, PointIndex::BASE> nelementsonpoint(mesh.GetNP()); Array<int, PointIndex::BASE> nelementsonpoint(mesh.GetNP());
nelementsonpoint = 0; nelementsonpoint = 0;
for (int i = 0; i < seia.Size(); i++) for (int i = 0; i < seia.Size(); i++)
@ -627,6 +650,8 @@ namespace netgen
for (int j = 0; j < el.GetNP(); j++) for (int j = 0; j < el.GetNP(); j++)
elementsonpoint.Add (el[j], seia[i]); elementsonpoint.Add (el[j], seia[i]);
} }
*/
ld.loch = mp.maxh; ld.loch = mp.maxh;
@ -645,7 +670,7 @@ namespace netgen
/* /*
int i, j, k; int i, j, k;
Vector xedge(1);
if (improveedges) if (improveedges)
for (i = 1; i <= mesh.GetNP(); i++) for (i = 1; i <= mesh.GetNP(); i++)
if (mesh.PointType(i) == EDGEPOINT) if (mesh.PointType(i) == EDGEPOINT)
@ -695,6 +720,7 @@ namespace netgen
if (surfi2 && !surfi3) if (surfi2 && !surfi3)
{ {
Vec3d n1, n2;
GetNormalVector (surfi, sp1, n1); GetNormalVector (surfi, sp1, n1);
GetNormalVector (surfi2, sp1, n2); GetNormalVector (surfi2, sp1, n2);
t1 = Cross (n1, n2); t1 = Cross (n1, n2);
@ -717,77 +743,87 @@ namespace netgen
if (mesh.GetNP() > 1000) if (mesh.GetNP() > 1000)
{ {
plotchar = '+'; plotchar = '+';
modplot = 10; modplot = 100;
} }
if (mesh.GetNP() > 10000) if (mesh.GetNP() > 10000)
{ {
plotchar = 'o'; plotchar = 'o';
modplot = 100; modplot = 1000;
}
if (mesh.GetNP() > 100000)
{
plotchar = 'O';
modplot = 10000;
} }
int cnt = 0; int cnt = 0;
NgProfiler::StopTimer (timer1); NgProfiler::StopTimer (timer1);
/*
for (PointIndex pi = PointIndex::BASE; pi < mesh.GetNP()+PointIndex::BASE; pi++) for (PointIndex pi = PointIndex::BASE; pi < mesh.GetNP()+PointIndex::BASE; pi++)
if (mesh[pi].Type() == SURFACEPOINT) if (mesh[pi].Type() == SURFACEPOINT)
{ */
if (multithread.terminate) for (int hi = 0; hi < icompress.Size(); hi++)
throw NgException ("Meshing stopped"); {
PointIndex pi = icompress[hi];
cnt++; if (mesh[pi].Type() == SURFACEPOINT)
if (cnt % modplot == 0 && writestatus) {
{ if (multithread.terminate)
printeddot = 1; throw NgException ("Meshing stopped");
PrintDot (plotchar);
} cnt++;
if (cnt % modplot == 0 && writestatus)
if (elementsonpoint[pi].Size() == 0)
continue;
ld.sp1 = mesh[pi];
Element2d & hel = mesh[elementsonpoint[pi][0]];
int hpi = 0;
for (int j = 1; j <= hel.GetNP(); j++)
if (hel.PNum(j) == pi)
{ {
hpi = j; printeddot = 1;
break; PrintDot (plotchar);
} }
ld.gi1 = hel.GeomInfoPi(hpi); // if (elementsonpoint[pi].Size() == 0) continue;
SelectSurfaceOfPoint (ld.sp1, ld.gi1); if (elementsonpoint[hi].Size() == 0) continue;
ld.locelements.SetSize(0);
ld.locrots.SetSize (0);
ld.lochs.SetSize (0);
for (int j = 0; j < elementsonpoint[pi].Size(); j++) ld.sp1 = mesh[pi];
{
SurfaceElementIndex sei = elementsonpoint[pi][j];
const Element2d & bel = mesh[sei];
ld.surfi = mesh.GetFaceDescriptor(bel.GetIndex()).SurfNr();
ld.locelements.Append (sei); // Element2d & hel = mesh[elementsonpoint[pi][0]];
Element2d & hel = mesh[elementsonpoint[hi][0]];
for (int k = 1; k <= bel.GetNP(); k++) int hpi = 0;
if (bel.PNum(k) == pi) for (int j = 1; j <= hel.GetNP(); j++)
{ if (hel.PNum(j) == pi)
ld.locrots.Append (k);
break;
}
if (ld.uselocalh)
{ {
Point3d pmid = Center (mesh[bel[0]], mesh[bel[1]], mesh[bel[2]]); hpi = j;
ld.lochs.Append (mesh.GetH(pmid)); break;
} }
}
ld.gi1 = hel.GeomInfoPi(hpi);
SelectSurfaceOfPoint (ld.sp1, ld.gi1);
ld.locelements.SetSize(0);
ld.locrots.SetSize (0);
ld.lochs.SetSize (0);
for (int j = 0; j < elementsonpoint[hi].Size(); j++)
{
SurfaceElementIndex sei = elementsonpoint[hi][j];
const Element2d & bel = mesh[sei];
ld.surfi = mesh.GetFaceDescriptor(bel.GetIndex()).SurfNr();
ld.locelements.Append (sei);
for (int k = 1; k <= bel.GetNP(); k++)
if (bel.PNum(k) == pi)
{
ld.locrots.Append (k);
break;
}
if (ld.uselocalh)
{
Point3d pmid = Center (mesh[bel[0]], mesh[bel[1]], mesh[bel[2]]);
ld.lochs.Append (mesh.GetH(pmid));
}
}
GetNormalVector (ld.surfi, ld.sp1, ld.gi1, ld.normal); GetNormalVector (ld.surfi, ld.sp1, ld.gi1, ld.normal);
ld.t1 = ld.normal.GetNormal (); ld.t1 = ld.normal.GetNormal ();
ld.t2 = Cross (ld.normal, ld.t1); ld.t2 = Cross (ld.normal, ld.t1);
@ -830,10 +866,10 @@ namespace netgen
} }
origp = mesh[pi]; Point3d origp = mesh[pi];
loci = 1; int loci = 1;
fact = 1; double fact = 1;
moveisok = 0; int moveisok = 0;
// restore other points // restore other points
for (int j = 0; j < ld.locelements.Size(); j++) for (int j = 0; j < ld.locelements.Size(); j++)
@ -867,6 +903,7 @@ namespace netgen
// ProjectPoint (surfi, mesh[pi]); // ProjectPoint (surfi, mesh[pi]);
// moveisok = CalcPointGeomInfo(surfi, ngi, mesh[pi]); // moveisok = CalcPointGeomInfo(surfi, ngi, mesh[pi]);
PointGeomInfo ngi;
ngi = ld.gi1; ngi = ld.gi1;
moveisok = ProjectPointGI (ld.surfi, mesh[pi], ngi); moveisok = ProjectPointGI (ld.surfi, mesh[pi], ngi);
// point lies on same chart in stlsurface // point lies on same chart in stlsurface
@ -883,10 +920,10 @@ namespace netgen
} }
} }
}
if (printeddot) if (printeddot)
PrintDot ('\n'); PrintDot ('\n');
CheckMeshApproximation (mesh); CheckMeshApproximation (mesh);
mesh.SetNextTimeStamp(); mesh.SetNextTimeStamp();
} }

231
libsrc/stlgeom/meshstlsurface.cpp
View File

@ -16,10 +16,7 @@ namespace netgen
static void STLFindEdges (STLGeometry & geom, static void STLFindEdges (STLGeometry & geom,
class Mesh & mesh) class Mesh & mesh)
{ {
int i, j; double h = mparam.maxh;
double h;
h = mparam.maxh;
// mark edge points: // mark edge points:
//int ngp = geom.GetNP(); //int ngp = geom.GetNP();
@ -33,23 +30,29 @@ static void STLFindEdges (STLGeometry & geom,
PrintMessage(3,"Mesh Lines"); PrintMessage(3,"Mesh Lines");
for (i = 1; i <= geom.GetNLines(); i++) cout << geom.GetNLines() << " lines" << endl;
double totnp = 0;
for (int i = 1; i <= geom.GetNLines(); i++)
totnp += geom.GetLine(i)->NP();
cout << "avg np per line " << totnp/geom.GetNLines() << endl;
for (int i = 1; i <= geom.GetNLines(); i++)
{ {
meshlines.Append(geom.GetLine(i)->Mesh(geom.GetPoints(), meshpoints, h, mesh)); meshlines.Append(geom.GetLine(i)->Mesh(geom.GetPoints(), meshpoints, h, mesh));
SetThreadPercent(100.0 * (double)i/(double)geom.GetNLines()); SetThreadPercent(100.0 * (double)i/(double)geom.GetNLines());
} }
NgProfiler::Print(stdout);
geom.meshpoints.SetSize(0); //testing geom.meshpoints.SetSize(0); //testing
geom.meshlines.SetSize(0); //testing geom.meshlines.SetSize(0); //testing
int pim; for (int i = 1; i <= meshpoints.Size(); i++)
for (i = 1; i <= meshpoints.Size(); i++)
{ {
geom.meshpoints.Append(meshpoints.Get(i)); //testing geom.meshpoints.Append(meshpoints.Get(i)); //testing
mesh.AddPoint(meshpoints.Get(i));
pim = mesh.AddPoint(meshpoints.Get(i));
} }
//(++++++++++++++testing //(++++++++++++++testing
for (i = 1; i <= geom.GetNLines(); i++) for (int i = 1; i <= geom.GetNLines(); i++)
{ {
geom.meshlines.Append(meshlines.Get(i)); geom.meshlines.Append(meshlines.Get(i));
} }
@ -57,11 +60,11 @@ static void STLFindEdges (STLGeometry & geom,
PrintMessage(7,"feed with edges"); PrintMessage(7,"feed with edges");
for (i = 1; i <= meshlines.Size(); i++) for (int i = 1; i <= meshlines.Size(); i++)
{ {
STLLine* line = meshlines.Get(i); STLLine* line = meshlines.Get(i);
(*testout) << "store line " << i << endl; (*testout) << "store line " << i << endl;
for (j = 1; j <= line->GetNS(); j++) for (int j = 1; j <= line->GetNS(); j++)
{ {
int p1, p2; int p1, p2;
@ -243,7 +246,6 @@ void STLSurfaceMeshing1 (STLGeometry & geom,
int STLSurfaceMeshing (STLGeometry & geom, int STLSurfaceMeshing (STLGeometry & geom,
class Mesh & mesh) class Mesh & mesh)
{ {
int i, j;
PrintFnStart("Do Surface Meshing"); PrintFnStart("Do Surface Meshing");
geom.PrepareSurfaceMeshing(); geom.PrepareSurfaceMeshing();
@ -256,7 +258,7 @@ int STLSurfaceMeshing (STLGeometry & geom,
// mesh.Save ("mesh.edges"); // mesh.Save ("mesh.edges");
for (i = 1; i <= mesh.GetNSeg(); i++) for (int i = 1; i <= mesh.GetNSeg(); i++)
{ {
const Segment & seg = mesh.LineSegment (i); const Segment & seg = mesh.LineSegment (i);
if (seg.geominfo[0].trignum <= 0 || seg.geominfo[1].trignum <= 0) if (seg.geominfo[0].trignum <= 0 || seg.geominfo[1].trignum <= 0)
@ -298,14 +300,14 @@ int STLSurfaceMeshing (STLGeometry & geom,
if (nopen) if (nopen)
{ {
geom.ClearMarkedSegs(); geom.ClearMarkedSegs();
for (i = 1; i <= nopen; i++) for (int i = 1; i <= nopen; i++)
{ {
const Segment & seg = mesh.GetOpenSegment (i); const Segment & seg = mesh.GetOpenSegment (i);
geom.AddMarkedSeg(mesh.Point(seg[0]),mesh.Point(seg[1])); geom.AddMarkedSeg(mesh.Point(seg[0]),mesh.Point(seg[1]));
} }
geom.InitMarkedTrigs(); geom.InitMarkedTrigs();
for (i = 1; i <= nopen; i++) for (int i = 1; i <= nopen; i++)
{ {
const Segment & seg = mesh.GetOpenSegment (i); const Segment & seg = mesh.GetOpenSegment (i);
geom.SetMarkedTrig(seg.geominfo[0].trignum,1); geom.SetMarkedTrig(seg.geominfo[0].trignum,1);
@ -361,7 +363,7 @@ int STLSurfaceMeshing (STLGeometry & geom,
// Open edge-segments will be refined ! // Open edge-segments will be refined !
INDEX_2_HASHTABLE<int> openseght (nopen+1); INDEX_2_HASHTABLE<int> openseght (nopen+1);
for (i = 1; i <= mesh.GetNOpenSegments(); i++) for (int i = 1; i <= mesh.GetNOpenSegments(); i++)
{ {
const Segment & seg = mesh.GetOpenSegment (i); const Segment & seg = mesh.GetOpenSegment (i);
INDEX_2 i2(seg[0], seg[1]); INDEX_2 i2(seg[0], seg[1]);
@ -379,7 +381,7 @@ int STLSurfaceMeshing (STLGeometry & geom,
INDEX_2_HASHTABLE<int> newpht(100); INDEX_2_HASHTABLE<int> newpht(100);
int nsegold = mesh.GetNSeg(); int nsegold = mesh.GetNSeg();
for (i = 1; i <= nsegold; i++) for (int i = 1; i <= nsegold; i++)
{ {
Segment seg = mesh.LineSegment(i); Segment seg = mesh.LineSegment(i);
INDEX_2 i2(seg[0], seg[1]); INDEX_2 i2(seg[0], seg[1]);
@ -462,7 +464,7 @@ int STLSurfaceMeshing (STLGeometry & geom,
geom.InitMarkedTrigs(); geom.InitMarkedTrigs();
for (i = 1; i <= mesh.GetNSE(); i++) for (int i = 1; i <= mesh.GetNSE(); i++)
if (mesh.SurfaceElement(i).BadElement()) if (mesh.SurfaceElement(i).BadElement())
{ {
int trig = mesh.SurfaceElement(i).PNum(1); int trig = mesh.SurfaceElement(i).PNum(1);
@ -477,10 +479,10 @@ int STLSurfaceMeshing (STLGeometry & geom,
// was commented: // was commented:
for (i = 1; i <= mesh.GetNSE(); i++) for (int i = 1; i <= mesh.GetNSE(); i++)
if (mesh.SurfaceElement(i).BadElement()) if (mesh.SurfaceElement(i).BadElement())
{ {
for (j = 1; j <= 3; j++) for (int j = 1; j <= 3; j++)
{ {
refpts.Append (mesh.Point (mesh.SurfaceElement(i).PNum(j))); refpts.Append (mesh.Point (mesh.SurfaceElement(i).PNum(j)));
refh.Append (mesh.GetH (refpts.Last()) / 2); refh.Append (mesh.GetH (refpts.Last()) / 2);
@ -489,7 +491,7 @@ int STLSurfaceMeshing (STLGeometry & geom,
} }
// delete wrong oriented element // delete wrong oriented element
for (i = 1; i <= mesh.GetNSE(); i++) for (int i = 1; i <= mesh.GetNSE(); i++)
{ {
const Element2d & el = mesh.SurfaceElement(i); const Element2d & el = mesh.SurfaceElement(i);
if (!el.PNum(1)) if (!el.PNum(1))
@ -509,7 +511,7 @@ int STLSurfaceMeshing (STLGeometry & geom,
} }
// end comments // end comments
for (i = 1; i <= refpts.Size(); i++) for (int i = 1; i <= refpts.Size(); i++)
mesh.RestrictLocalH (refpts.Get(i), refh.Get(i)); mesh.RestrictLocalH (refpts.Get(i), refh.Get(i));
mesh.RemoveOneLayerSurfaceElements(); mesh.RemoveOneLayerSurfaceElements();
@ -550,89 +552,121 @@ void STLSurfaceMeshing1 (STLGeometry & geom,
class Mesh & mesh, class Mesh & mesh,
int retrynr) int retrynr)
{ {
int i, j; double h = mparam.maxh;
double h;
h = mparam.maxh;
mesh.FindOpenSegments(); mesh.FindOpenSegments();
Array<int> spiralps(0); Array<int> spiralps(0);
spiralps.SetSize(0); spiralps.SetSize(0);
for (i = 1; i <= geom.GetNP(); i++) for (int i = 1; i <= geom.GetNP(); i++)
{ {
if (geom.GetSpiralPoint(i)) {spiralps.Append(i);} if (geom.GetSpiralPoint(i)) {spiralps.Append(i);}
} }
PrintMessage(7,"NO spiralpoints = ", spiralps.Size()); PrintMessage(7,"NO spiralpoints = ", spiralps.Size());
//int spfound; //int spfound;
int sppointnum;
int spcnt = 0; int spcnt = 0;
Array<int> meshsp(mesh.GetNP()); Array<int> meshsp(mesh.GetNP());
for (i = 1; i <= mesh.GetNP(); i++) meshsp = 0;
{ for (int i = 1; i <= mesh.GetNP(); i++)
meshsp.Elem(i) = 0; for (int j = 1; j <= spiralps.Size(); j++)
for (j = 1; j <= spiralps.Size(); j++) if (Dist2(geom.GetPoint(spiralps.Get(j)), mesh.Point(i)) < 1e-20)
if (Dist2(geom.GetPoint(spiralps.Get(j)), mesh.Point(i)) < 1e-20) meshsp.Elem(i) = spiralps.Get(j);
meshsp.Elem(i) = spiralps.Get(j);
}
Array<int, 1> opensegsperface(mesh.GetNFD());
opensegsperface = 0;
Array<int> opensegsperface(mesh.GetNFD()); for (int i = 1; i <= mesh.GetNOpenSegments(); i++)
for (i = 1; i <= mesh.GetNFD(); i++) opensegsperface[mesh.GetOpenSegment(i).si]++;
opensegsperface.Elem(i) = 0;
for (i = 1; i <= mesh.GetNOpenSegments(); i++)
{
int si = mesh.GetOpenSegment (i).si;
if (si >= 1 && si <= mesh.GetNFD())
{
opensegsperface.Elem(si)++;
}
else
{
cerr << "illegal face index" << endl;
}
}
double starttime = GetTime (); double starttime = GetTime ();
mesh.SurfaceArea().ReCalc();
int oldnp = mesh.GetNP();
Array<int,PointIndex::BASE> compress(mesh.GetNP());
Array<PointIndex> icompress;
for (int fnr = 1; fnr <= mesh.GetNFD(); fnr++) for (int fnr = 1; fnr <= mesh.GetNFD(); fnr++)
if (opensegsperface.Get(fnr)) {
{ if (!opensegsperface[fnr]) continue;
if (multithread.terminate) if (multithread.terminate) return;
return;
PrintMessage(5,"Meshing surface ", fnr, "/", mesh.GetNFD());
PrintMessage(5,"Meshing surface ", fnr, "/", mesh.GetNFD()); MeshingSTLSurface meshing (geom, mparam);
MeshingSTLSurface meshing (geom, mparam); meshing.SetStartTime (starttime);
meshing.SetStartTime (starttime); compress = 0;
icompress.SetSize(0);
for (i = 1; i <= mesh.GetNP(); i++) int cntused = 0;
for (int i = 1; i <= meshsp.Size(); i++)
if (meshsp.Elem(i))
{ {
/* compress[i] = ++cntused;
spfound = 0; icompress.Append(i);
for (j = 1; j <= spiralps.Size(); j++) }
{
if (Dist2(geom.GetPoint(spiralps.Get(j)),mesh.Point(i)) < 1e-20) for (int i = 1; i <= mesh.GetNOpenSegments(); i++)
{spfound = 1; sppointnum = spiralps.Get(j);} {
const Segment & seg = mesh.GetOpenSegment (i);
if (seg.si == fnr)
for (int j = 0; j < 2; j++)
if (compress[seg[j]] == 0)
{
compress[seg[j]] = ++cntused;
icompress.Append(seg[j]);
} }
*/ }
sppointnum = 0;
if (i <= meshsp.Size()) // for (int i = 1; i <= oldnp; i++) compress[i] = i;
sppointnum = meshsp.Get(i);
/*
//spfound = 0; // for (int i = 1; i <= mesh.GetNP(); i++)
for (int i = 1; i <= oldnp; i++)
{
int sppointnum = meshsp.Get(i);
if (sppointnum) if (sppointnum)
{ {
MultiPointGeomInfo mgi; MultiPointGeomInfo mgi;
int ntrigs = geom.NOTrigsPerPoint(sppointnum); int ntrigs = geom.NOTrigsPerPoint(sppointnum);
spcnt++; spcnt++;
for (j = 0; j < ntrigs; j++) for (int j = 0; j < ntrigs; j++)
{
PointGeomInfo gi;
gi.trignum = geom.TrigPerPoint(sppointnum, j+1);
mgi.AddPointGeomInfo (gi);
}
// Einfuegen von ConePoint: Point bekommt alle
// Dreiecke (werden dann intern kopiert)
// Ein Segment zum ConePoint muss vorhanden sein !!!
if (compress[i])
meshing.AddPoint (mesh.Point(i), i, &mgi);
}
else
{
if (compress[i])
meshing.AddPoint (mesh.Point(i), i);
}
}
*/
for (int hi = 0; hi < icompress.Size(); hi++)
{
PointIndex i = icompress[hi];
int sppointnum = meshsp.Get(i);
if (sppointnum)
{
MultiPointGeomInfo mgi;
int ntrigs = geom.NOTrigsPerPoint(sppointnum);
spcnt++;
for (int j = 0; j < ntrigs; j++)
{ {
PointGeomInfo gi; PointGeomInfo gi;
gi.trignum = geom.TrigPerPoint(sppointnum, j+1); gi.trignum = geom.TrigPerPoint(sppointnum, j+1);
@ -644,35 +678,36 @@ void STLSurfaceMeshing1 (STLGeometry & geom,
// Ein Segment zum ConePoint muss vorhanden sein !!! // Ein Segment zum ConePoint muss vorhanden sein !!!
meshing.AddPoint (mesh.Point(i), i, &mgi); meshing.AddPoint (mesh.Point(i), i, &mgi);
} }
else else
{ {
meshing.AddPoint (mesh.Point(i), i); meshing.AddPoint (mesh.Point(i), i);
} }
} }
for (i = 1; i <= mesh.GetNOpenSegments(); i++)
{
const Segment & seg = mesh.GetOpenSegment (i);
if (seg.si == fnr)
meshing.AddBoundaryElement (seg[0], seg[1], seg.geominfo[0], seg.geominfo[1]);
}
PrintMessage(3,"start meshing, trialcnt = ", retrynr);
/*
(*testout) << "start meshing with h = " << h << endl;
*/
meshing.GenerateMesh (mesh, mparam, h, fnr); // face index
extern void Render(); for (int i = 1; i <= mesh.GetNOpenSegments(); i++)
Render(); {
} const Segment & seg = mesh.GetOpenSegment (i);
if (seg.si == fnr)
meshing.AddBoundaryElement (compress[seg[0]], compress[seg[1]],
seg.geominfo[0], seg.geominfo[1]);
}
PrintMessage(3,"start meshing, trialcnt = ", retrynr);
/*
(*testout) << "start meshing with h = " << h << endl;
*/
meshing.GenerateMesh (mesh, mparam, h, fnr); // face index
extern void Render();
Render();
}
NgProfiler::Print(stdout);
mesh.CalcSurfacesOfNode(); mesh.CalcSurfacesOfNode();
} }

18
libsrc/stlgeom/stlgeom.cpp
View File

@ -41,7 +41,7 @@ void STLMeshing (STLGeometry & geom,
lineendpoints(), spiralpoints(), selectedmultiedge() lineendpoints(), spiralpoints(), selectedmultiedge()
*/ */
{ {
edgedata = new STLEdgeDataList(*this); edgedata = new STLEdgeDataList(*this);
externaledges.SetSize(0); externaledges.SetSize(0);
Clear(); Clear();
meshchart = 0; // initialize all ?? JS meshchart = 0; // initialize all ?? JS
@ -55,6 +55,7 @@ void STLMeshing (STLGeometry & geom,
status = STL_GOOD; status = STL_GOOD;
statustext = "Good Geometry"; statustext = "Good Geometry";
smoothedges = NULL; smoothedges = NULL;
area = -1;
} }
STLGeometry :: ~STLGeometry() STLGeometry :: ~STLGeometry()
@ -2004,13 +2005,11 @@ void STLGeometry :: Clear()
double STLGeometry :: Area() double STLGeometry :: Area()
{ {
double ar = 0; if (area >= 0) return area;
int i; area = 0;
for (i = 1; i <= GetNT(); i++) for (int i = 1; i <= GetNT(); i++)
{ area += GetTriangle(i).Area(points);
ar += GetTriangle(i).Area(points); return area;
}
return ar;
} }
double STLGeometry :: GetAngle(int t1, int t2) double STLGeometry :: GetAngle(int t1, int t2)
@ -3106,7 +3105,7 @@ int STLGeometry :: IsSmoothEdge (int pi1, int pi2) const
/*
//function is not used now //function is not used now
int IsInArray(int n, const Array<int>& ia) int IsInArray(int n, const Array<int>& ia)
{ {
@ -3117,6 +3116,7 @@ int IsInArray(int n, const Array<int>& ia)
} }
return 0; return 0;
} }
*/
void STLGeometry :: AddConeAndSpiralEdges() void STLGeometry :: AddConeAndSpiralEdges()
{ {

14
libsrc/stlgeom/stlgeom.hpp
View File

@ -26,8 +26,17 @@
namespace netgen namespace netgen
{ {
extern int IsInArray(int n, const Array<int>& ia); inline int IsInArray(int n, const Array<int>& ia)
extern int AddIfNotExists(Array<int>& list, int x); {
return ia.Contains(n);
}
inline bool AddIfNotExists(Array<int>& list, int x)
{
if (list.Contains(x)) return false;
list.Append(x);
return true;
}
extern DLL_HEADER MeshingParameters mparam; extern DLL_HEADER MeshingParameters mparam;
@ -166,6 +175,7 @@ namespace netgen
Array<STLLine*> meshlines; Array<STLLine*> meshlines;
Array<Point3d> meshpoints; Array<Point3d> meshpoints;
double area;
public: public:
STLGeometry(); STLGeometry();
virtual ~STLGeometry(); virtual ~STLGeometry();

59
libsrc/stlgeom/stlgeomchart.cpp
View File

@ -22,7 +22,6 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
int timer1 = NgProfiler::CreateTimer ("makeatlas"); int timer1 = NgProfiler::CreateTimer ("makeatlas");
int timer2 = NgProfiler::CreateTimer ("makeatlas - part 2"); int timer2 = NgProfiler::CreateTimer ("makeatlas - part 2");
int timer3 = NgProfiler::CreateTimer ("makeatlas - part 3"); int timer3 = NgProfiler::CreateTimer ("makeatlas - part 3");
int timer4 = NgProfiler::CreateTimer ("makeatlas - part 4");
PushStatusF("Make Atlas"); PushStatusF("Make Atlas");
@ -33,7 +32,8 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
//speedup for make atlas //speedup for make atlas
if (GetNT() > 50000) if (GetNT() > 50000)
mesh.SetGlobalH(0.05*Dist (boundingbox.PMin(), boundingbox.PMax())); mesh.SetGlobalH(min2 (0.05*Dist (boundingbox.PMin(), boundingbox.PMax()),
mparam.maxh));
atlas.SetSize(0); atlas.SetSize(0);
ClearSpiralPoints(); ClearSpiralPoints();
@ -53,15 +53,15 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
double sinchartangle = sin(chartangle); double sinchartangle = sin(chartangle);
double sinouterchartangle = sin(outerchartangle); double sinouterchartangle = sin(outerchartangle);
Array<int> outermark(GetNT()); //marks all trigs form actual outer region Array<int> outermark(GetNT()); //marks all trigs form actual outer region
Array<int> outertested(GetNT()); //marks tested trigs for outer region Array<int> outertested(GetNT()); //marks tested trigs for outer region
Array<int> pointstochart(GetNP()); //point in chart becomes chartnum Array<int> pointstochart(GetNP()); //point in chart becomes chartnum
Array<int> innerpointstochart(GetNP()); //point in chart becomes chartnum Array<int> innerpointstochart(GetNP()); //point in chart becomes chartnum
Array<int> chartpoints; //point in chart becomes chartnum Array<int> chartpoints; //point in chart becomes chartnum
Array<int> innerchartpoints; Array<int> innerchartpoints;
Array<int> dirtycharttrigs; Array<int> dirtycharttrigs;
Array<int> chartdistacttrigs (GetNT()); //outercharttrigs Array<int> chartdistacttrigs (GetNT()); //outercharttrigs
chartdistacttrigs = 0; chartdistacttrigs = 0;
@ -71,8 +71,6 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
Array<int> chartpointchecked(GetNP()); //for dirty-chart-trigs Array<int> chartpointchecked(GetNP()); //for dirty-chart-trigs
outermark.SetSize(GetNT());
outertested.SetSize(GetNT());
pointstochart.SetSize(GetNP()); pointstochart.SetSize(GetNP());
innerpointstochart.SetSize(GetNP()); innerpointstochart.SetSize(GetNP());
chartmark.SetSize(GetNT()); chartmark.SetSize(GetNT());
@ -117,21 +115,7 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
//find unmarked trig //find unmarked trig
int prelastunmarked = lastunmarked; int prelastunmarked = lastunmarked;
/*
int j = lastunmarked;
bool found = 0;
while (j <= GetNT())
{
if (!GetMarker(j))
{
found = 1;
lastunmarked = j;
break;
}
else
j++;
}
*/
bool found = false; bool found = false;
for (int j = lastunmarked; j <= GetNT(); j++) for (int j = lastunmarked; j <= GetNT(); j++)
if (!GetMarker(j)) if (!GetMarker(j))
@ -255,15 +239,6 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
if (!accepted) {break;} if (!accepted) {break;}
} }
/*
mindist = 1E50;
for (int ii = 1; ii <= 3; ii++)
{
tdist = Dist(GetPoint(GetTriangle(nt).PNum(ii)),startp);
if (tdist < mindist) {mindist = tdist;}
}
if (mindist > maxdist1) {accepted = 0;}
*/
if (accepted) if (accepted)
{ {
@ -337,16 +312,7 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
outertested.Elem(nt) = chartnum; outertested.Elem(nt) = chartnum;
Vec<3> n2 = GetTriangle(nt).Normal(); Vec<3> n2 = GetTriangle(nt).Normal();
/*
double ang;
ang = Angle(n2,sn);
if (ang < -M_PI*0.5) {ang += 2*M_PI;}
(*testout) << "ang < ocharang = " << (fabs(ang) <= outerchartangle);
(*testout) << " = " << ( (n2 * sn) >= cosouterchartangle) << endl;
// if (fabs(ang) <= outerchartangle)
*/
//abfragen, ob noch im tolerierten Winkel //abfragen, ob noch im tolerierten Winkel
if ( (n2 * sn) >= cosouterchartangle ) if ( (n2 * sn) >= cosouterchartangle )
{ {
@ -361,8 +327,6 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
//zurueckweisen, falls eine Spiralartige outerchart entsteht //zurueckweisen, falls eine Spiralartige outerchart entsteht
// NgProfiler::StartTimer (timer4);
//find overlapping charts exacter: //find overlapping charts exacter:
//do not check dirty trigs! //do not check dirty trigs!
if (spiralcheckon && !isdirtytrig) if (spiralcheckon && !isdirtytrig)
@ -388,7 +352,6 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
if (!accepted) break; if (!accepted) break;
} }
// NgProfiler::StopTimer (timer4);
// outer chart is only small environment of // outer chart is only small environment of
// inner chart: // inner chart:
@ -409,7 +372,6 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
{ {
Point<3> pt = GetPoint(ntrig.PNum(k)); Point<3> pt = GetPoint(ntrig.PNum(k));
double h2 = sqr(mesh.GetH(pt)); double h2 = sqr(mesh.GetH(pt));
for (int l = 1; l <= innerchartpoints.Size(); l++) for (int l = 1; l <= innerchartpoints.Size(); l++)
{ {
double tdist = double tdist =
@ -477,8 +439,9 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
lastunmarked = prelastunmarked; lastunmarked = prelastunmarked;
} }
//calculate an estimate meshsize, not to produce to large outercharts, with factor 2 larger! //calculate an estimate meshsize, not to produce too large outercharts, with factor 2 larger!
RestrictHChartDistOneChart(chartnum, chartdistacttrigs, mesh, h, 0.5, atlasminh); RestrictHChartDistOneChart(chartnum, chartdistacttrigs, mesh, h, 0.5, atlasminh);
// NgProfiler::Print(stdout);
} }
NgProfiler::StopTimer (timer1); NgProfiler::StopTimer (timer1);
@ -610,6 +573,7 @@ int STLGeometry :: AtlasMade() const
} }
/*
//return 1 if not exists //return 1 if not exists
int AddIfNotExists(Array<int>& list, int x) int AddIfNotExists(Array<int>& list, int x)
{ {
@ -621,6 +585,7 @@ int AddIfNotExists(Array<int>& list, int x)
list.Append(x); list.Append(x);
return 1; return 1;
} }
*/
void STLGeometry :: GetInnerChartLimes(Array<twoint>& limes, int chartnum) void STLGeometry :: GetInnerChartLimes(Array<twoint>& limes, int chartnum)
{ {

109
libsrc/stlgeom/stlgeommesh.cpp
View File

@ -297,16 +297,13 @@ void STLGeometry :: PrepareSurfaceMeshing()
{ {
meshchart = -1; //clear no old chart meshchart = -1; //clear no old chart
meshcharttrigs.SetSize(GetNT()); meshcharttrigs.SetSize(GetNT());
int i; meshcharttrigs = 0;
for (i = 1; i <= GetNT(); i++)
{meshcharttrigs.Elem(i) = 0;}
} }
void STLGeometry::GetMeshChartBoundary (Array<Point2d > & apoints, void STLGeometry::GetMeshChartBoundary (Array<Point2d > & apoints,
Array<Point3d > & points3d, Array<Point3d > & points3d,
Array<INDEX_2> & alines, double h) Array<INDEX_2> & alines, double h)
{ {
int i, j;
twoint seg, newseg; twoint seg, newseg;
int zone; int zone;
Point<2> p2; Point<2> p2;
@ -314,11 +311,11 @@ void STLGeometry::GetMeshChartBoundary (Array<Point2d > & apoints,
const STLChart& chart = GetChart(meshchart); const STLChart& chart = GetChart(meshchart);
for (i = 1; i <= chart.GetNOLimit(); i++) for (int i = 1; i <= chart.GetNOLimit(); i++)
{ {
seg = chart.GetOLimit(i); seg = chart.GetOLimit(i);
INDEX_2 i2; INDEX_2 i2;
for (j = 1; j <= 2; j++) for (int j = 1; j <= 2; j++)
{ {
int pi = (j == 1) ? seg.i1 : seg.i2; int pi = (j == 1) ? seg.i1 : seg.i2;
int lpi; int lpi;
@ -358,7 +355,7 @@ void STLGeometry::GetMeshChartBoundary (Array<Point2d > & apoints,
*/ */
} }
for (i = 1; i <= chart.GetNOLimit(); i++) for (int i = 1; i <= chart.GetNOLimit(); i++)
{ {
seg = chart.GetOLimit(i); seg = chart.GetOLimit(i);
ha_points.Elem(seg.i1) = 0; ha_points.Elem(seg.i1) = 0;
@ -1071,12 +1068,9 @@ void STLGeometry :: RestrictLocalH(class Mesh & mesh, double gh)
//berechne minimale distanz von chart zu einem nicht-outerchart-punkt in jedem randpunkt einer chart //berechne minimale distanz von chart zu einem nicht-outerchart-punkt in jedem randpunkt einer chart
Array<int> acttrigs; //outercharttrigs Array<int> acttrigs(GetNT()); //outercharttrigs
acttrigs.SetSize(GetNT()); acttrigs = 0;
for (i = 1; i <= GetNT(); i++)
{
acttrigs.Elem(i) = 0;
}
for (i = 1; i <= GetNOCharts(); i++) for (i = 1; i <= GetNOCharts(); i++)
{ {
SetThreadPercent((double)i/(double)GetNOCharts()*100.); SetThreadPercent((double)i/(double)GetNOCharts()*100.);
@ -1087,6 +1081,7 @@ void STLGeometry :: RestrictLocalH(class Mesh & mesh, double gh)
} }
PopStatus(); PopStatus();
NgProfiler::Print(stdout);
} }
if (stlparam.resthlinelengthenable) if (stlparam.resthlinelengthenable)
@ -1124,13 +1119,14 @@ void STLGeometry :: RestrictLocalH(class Mesh & mesh, double gh)
void STLGeometry :: RestrictHChartDistOneChart(int chartnum, Array<int>& acttrigs, void STLGeometry :: RestrictHChartDistOneChart(int chartnum, Array<int>& acttrigs,
class Mesh & mesh, double gh, double fact, double minh) class Mesh & mesh, double gh, double fact, double minh)
{ {
int i = chartnum; static int timer1 = NgProfiler::CreateTimer ("restrictH OneChart 1");
int j; static int timer2 = NgProfiler::CreateTimer ("restrictH OneChart 2");
static int timer3 = NgProfiler::CreateTimer ("restrictH OneChart 3");
NgProfiler::StartTimer (timer1);
double limessafety = stlparam.resthchartdistfac*fact; // original: 2 double limessafety = stlparam.resthchartdistfac*fact; // original: 2
double localh; double localh;
double f1,f2;
// mincalch = 1E10; // mincalch = 1E10;
//maxcalch = -1E10; //maxcalch = -1E10;
Array<int> limes1; Array<int> limes1;
@ -1146,8 +1142,8 @@ void STLGeometry :: RestrictHChartDistOneChart(int chartnum, Array<int>& acttrig
int divisions = 10; int divisions = 10;
int k, t, nt, np1, np2; int np1, np2;
Point3d p3p1, p3p2; // Point3d p3p1, p3p2;
STLTriangle tt; STLTriangle tt;
limes1.SetSize(0); limes1.SetSize(0);
@ -1158,24 +1154,24 @@ void STLGeometry :: RestrictHChartDistOneChart(int chartnum, Array<int>& acttrig
plimes2trigs.SetSize(0); plimes2trigs.SetSize(0);
plimes1origin.SetSize(0); plimes1origin.SetSize(0);
STLChart& chart = GetChart(i); STLChart& chart = GetChart(chartnum);
chart.ClearOLimit(); chart.ClearOLimit();
chart.ClearILimit(); chart.ClearILimit();
for (j = 1; j <= chart.GetNChartT(); j++) for (int j = 1; j <= chart.GetNChartT(); j++)
{ {
t = chart.GetChartTrig(j); int t = chart.GetChartTrig(j);
tt = GetTriangle(t); tt = GetTriangle(t);
for (k = 1; k <= 3; k++) for (int k = 1; k <= 3; k++)
{ {
nt = NeighbourTrig(t,k); int nt = NeighbourTrig(t,k);
if (GetChartNr(nt) != i) if (GetChartNr(nt) != chartnum)
{ {
tt.GetNeighbourPoints(GetTriangle(nt),np1,np2); tt.GetNeighbourPoints(GetTriangle(nt),np1,np2);
if (!IsEdge(np1,np2) && !GetSpiralPoint(np1) && !GetSpiralPoint(np2)) if (!IsEdge(np1,np2) && !GetSpiralPoint(np1) && !GetSpiralPoint(np2))
{ {
p3p1 = GetPoint(np1); Point3d p3p1 = GetPoint(np1);
p3p2 = GetPoint(np2); Point3d p3p2 = GetPoint(np2);
if (AddIfNotExists(limes1,np1)) if (AddIfNotExists(limes1,np1))
{ {
plimes1.Append(p3p1); plimes1.Append(p3p1);
@ -1192,8 +1188,8 @@ void STLGeometry :: RestrictHChartDistOneChart(int chartnum, Array<int>& acttrig
for (int di = 1; di <= divisions; di++) for (int di = 1; di <= divisions; di++)
{ {
f1 = (double)di/(double)(divisions+1.); double f1 = (double)di/(double)(divisions+1.);
f2 = (divisions+1.-(double)di)/(double)(divisions+1.); double f2 = (divisions+1.-(double)di)/(double)(divisions+1.);
plimes1.Append(Point3d(p3p1.X()*f1+p3p2.X()*f2, plimes1.Append(Point3d(p3p1.X()*f1+p3p2.X()*f2,
p3p1.Y()*f1+p3p2.Y()*f2, p3p1.Y()*f1+p3p2.Y()*f2,
@ -1206,28 +1202,27 @@ void STLGeometry :: RestrictHChartDistOneChart(int chartnum, Array<int>& acttrig
} }
} }
NgProfiler::StopTimer (timer1);
for (j = 1; j <= chart.GetNT(); j++)
{
acttrigs.Elem(chart.GetTrig(j)) = i;
}
for (j = 1; j <= chart.GetNOuterT(); j++)
{
t = chart.GetOuterTrig(j);
tt = GetTriangle(t);
for (k = 1; k <= 3; k++)
{
nt = NeighbourTrig(t,k);
if (acttrigs.Get(nt) != i) NgProfiler::StartTimer (timer2);
for (int j = 1; j <= chart.GetNT(); j++)
acttrigs.Elem(chart.GetTrig(j)) = chartnum;
for (int j = 1; j <= chart.GetNOuterT(); j++)
{
int t = chart.GetOuterTrig(j);
tt = GetTriangle(t);
for (int k = 1; k <= 3; k++)
{
int nt = NeighbourTrig(t,k);
if (acttrigs.Get(nt) != chartnum)
{ {
tt.GetNeighbourPoints(GetTriangle(nt),np1,np2); tt.GetNeighbourPoints(GetTriangle(nt),np1,np2);
if (!IsEdge(np1,np2)) if (!IsEdge(np1,np2))
{ {
p3p1 = GetPoint(np1); Point3d p3p1 = GetPoint(np1);
p3p2 = GetPoint(np2); Point3d p3p2 = GetPoint(np2);
if (AddIfNotExists(limes2,np1)) {plimes2.Append(p3p1); plimes2trigs.Append(t);} if (AddIfNotExists(limes2,np1)) {plimes2.Append(p3p1); plimes2trigs.Append(t);}
if (AddIfNotExists(limes2,np2)) {plimes2.Append(p3p2); plimes2trigs.Append(t);} if (AddIfNotExists(limes2,np2)) {plimes2.Append(p3p2); plimes2trigs.Append(t);}
@ -1235,8 +1230,8 @@ void STLGeometry :: RestrictHChartDistOneChart(int chartnum, Array<int>& acttrig
for (int di = 1; di <= divisions; di++) for (int di = 1; di <= divisions; di++)
{ {
f1 = (double)di/(double)(divisions+1.); double f1 = (double)di/(double)(divisions+1.);
f2 = (divisions+1.-(double)di)/(double)(divisions+1.); double f2 = (divisions+1.-(double)di)/(double)(divisions+1.);
plimes2.Append(Point3d(p3p1.X()*f1+p3p2.X()*f2, plimes2.Append(Point3d(p3p1.X()*f1+p3p2.X()*f2,
p3p1.Y()*f1+p3p2.Y()*f2, p3p1.Y()*f1+p3p2.Y()*f2,
@ -1248,24 +1243,25 @@ void STLGeometry :: RestrictHChartDistOneChart(int chartnum, Array<int>& acttrig
} }
} }
NgProfiler::StopTimer (timer2);
NgProfiler::StartTimer (timer3);
double chartmindist = 1E50; double chartmindist = 1E50;
if (plimes2.Size()) if (plimes2.Size())
{ {
Box3d bbox; Box3d bbox;
bbox.SetPoint (plimes2.Get(1)); bbox.SetPoint (plimes2.Get(1));
for (j = 2; j <= plimes2.Size(); j++) for (int j = 2; j <= plimes2.Size(); j++)
bbox.AddPoint (plimes2.Get(j)); bbox.AddPoint (plimes2.Get(j));
Point3dTree stree(bbox.PMin(), bbox.PMax()); Point3dTree stree(bbox.PMin(), bbox.PMax());
for (j = 1; j <= plimes2.Size(); j++) for (int j = 1; j <= plimes2.Size(); j++)
stree.Insert (plimes2.Get(j), j); stree.Insert (plimes2.Get(j), j);
Array<int> foundpts; Array<int> foundpts;
for (j = 1; j <= plimes1.Size(); j++) for (int j = 1; j <= plimes1.Size(); j++)
{ {
double mindist = 1E50; double mindist = 1E50;
double dist;
const Point3d & ap1 = plimes1.Get(j); const Point3d & ap1 = plimes1.Get(j);
double boxs = mesh.GetH (plimes1.Get(j)) * limessafety; double boxs = mesh.GetH (plimes1.Get(j)) * limessafety;
@ -1278,12 +1274,9 @@ void STLGeometry :: RestrictHChartDistOneChart(int chartnum, Array<int>& acttrig
for (int kk = 1; kk <= foundpts.Size(); kk++) for (int kk = 1; kk <= foundpts.Size(); kk++)
{ {
k = foundpts.Get(kk); int k = foundpts.Get(kk);
dist = Dist2(plimes1.Get(j),plimes2.Get(k)); double dist = Dist2(plimes1.Get(j),plimes2.Get(k));
if (dist < mindist) if (dist < mindist) mindist = dist;
{
mindist = dist;
}
} }
/* /*
@ -1325,7 +1318,7 @@ void STLGeometry :: RestrictHChartDistOneChart(int chartnum, Array<int>& acttrig
} }
} }
} }
NgProfiler::StopTimer (timer3);
} }

35
libsrc/stlgeom/stlline.cpp
View File

@ -648,6 +648,13 @@ STLLine* STLLine :: Mesh(const Array<Point<3> >& ap,
Array<Point3d>& mp, double ghi, Array<Point3d>& mp, double ghi,
class Mesh& mesh) const class Mesh& mesh) const
{ {
static int timer1a = NgProfiler::CreateTimer ("mesh stl-line 1a");
static int timer1b = NgProfiler::CreateTimer ("mesh stl-line 1b");
static int timer2 = NgProfiler::CreateTimer ("mesh stl-line 2");
static int timer3 = NgProfiler::CreateTimer ("mesh stl-line 3");
NgProfiler::StartTimer (timer1a);
STLLine* line = new STLLine(geometry); STLLine* line = new STLLine(geometry);
//stlgh = ghi; //uebergangsloesung!!!! //stlgh = ghi; //uebergangsloesung!!!!
@ -659,8 +666,6 @@ STLLine* STLLine :: Mesh(const Array<Point<3> >& ap,
int ind; int ind;
Point3d p; Point3d p;
int i, j;
Box<3> bbox; Box<3> bbox;
GetBoundingBox (ap, bbox); GetBoundingBox (ap, bbox);
double diam = bbox.Diam(); double diam = bbox.Diam();
@ -668,7 +673,7 @@ STLLine* STLLine :: Mesh(const Array<Point<3> >& ap,
double minh = mesh.LocalHFunction().GetMinH (bbox.PMin(), bbox.PMax()); double minh = mesh.LocalHFunction().GetMinH (bbox.PMin(), bbox.PMax());
double maxseglen = 0; double maxseglen = 0;
for (i = 1; i <= GetNS(); i++) for (int i = 1; i <= GetNS(); i++)
maxseglen = max2 (maxseglen, GetSegLen (ap, i)); maxseglen = max2 (maxseglen, GetSegLen (ap, i));
int nph = 10+int(maxseglen / minh); //anzahl der integralauswertungen pro segment int nph = 10+int(maxseglen / minh); //anzahl der integralauswertungen pro segment
@ -676,11 +681,14 @@ STLLine* STLLine :: Mesh(const Array<Point<3> >& ap,
Array<double> inthi(GetNS()*nph); Array<double> inthi(GetNS()*nph);
Array<double> curvelen(GetNS()*nph); Array<double> curvelen(GetNS()*nph);
NgProfiler::StopTimer (timer1a);
NgProfiler::StartTimer (timer1b);
for (i = 1; i <= GetNS(); i++)
for (int i = 1; i <= GetNS(); i++)
{ {
//double seglen = GetSegLen(ap,i); //double seglen = GetSegLen(ap,i);
for (j = 1; j <= nph; j++) for (int j = 1; j <= nph; j++)
{ {
p = GetPointInDist(ap,dist,ind); p = GetPointInDist(ap,dist,ind);
//h = GetH(p,dist/len); //h = GetH(p,dist/len);
@ -709,7 +717,7 @@ STLLine* STLLine :: Mesh(const Array<Point<3> >& ap,
double fact = inthl/(double)inthlint; double fact = inthl/(double)inthlint;
dist = 0; dist = 0;
j = 1; int j = 1;
p = ap.Get(StartP()); p = ap.Get(StartP());
@ -721,18 +729,20 @@ STLLine* STLLine :: Mesh(const Array<Point<3> >& ap,
line->AddRightTrig(GetRightTrig(segn)); line->AddRightTrig(GetRightTrig(segn));
line->AddDist(dist); line->AddDist(dist);
NgProfiler::StopTimer (timer1b);
NgProfiler::StartTimer (timer2);
inthl = 0; //restart each meshseg inthl = 0; //restart each meshseg
for (i = 1; i <= inthlint; i++) for (int i = 1; i <= inthlint; i++)
{ {
while (inthl < 1.000000001 && j <= inthi.Size()) while (inthl < 1.000000001 && j <= inthi.Size())
// while (inthl-1. < 1e-9) && j <= inthi.Size())
{ {
inthl += inthi.Get(j)/fact; inthl += inthi.Get(j)/fact;
dist += curvelen.Get(j); dist += curvelen.Get(j);
j++; j++;
} }
//went to far: //went too far:
j--; j--;
double tofar = (inthl - 1)/inthi.Get(j); double tofar = (inthl - 1)/inthi.Get(j);
inthl -= tofar*inthi.Get(j); inthl -= tofar*inthi.Get(j);
@ -759,6 +769,10 @@ STLLine* STLLine :: Mesh(const Array<Point<3> >& ap,
j++; j++;
} }
NgProfiler::StopTimer (timer2);
NgProfiler::StartTimer (timer3);
p = ap.Get(EndP()); p = ap.Get(EndP());
pn = AddPointIfNotExists(mp, p, 1e-10*diam); pn = AddPointIfNotExists(mp, p, 1e-10*diam);
segn = GetNS(); segn = GetNS();
@ -776,6 +790,9 @@ STLLine* STLLine :: Mesh(const Array<Point<3> >& ap,
(*testout) << "line, " << ap.Get(StartP()) << "-" << ap.Get(EndP()) (*testout) << "line, " << ap.Get(StartP()) << "-" << ap.Get(EndP())
<< " len = " << Dist (ap.Get(StartP()), ap.Get(EndP())) << endl; << " len = " << Dist (ap.Get(StartP()), ap.Get(EndP())) << endl;
*/ */
NgProfiler::StopTimer (timer3);
return line; return line;
} }
} }

3
libsrc/stlgeom/stltool.cpp
View File

@ -15,8 +15,9 @@ namespace netgen
//add a point into a pointlist, return pointnumber //add a point into a pointlist, return pointnumber
int AddPointIfNotExists(Array<Point3d>& ap, const Point3d& p, double eps) int AddPointIfNotExists(Array<Point3d>& ap, const Point3d& p, double eps)
{ {
double eps2 = sqr(eps);
for (int i = 1; i <= ap.Size(); i++) for (int i = 1; i <= ap.Size(); i++)
if (Dist(ap.Get(i),p) <= eps ) if (Dist2(ap.Get(i),p) <= eps2 )
return i; return i;
return ap.Append(p); return ap.Append(p);
} }

3
libsrc/visualization/vsmesh.cpp
View File

@ -219,8 +219,6 @@ namespace netgen
#ifdef PARALLELGL #ifdef PARALLELGL
if (ntasks > 1 && vispar.drawtetsdomain > 0 && vispar.drawtetsdomain < ntasks) if (ntasks > 1 && vispar.drawtetsdomain > 0 && vispar.drawtetsdomain < ntasks)
// for (int dest = 1; dest < ntasks; dest++)
// if (vispar.drawtetsdomain == dest)
glCallList (par_linelists[vispar.drawtetsdomain]); glCallList (par_linelists[vispar.drawtetsdomain]);
else else
#endif #endif
@ -230,7 +228,6 @@ namespace netgen
glDisable (GL_POLYGON_OFFSET_LINE); glDisable (GL_POLYGON_OFFSET_LINE);
} }
if (vispar.drawidentified) if (vispar.drawidentified)
{ {
glPolygonOffset (1, -1); glPolygonOffset (1, -1);