Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
andy
2013-08-29 16:00:42 +01:00

View File

@ -121,7 +121,7 @@ List<Vb::Point> rayShooting::initialPoints() const
geometryToConformTo().findSurfaceNearest
(
fC,
sqr(SMALL),
sqr(pert),
surfHitStart,
hitSurfaceStart
);
@ -145,6 +145,8 @@ List<Vb::Point> rayShooting::initialPoints() const
hitSurfaceEnd
);
if (surfHitEnd.hit())
{
vectorField normEnd(1, vector::min);
geometryToConformTo().getNormal
(
@ -153,11 +155,7 @@ List<Vb::Point> rayShooting::initialPoints() const
normEnd
);
if
(
surfHitEnd.hit()
&& ((normStart[0] & normEnd[0]) < 0)
)
if ((normStart[0] & normEnd[0]) < 0)
{
line<point, point> l(fC, surfHitEnd.hitPoint());
@ -206,6 +204,7 @@ List<Vb::Point> rayShooting::initialPoints() const
}
}
}
}
return initialPoints.shrink();
}