Modifying boost library include location. Commenting out hacks to allow dangermouse to run.

This commit is contained in:
Graham
2009-03-20 13:42:38 +00:00
parent 444ba19c00
commit fd9d0993b9
3 changed files with 38 additions and 35 deletions

View File

@ -1097,6 +1097,7 @@ void Foam::CV3D::relaxPoints(const scalar relaxation)
scalar targetCellSizeB = targetCellSize;
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// if
// (
// vA->indexOfClosestPatch() == 1
@ -1123,33 +1124,35 @@ void Foam::CV3D::relaxPoints(const scalar relaxation)
// targetCellSizeB *= 2;
// }
if
(
vA->indexOfClosestPatch() == 1
&& vA->distanceToClosestSurface() < 0.04
)
{
targetCellSizeA *=
(43.75*vA->distanceToClosestSurface() + 0.25);
}
else
{
targetCellSizeA *= 2;
}
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// if
// (
// vA->indexOfClosestPatch() == 1
// && vA->distanceToClosestSurface() < 0.04
// )
// {
// targetCellSizeA *=
// (43.75*vA->distanceToClosestSurface() + 0.25);
// }
// else
// {
// targetCellSizeA *= 2;
// }
if
(
vB->indexOfClosestPatch() == 1
&& vB->distanceToClosestSurface() < 0.04
)
{
targetCellSizeB *=
(43.75*vB->distanceToClosestSurface() + 0.25);
}
else
{
targetCellSizeB *= 2;
}
// if
// (
// vB->indexOfClosestPatch() == 1
// && vB->distanceToClosestSurface() < 0.04
// )
// {
// targetCellSizeB *=
// (43.75*vB->distanceToClosestSurface() + 0.25);
// }
// else
// {
// targetCellSizeB *= 2;
// }
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
targetCellSize = sqrt(targetCellSizeA * targetCellSizeB);

View File

@ -15,7 +15,7 @@ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude
EXE_LIBS = \
-L$(BOOST_SRC)/libs \
-L$(BOOST_SRC)/lib \
-lmeshTools \
-ltriSurface \
-ldynamicMesh \

View File

@ -888,16 +888,16 @@ void Foam::CV3D::insertSurfaceNearestPointPairs()
if (edgePoints.size())
{
Warning<< "Edge point insertion disabled." << endl;
//Warning<< "Edge point insertion disabled." << endl;
// smoothEdgePositions(edgePoints, edgeLabels);
smoothEdgePositions(edgePoints, edgeLabels);
// insertEdgePointGroups
// (
// edgePoints,
// edgeLabels,
// "surfaceNearestEdgePoints.obj"
// );
insertEdgePointGroups
(
edgePoints,
edgeLabels,
"surfaceNearestEdgePoints.obj"
);
}
}