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

parallel fixes

Browse Source
This commit is contained in:
Joachim Schoeberl 2009-01-25 15:04:33 +00:00
parent f25b1d89f0
commit 38a9ae19b4
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/csg/csgeom.cpp
View File

@ -1062,7 +1062,7 @@ namespace netgen
// IndexSet iset(GetNSurf()); // IndexSet iset(GetNSurf());
locsol -> GetSurfaceIndices (iset); locsol -> GetSurfaceIndices (iset);
const Array<int> & lsurfi = iset.Array(); const Array<int> & lsurfi = iset.GetArray();
locsol -> IterateSolid (urpi); locsol -> IterateSolid (urpi);

2
libsrc/general/seti.hpp
View File

@ -38,7 +38,7 @@ public:
void Del (int ind); void Del (int ind);
void Clear (); void Clear ();
const Array<int> & Array() { return set; } const Array<int> & GetArray() { return set; }
}; };
#endif #endif

30
libsrc/meshing/delaunay.cpp
View File

@ -348,13 +348,13 @@ namespace netgen
{ {
changed = 0; changed = 0;
starti = nstarti; starti = nstarti;
nstarti = insphere.Array().Size()+1; nstarti = insphere.GetArray().Size()+1;
// if point in sphere, then it is also closesphere // if point in sphere, then it is also closesphere
for (int j = starti; j < nstarti; j++) for (int j = starti; j < nstarti; j++)
{ {
int helind = insphere.Array().Get(j); int helind = insphere.GetArray().Get(j);
if (!closesphere.IsIn (helind)) if (!closesphere.IsIn (helind))
closesphere.Add (helind); closesphere.Add (helind);
} }
@ -362,7 +362,7 @@ namespace netgen
// add connected spheres to insphere - list // add connected spheres to insphere - list
for (int j = starti; j < nstarti; j++) for (int j = starti; j < nstarti; j++)
{ {
list.GetList (insphere.Array().Get(j), connected); list.GetList (insphere.GetArray().Get(j), connected);
for (int k = 0; k < connected.Size(); k++) for (int k = 0; k < connected.Size(); k++)
{ {
int celind = connected[k]; int celind = connected[k];
@ -380,7 +380,7 @@ namespace netgen
for (int j = starti; j < nstarti; j++) for (int j = starti; j < nstarti; j++)
for (int k = 1; k <= 4; k++) for (int k = 1; k <= 4; k++)
{ {
int helind = insphere.Array().Get(j); int helind = insphere.GetArray().Get(j);
int nbind = meshnb.GetNB (helind, k); int nbind = meshnb.GetNB (helind, k);
if (nbind && !insphere.IsIn (nbind) ) if (nbind && !insphere.IsIn (nbind) )
@ -450,11 +450,11 @@ namespace netgen
Element2d face(TRIG); Element2d face(TRIG);
for (int j = 1; j <= insphere.Array().Size(); j++) for (int j = 1; j <= insphere.GetArray().Size(); j++)
for (int k = 1; k <= 4; k++) for (int k = 1; k <= 4; k++)
{ {
// int elind = insphere.Array().Get(j); // int elind = insphere.GetArray().Get(j);
int celind = insphere.Array().Get(j); int celind = insphere.GetArray().Get(j);
int nbind = meshnb.GetNB (celind, k); int nbind = meshnb.GetNB (celind, k);
if (!nbind || !insphere.IsIn (nbind)) if (!nbind || !insphere.IsIn (nbind))
@ -474,7 +474,7 @@ namespace netgen
n.Normalize(); n.Normalize();
if (n * Vec3d(mesh.Point (face[0]), if (n * Vec3d(mesh.Point (face[0]),
mesh.Point (tempels.Get(insphere.Array().Get(j))[k-1])) mesh.Point (tempels.Get(insphere.GetArray().Get(j))[k-1]))
> 0) > 0)
n *= -1; n *= -1;
@ -493,12 +493,12 @@ namespace netgen
} }
} }
meshnb.ResetFaceHT (10*insphere.Array().Size()+1); meshnb.ResetFaceHT (10*insphere.GetArray().Size()+1);
for (int j = 1; j <= insphere.Array().Size(); j++) for (int j = 1; j <= insphere.GetArray().Size(); j++)
{ {
// int elind = // int elind =
int celind = insphere.Array().Get(j); int celind = insphere.GetArray().Get(j);
meshnb.Delete (celind); meshnb.Delete (celind);
list.DeleteElement (celind); list.DeleteElement (celind);
@ -512,9 +512,9 @@ namespace netgen
int hasclose = 0; int hasclose = 0;
for (int j = 1; j <= closesphere.Array().Size(); j++) for (int j = 1; j <= closesphere.GetArray().Size(); j++)
{ {
int ind = closesphere.Array().Get(j); int ind = closesphere.GetArray().Get(j);
if (!insphere.IsIn(ind) && if (!insphere.IsIn(ind) &&
fabs (Dist2 (centers.Get (ind), newp) - radi2.Get(ind)) < 1e-8 ) fabs (Dist2 (centers.Get (ind), newp) - radi2.Get(ind)) < 1e-8 )
hasclose = 1; hasclose = 1;
@ -558,9 +558,9 @@ namespace netgen
r2 = Dist2 (*pp[0], pc); r2 = Dist2 (*pp[0], pc);
if (hasclose) if (hasclose)
for (int k = 1; k <= closesphere.Array().Size(); k++) for (int k = 1; k <= closesphere.GetArray().Size(); k++)
{ {
int csameind = closesphere.Array().Get(k); int csameind = closesphere.GetArray().Get(k);
if (!insphere.IsIn(csameind) && if (!insphere.IsIn(csameind) &&
fabs (r2 - radi2.Get(csameind)) < 1e-10 && fabs (r2 - radi2.Get(csameind)) < 1e-10 &&
Dist (pc, centers.Get(csameind)) < 1e-10) Dist (pc, centers.Get(csameind)) < 1e-10)