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

This commit is contained in:
mattijs
2012-03-02 17:41:50 +00:00
3 changed files with 6 additions and 5 deletions

View File

@ -1465,6 +1465,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence
label cIInner = 0;
label cIOuter = 0;
// seedProcessorBoundarySurfaces(true);
label cellIndexCount = 0;
for
@ -1477,6 +1478,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence
cit->cellIndex() = cellIndexCount++;
}
timeCheck("End of cell Indexing");
labelList testCellInfluence(number_of_cells(), 0);
@ -1505,7 +1507,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence
)
{
nQuickRejections++;
testCellInfluence[cit->cellIndex()] = -1;
//testCellInfluence[cit->cellIndex()] = -1;
}
}
@ -1528,7 +1530,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence
if
(
(testCellInfluence[cit->cellIndex()] == 0)
&& (cit->real() || cit->hasFarPoint())
//&& (cit->real() || cit->hasFarPoint())
)
{
const Foam::point& cc = cit->dual();

View File

@ -1,6 +1,6 @@
EXE_INC = \
/* -DFULLDEBUG -g -O0 */ \
-I$BOOST_ARCH_PATH/include \
-I$(BOOST_ARCH_PATH)/include \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/renumber/renumberMethods/lnInclude

View File

@ -9,5 +9,4 @@ CGAL_LIBS = \
-L$(MPFR_ARCH_PATH)/lib \
-L$(BOOST_ARCH_PATH)/lib \
-lmpfr \
-I/usr/lib64 \
-lboost_thread-mt
-lboost_thread