diff --git a/libsrc/csg/csgeom.cpp b/libsrc/csg/csgeom.cpp index c812d1a4..9a12443e 100644 --- a/libsrc/csg/csgeom.cpp +++ b/libsrc/csg/csgeom.cpp @@ -97,10 +97,10 @@ namespace netgen return hn; } - void CSGeometry :: + void CSGeometry :: PointBetween(const Point<3> & p1, const Point<3> & p2, double secpoint, - int surfi, - const PointGeomInfo & gi1, + int surfi, + const PointGeomInfo & gi1, const PointGeomInfo & gi2, Point<3> & newp, PointGeomInfo & newgi) const { @@ -116,8 +116,8 @@ namespace netgen } void CSGeometry :: PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint, - int surfi1, int surfi2, - const EdgePointGeomInfo & ap1, + int surfi1, int surfi2, + const EdgePointGeomInfo & ap1, const EdgePointGeomInfo & ap2, Point<3> & newp, EdgePointGeomInfo & newgi) const { @@ -125,8 +125,8 @@ namespace netgen //(*testout) << "hnewp " << hnewp << " s1 " << surfi1 << " s2 " << surfi2 << endl; if (surfi1 != -1 && surfi2 != -1 && surfi1 != surfi2) { - netgen::ProjectToEdge (GetSurface(surfi1), - GetSurface(surfi2), + netgen::ProjectToEdge (GetSurface(surfi1), + GetSurface(surfi2), hnewp); // (*testout) << "Pointbetween, newp = " << hnewp << endl // << ", err = " << sqrt (sqr (hnewp(0))+ sqr(hnewp(1)) + sqr (hnewp(2))) - 1 << endl; diff --git a/libsrc/csg/csgeom.hpp b/libsrc/csg/csgeom.hpp index 21407d8e..398c21bc 100644 --- a/libsrc/csg/csgeom.hpp +++ b/libsrc/csg/csgeom.hpp @@ -192,20 +192,20 @@ namespace netgen void ProjectPointEdge(INDEX surfind, INDEX surfind2, Point<3> & p) const override; Vec<3> GetNormal(int surfind, const Point<3> & p) const override; void PointBetween(const Point<3> & p1, const Point<3> & p2, - double secpoint, int surfi, - const PointGeomInfo & gi1, + double secpoint, int surfi, + const PointGeomInfo & gi1, const PointGeomInfo & gi2, Point<3> & newp, PointGeomInfo & newgi) const override; void PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint, - int surfi1, int surfi2, - const EdgePointGeomInfo & ap1, + int surfi1, int surfi2, + const EdgePointGeomInfo & ap1, const EdgePointGeomInfo & ap2, Point<3> & newp, EdgePointGeomInfo & newgi) const override; Vec<3> GetTangent (const Point<3> & p, int surfi1, int surfi2, const EdgePointGeomInfo & ap1) const override; - + int GetChangeVal() { return changeval; } void Change() { changeval++; } diff --git a/libsrc/geom2d/geometry2d.cpp b/libsrc/geom2d/geometry2d.cpp index 6d78f7d9..43282cff 100644 --- a/libsrc/geom2d/geometry2d.cpp +++ b/libsrc/geom2d/geometry2d.cpp @@ -20,9 +20,9 @@ namespace netgen delete [] materials[i]; } - void SplineGeometry2d :: PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint, - int surfi1, int surfi2, - const EdgePointGeomInfo & ap1, + void SplineGeometry2d :: PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint, + int surfi1, int surfi2, + const EdgePointGeomInfo & ap1, const EdgePointGeomInfo & ap2, Point<3> & newp, EdgePointGeomInfo & newgi) const { @@ -67,7 +67,7 @@ namespace netgen p2d = spline->GetPoint (((1-secpoint)*ap1.dist+secpoint*ap2.dist)); newdist = (1-secpoint)*ap1.dist+secpoint*ap2.dist; } - + // (*testout) << "refine 2d line, ap1.dist, ap2.dist = " << ap1.dist << ", " << ap2.dist << endl; // (*testout) << "p1, p2 = " << p1 << p2 << ", newp = " << p2d << endl; diff --git a/libsrc/geom2d/geometry2d.hpp b/libsrc/geom2d/geometry2d.hpp index 051b1487..13c1887b 100644 --- a/libsrc/geom2d/geometry2d.hpp +++ b/libsrc/geom2d/geometry2d.hpp @@ -156,10 +156,9 @@ namespace netgen ar & materials & maxh & quadmeshing & tensormeshing & layer & bcnames & elto0; } - void PointBetween(const Point<3> & p1, const Point<3> & p2, double secpoint, - int surfi, - const PointGeomInfo & gi1, + int surfi, + const PointGeomInfo & gi1, const PointGeomInfo & gi2, Point<3> & newp, PointGeomInfo & newgi) const override { @@ -168,8 +167,8 @@ namespace netgen } void PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint, - int surfi1, int surfi2, - const EdgePointGeomInfo & ap1, + int surfi1, int surfi2, + const EdgePointGeomInfo & ap1, const EdgePointGeomInfo & ap2, Point<3> & newp, EdgePointGeomInfo & newgi) const override; diff --git a/libsrc/meshing/basegeom.cpp b/libsrc/meshing/basegeom.cpp index ac3c8171..7dc12a35 100644 --- a/libsrc/meshing/basegeom.cpp +++ b/libsrc/meshing/basegeom.cpp @@ -31,10 +31,10 @@ namespace netgen case 'S': meshopt.EdgeSwapping(1); break; - case 'm': + case 'm': meshopt.ImproveMesh(mparam); break; - case 'c': + case 'c': meshopt.CombineImprove(); break; } @@ -85,17 +85,17 @@ namespace netgen MeshSurface(*mesh, mparam); mesh->CalcSurfacesOfNode(); } - + if (multithread.terminate || mparam.perfstepsend <= MESHCONST_MESHSURFACE) return 0; - + if (mparam.perfstepsstart <= MESHCONST_OPTSURFACE) OptimizeSurface(*mesh, mparam); if (multithread.terminate || mparam.perfstepsend <= MESHCONST_OPTSURFACE) return 0; - + if(mparam.perfstepsstart <= MESHCONST_MESHVOLUME) { multithread.task = "Volume meshing"; @@ -113,19 +113,18 @@ namespace netgen if (multithread.terminate || mparam.perfstepsend <= MESHCONST_MESHVOLUME) return 0; - + if (mparam.perfstepsstart <= MESHCONST_OPTVOLUME) { multithread.task = "Volume optimization"; - + OptimizeVolume (mparam, *mesh); if (multithread.terminate) return 0; } FinalizeMesh(*mesh); return 0; } - const Refinement & NetgenGeometry :: GetRefinement () const { diff --git a/libsrc/meshing/bisect.cpp b/libsrc/meshing/bisect.cpp index 1a7ebce7..9b5c770f 100644 --- a/libsrc/meshing/bisect.cpp +++ b/libsrc/meshing/bisect.cpp @@ -3554,7 +3554,7 @@ namespace netgen EdgePointGeomInfo newepgi; geo.PointBetweenEdge(mesh.Point (seg[0]), mesh.Point (seg[1]), - 0.5, seg.surfnr1, seg.surfnr2, + 0.5, seg.surfnr1, seg.surfnr2, seg.epgeominfo[0], seg.epgeominfo[1], mesh.Point (newpi), newepgi); nseg1.epgeominfo[1] = newepgi; diff --git a/libsrc/meshing/curvedelems.cpp b/libsrc/meshing/curvedelems.cpp index 49a716b9..0ffc9b7a 100644 --- a/libsrc/meshing/curvedelems.cpp +++ b/libsrc/meshing/curvedelems.cpp @@ -911,14 +911,14 @@ namespace netgen if (swap) { p = p1 + xi[j] * (p2-p1); - geo.PointBetween (p1, p2, xi[j], + geo.PointBetween (p1, p2, xi[j], surfnr[e], gi0[e], gi1[e], pp, ppgi); } else { p = p2 + xi[j] * (p1-p2); - geo.PointBetween (p2, p1, xi[j], + geo.PointBetween (p2, p1, xi[j], surfnr[e], gi1[e], gi0[e], pp, ppgi); } @@ -1053,9 +1053,9 @@ namespace netgen if (rational) { - Vec<3> tau1 = geo.GetTangent(p1, edge_surfnr2[edgenr], edge_surfnr1[edgenr], + Vec<3> tau1 = geo.GetTangent(p1, edge_surfnr2[edgenr], edge_surfnr1[edgenr], edge_gi0[edgenr]); - Vec<3> tau2 = geo.GetTangent(p2, edge_surfnr2[edgenr], edge_surfnr1[edgenr], + Vec<3> tau2 = geo.GetTangent(p2, edge_surfnr2[edgenr], edge_surfnr1[edgenr], edge_gi1[edgenr]); // p1 + alpha1 tau1 = p2 + alpha2 tau2; @@ -1127,16 +1127,16 @@ namespace netgen if (swap) { p = p1 + xi[j] * (p2-p1); - geo.PointBetweenEdge(p1, p2, xi[j], - edge_surfnr2[edgenr], edge_surfnr1[edgenr], + geo.PointBetweenEdge(p1, p2, xi[j], + edge_surfnr2[edgenr], edge_surfnr1[edgenr], edge_gi0[edgenr], edge_gi1[edgenr], pp, ppgi); } else { p = p2 + xi[j] * (p1-p2); - geo.PointBetweenEdge(p2, p1, xi[j], - edge_surfnr2[edgenr], edge_surfnr1[edgenr], + geo.PointBetweenEdge(p2, p1, xi[j], + edge_surfnr2[edgenr], edge_surfnr1[edgenr], edge_gi1[edgenr], edge_gi0[edgenr], pp, ppgi); }