zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
andy
2013-08-29 16:38:34 +01:00
parent 85b66e92cd 067c80b0d7
commit 73b7f6e617
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
View File

@ -140,7 +140,7 @@ List<Vb::Point> rayShooting::initialPoints() const
geometryToConformTo().findSurfaceNearestIntersection geometryToConformTo().findSurfaceNearestIntersection
( (
fC - normStart[0]*SMALL, fC - normStart[0]*pert,
fC - normStart[0]*maxRayLength, fC - normStart[0]*maxRayLength,
surfHitEnd, surfHitEnd,
hitSurfaceEnd hitSurfaceEnd
@ -166,8 +166,8 @@ List<Vb::Point> rayShooting::initialPoints() const
pointIndexHit procIntersection = pointIndexHit procIntersection =
decomposition().findLine decomposition().findLine
( (
l.start() + l.vec()*SMALL, l.start(),
l.end() - l.vec()*maxRayLength l.end()
); );
if (procIntersection.hit()) if (procIntersection.hit())
@ -187,12 +187,6 @@ List<Vb::Point> rayShooting::initialPoints() const
minimumSurfaceDistanceCoeffSqr_ minimumSurfaceDistanceCoeffSqr_
*sqr(cellShapeControls().cellSize(midPoint)); *sqr(cellShapeControls().cellSize(midPoint));
if
(
magSqr(midPoint - l.start()) > minDistFromSurfaceSqr
&& magSqr(midPoint - l.end()) > minDistFromSurfaceSqr
)
{
if (randomiseInitialGrid_) if (randomiseInitialGrid_)
{ {
midPoint.x() += pert*(rndGen().scalar01() - 0.5); midPoint.x() += pert*(rndGen().scalar01() - 0.5);
@ -200,6 +194,12 @@ List<Vb::Point> rayShooting::initialPoints() const
midPoint.z() += pert*(rndGen().scalar01() - 0.5); midPoint.z() += pert*(rndGen().scalar01() - 0.5);
} }
if
(
magSqr(midPoint - l.start()) > minDistFromSurfaceSqr
&& magSqr(midPoint - l.end()) > minDistFromSurfaceSqr
)
{
initialPoints.append(toPoint(midPoint)); initialPoints.append(toPoint(midPoint));
} }
} }