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:03:39 +01:00
parent b539e6b188 20a8649a00
commit 85b66e92cd
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,6 @@ rayShooting::rayShooting
cellShapeControls, cellShapeControls,
decomposition decomposition
), ),
maxRayLength_(readScalar(detailsDict().lookup("maxRayLength"))),
randomiseInitialGrid_(detailsDict().lookup("randomiseInitialGrid")), randomiseInitialGrid_(detailsDict().lookup("randomiseInitialGrid")),
randomPerturbationCoeff_ randomPerturbationCoeff_
( (
@ -76,6 +75,8 @@ List<Vb::Point> rayShooting::initialPoints() const
const searchableSurfaces& surfaces = geometryToConformTo().geometry(); const searchableSurfaces& surfaces = geometryToConformTo().geometry();
const labelList& surfacesToConformTo = geometryToConformTo().surfaces(); const labelList& surfacesToConformTo = geometryToConformTo().surfaces();
const scalar maxRayLength = surfaces.bounds().mag();
// Initialise points list // Initialise points list
label initialPointsSize = 0; label initialPointsSize = 0;
forAll(surfaces, surfI) forAll(surfaces, surfI)
@ -140,7 +141,7 @@ List<Vb::Point> rayShooting::initialPoints() const
geometryToConformTo().findSurfaceNearestIntersection geometryToConformTo().findSurfaceNearestIntersection
( (
fC - normStart[0]*SMALL, fC - normStart[0]*SMALL,
fC - normStart[0]*maxRayLength_, fC - normStart[0]*maxRayLength,
surfHitEnd, surfHitEnd,
hitSurfaceEnd hitSurfaceEnd
); );
@ -166,7 +167,7 @@ List<Vb::Point> rayShooting::initialPoints() const
decomposition().findLine decomposition().findLine
( (
l.start() + l.vec()*SMALL, l.start() + l.vec()*SMALL,
l.end() - l.vec()*maxRayLength_ l.end() - l.vec()*maxRayLength
); );
if (procIntersection.hit()) if (procIntersection.hit())

2
applications/utilities/mesh/generation/foamyHexMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.H
View File

@ -54,8 +54,6 @@ private:
// Private data // Private data
const scalar maxRayLength_;
//- Should the initial positions be randomised //- Should the initial positions be randomised
Switch randomiseInitialGrid_; Switch randomiseInitialGrid_;