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

delete trailing whitespaces in new commits

Browse Source
This commit is contained in:
Christopher Lackner 2019-10-03 12:09:13 +02:00 committed by Matthias Hochsteger
parent 4d98a6eb8c
commit fa3ae333ce
7 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsrc/csg/csgeom.cpp
View File

@ -97,10 +97,10 @@ namespace netgen
return hn; return hn;
} }
void CSGeometry :: void CSGeometry ::
PointBetween(const Point<3> & p1, const Point<3> & p2, double secpoint, PointBetween(const Point<3> & p1, const Point<3> & p2, double secpoint,
int surfi, int surfi,
const PointGeomInfo & gi1, const PointGeomInfo & gi1,
const PointGeomInfo & gi2, const PointGeomInfo & gi2,
Point<3> & newp, PointGeomInfo & newgi) const 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, void CSGeometry :: PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint,
int surfi1, int surfi2, int surfi1, int surfi2,
const EdgePointGeomInfo & ap1, const EdgePointGeomInfo & ap1,
const EdgePointGeomInfo & ap2, const EdgePointGeomInfo & ap2,
Point<3> & newp, EdgePointGeomInfo & newgi) const Point<3> & newp, EdgePointGeomInfo & newgi) const
{ {
@ -125,8 +125,8 @@ namespace netgen
//(*testout) << "hnewp " << hnewp << " s1 " << surfi1 << " s2 " << surfi2 << endl; //(*testout) << "hnewp " << hnewp << " s1 " << surfi1 << " s2 " << surfi2 << endl;
if (surfi1 != -1 && surfi2 != -1 && surfi1 != surfi2) if (surfi1 != -1 && surfi2 != -1 && surfi1 != surfi2)
{ {
netgen::ProjectToEdge (GetSurface(surfi1), netgen::ProjectToEdge (GetSurface(surfi1),
GetSurface(surfi2), GetSurface(surfi2),
hnewp); hnewp);
// (*testout) << "Pointbetween, newp = " << hnewp << endl // (*testout) << "Pointbetween, newp = " << hnewp << endl
// << ", err = " << sqrt (sqr (hnewp(0))+ sqr(hnewp(1)) + sqr (hnewp(2))) - 1 << endl; // << ", err = " << sqrt (sqr (hnewp(0))+ sqr(hnewp(1)) + sqr (hnewp(2))) - 1 << endl;

10
libsrc/csg/csgeom.hpp
View File

@ -192,20 +192,20 @@ namespace netgen
void ProjectPointEdge(INDEX surfind, INDEX surfind2, Point<3> & p) const override; void ProjectPointEdge(INDEX surfind, INDEX surfind2, Point<3> & p) const override;
Vec<3> GetNormal(int surfind, const 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, void PointBetween(const Point<3> & p1, const Point<3> & p2,
double secpoint, int surfi, double secpoint, int surfi,
const PointGeomInfo & gi1, const PointGeomInfo & gi1,
const PointGeomInfo & gi2, const PointGeomInfo & gi2,
Point<3> & newp, PointGeomInfo & newgi) const override; Point<3> & newp, PointGeomInfo & newgi) const override;
void PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint, void PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint,
int surfi1, int surfi2, int surfi1, int surfi2,
const EdgePointGeomInfo & ap1, const EdgePointGeomInfo & ap1,
const EdgePointGeomInfo & ap2, const EdgePointGeomInfo & ap2,
Point<3> & newp, EdgePointGeomInfo & newgi) const override; Point<3> & newp, EdgePointGeomInfo & newgi) const override;
Vec<3> GetTangent (const Point<3> & p, int surfi1, int surfi2, Vec<3> GetTangent (const Point<3> & p, int surfi1, int surfi2,
const EdgePointGeomInfo & ap1) const override; const EdgePointGeomInfo & ap1) const override;
int GetChangeVal() { return changeval; } int GetChangeVal() { return changeval; }
void Change() { changeval++; } void Change() { changeval++; }

8
libsrc/geom2d/geometry2d.cpp
View File

@ -20,9 +20,9 @@ namespace netgen
delete [] materials[i]; delete [] materials[i];
} }
void SplineGeometry2d :: PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint, void SplineGeometry2d :: PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint,
int surfi1, int surfi2, int surfi1, int surfi2,
const EdgePointGeomInfo & ap1, const EdgePointGeomInfo & ap1,
const EdgePointGeomInfo & ap2, const EdgePointGeomInfo & ap2,
Point<3> & newp, EdgePointGeomInfo & newgi) const Point<3> & newp, EdgePointGeomInfo & newgi) const
{ {
@ -67,7 +67,7 @@ namespace netgen
p2d = spline->GetPoint (((1-secpoint)*ap1.dist+secpoint*ap2.dist)); p2d = spline->GetPoint (((1-secpoint)*ap1.dist+secpoint*ap2.dist));
newdist = (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) << "refine 2d line, ap1.dist, ap2.dist = " << ap1.dist << ", " << ap2.dist << endl;
// (*testout) << "p1, p2 = " << p1 << p2 << ", newp = " << p2d << endl; // (*testout) << "p1, p2 = " << p1 << p2 << ", newp = " << p2d << endl;

9
libsrc/geom2d/geometry2d.hpp
View File

@ -156,10 +156,9 @@ namespace netgen
ar & materials & maxh & quadmeshing & tensormeshing & layer & bcnames & elto0; ar & materials & maxh & quadmeshing & tensormeshing & layer & bcnames & elto0;
} }
void PointBetween(const Point<3> & p1, const Point<3> & p2, double secpoint, void PointBetween(const Point<3> & p1, const Point<3> & p2, double secpoint,
int surfi, int surfi,
const PointGeomInfo & gi1, const PointGeomInfo & gi1,
const PointGeomInfo & gi2, const PointGeomInfo & gi2,
Point<3> & newp, PointGeomInfo & newgi) const override 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, void PointBetweenEdge(const Point<3> & p1, const Point<3> & p2, double secpoint,
int surfi1, int surfi2, int surfi1, int surfi2,
const EdgePointGeomInfo & ap1, const EdgePointGeomInfo & ap1,
const EdgePointGeomInfo & ap2, const EdgePointGeomInfo & ap2,
Point<3> & newp, EdgePointGeomInfo & newgi) const override; Point<3> & newp, EdgePointGeomInfo & newgi) const override;

15
libsrc/meshing/basegeom.cpp
View File

@ -31,10 +31,10 @@ namespace netgen
case 'S': case 'S':
meshopt.EdgeSwapping(1); meshopt.EdgeSwapping(1);
break; break;
case 'm': case 'm':
meshopt.ImproveMesh(mparam); meshopt.ImproveMesh(mparam);
break; break;
case 'c': case 'c':
meshopt.CombineImprove(); meshopt.CombineImprove();
break; break;
} }
@ -85,17 +85,17 @@ namespace netgen
MeshSurface(*mesh, mparam); MeshSurface(*mesh, mparam);
mesh->CalcSurfacesOfNode(); mesh->CalcSurfacesOfNode();
} }
if (multithread.terminate || mparam.perfstepsend <= MESHCONST_MESHSURFACE) if (multithread.terminate || mparam.perfstepsend <= MESHCONST_MESHSURFACE)
return 0; return 0;
if (mparam.perfstepsstart <= MESHCONST_OPTSURFACE) if (mparam.perfstepsstart <= MESHCONST_OPTSURFACE)
OptimizeSurface(*mesh, mparam); OptimizeSurface(*mesh, mparam);
if (multithread.terminate || mparam.perfstepsend <= MESHCONST_OPTSURFACE) if (multithread.terminate || mparam.perfstepsend <= MESHCONST_OPTSURFACE)
return 0; return 0;
if(mparam.perfstepsstart <= MESHCONST_MESHVOLUME) if(mparam.perfstepsstart <= MESHCONST_MESHVOLUME)
{ {
multithread.task = "Volume meshing"; multithread.task = "Volume meshing";
@ -113,19 +113,18 @@ namespace netgen
if (multithread.terminate || mparam.perfstepsend <= MESHCONST_MESHVOLUME) if (multithread.terminate || mparam.perfstepsend <= MESHCONST_MESHVOLUME)
return 0; return 0;
if (mparam.perfstepsstart <= MESHCONST_OPTVOLUME) if (mparam.perfstepsstart <= MESHCONST_OPTVOLUME)
{ {
multithread.task = "Volume optimization"; multithread.task = "Volume optimization";
OptimizeVolume (mparam, *mesh); OptimizeVolume (mparam, *mesh);
if (multithread.terminate) return 0; if (multithread.terminate) return 0;
} }
FinalizeMesh(*mesh); FinalizeMesh(*mesh);
return 0; return 0;
} }
const Refinement & NetgenGeometry :: GetRefinement () const const Refinement & NetgenGeometry :: GetRefinement () const
{ {

2
libsrc/meshing/bisect.cpp
View File

@ -3554,7 +3554,7 @@ namespace netgen
EdgePointGeomInfo newepgi; EdgePointGeomInfo newepgi;
geo.PointBetweenEdge(mesh.Point (seg[0]), mesh.Point (seg[1]), 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], seg.epgeominfo[0], seg.epgeominfo[1],
mesh.Point (newpi), newepgi); mesh.Point (newpi), newepgi);
nseg1.epgeominfo[1] = newepgi; nseg1.epgeominfo[1] = newepgi;

16
libsrc/meshing/curvedelems.cpp
View File

@ -911,14 +911,14 @@ namespace netgen
if (swap) if (swap)
{ {
p = p1 + xi[j] * (p2-p1); p = p1 + xi[j] * (p2-p1);
geo.PointBetween (p1, p2, xi[j], geo.PointBetween (p1, p2, xi[j],
surfnr[e], gi0[e], gi1[e], surfnr[e], gi0[e], gi1[e],
pp, ppgi); pp, ppgi);
} }
else else
{ {
p = p2 + xi[j] * (p1-p2); p = p2 + xi[j] * (p1-p2);
geo.PointBetween (p2, p1, xi[j], geo.PointBetween (p2, p1, xi[j],
surfnr[e], gi1[e], gi0[e], surfnr[e], gi1[e], gi0[e],
pp, ppgi); pp, ppgi);
} }
@ -1053,9 +1053,9 @@ namespace netgen
if (rational) 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]); 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]); edge_gi1[edgenr]);
// p1 + alpha1 tau1 = p2 + alpha2 tau2; // p1 + alpha1 tau1 = p2 + alpha2 tau2;
@ -1127,16 +1127,16 @@ namespace netgen
if (swap) if (swap)
{ {
p = p1 + xi[j] * (p2-p1); p = p1 + xi[j] * (p2-p1);
geo.PointBetweenEdge(p1, p2, xi[j], geo.PointBetweenEdge(p1, p2, xi[j],
edge_surfnr2[edgenr], edge_surfnr1[edgenr], edge_surfnr2[edgenr], edge_surfnr1[edgenr],
edge_gi0[edgenr], edge_gi1[edgenr], edge_gi0[edgenr], edge_gi1[edgenr],
pp, ppgi); pp, ppgi);
} }
else else
{ {
p = p2 + xi[j] * (p1-p2); p = p2 + xi[j] * (p1-p2);
geo.PointBetweenEdge(p2, p1, xi[j], geo.PointBetweenEdge(p2, p1, xi[j],
edge_surfnr2[edgenr], edge_surfnr1[edgenr], edge_surfnr2[edgenr], edge_surfnr1[edgenr],
edge_gi1[edgenr], edge_gi0[edgenr], edge_gi1[edgenr], edge_gi0[edgenr],
pp, ppgi); pp, ppgi);
} }