Fixed missing sqr() from cell size lookup in uniformGrid and pointsFile.

Added report of number of location attempts and success rate for
densityWeightedStochastic.
This commit is contained in:
graham
2009-07-29 15:15:32 +01:00
parent 60a59da975
commit 86c0b1444b
3 changed files with 16 additions and 4 deletions

View File

@ -75,8 +75,12 @@ std::vector<Vb::Point> densityWeightedStochastic::initialPoints() const
vector span = bb.span();
label trialPoints = 0;
while (volumeAdded < totalVolume_)
{
trialPoints++;
point p =
min
+ vector
@ -110,6 +114,11 @@ std::vector<Vb::Point> densityWeightedStochastic::initialPoints() const
}
}
Info<< nl << " " << typeName << " - "
<< trialPoints << " locations queried ("
<< scalar(initialPoints.size())/scalar(trialPoints)
<< " success rate)" << endl;
return initialPoints;
}

View File

@ -74,10 +74,13 @@ std::vector<Vb::Point> pointFile::initialPoints() const
(
points,
minimumSurfaceDistanceCoeffSqr_
*cvMesh_.cellSizeControl().cellSize
*sqr
(
points,
List<bool>(points.size(), false)
cvMesh_.cellSizeControl().cellSize
(
points,
List<bool>(points.size(), false)
)
)
);

View File

@ -119,7 +119,7 @@ std::vector<Vb::Point> uniformGrid::initialPoints() const
(
points,
minimumSurfaceDistanceCoeffSqr_
*cvMesh_.cellSizeControl().cellSize(points, isSurfacePoint)
*sqr(cvMesh_.cellSizeControl().cellSize(points, isSurfacePoint))
);
forAll(insidePoints, i)