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:
mattijs
2012-03-02 17:41:50 +00:00
parent 2f529221fb 3592ce9e58
commit 95b29c7ee4
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
View File

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

2
src/renumber/SloanRenumber/Make/options
View File

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

3
wmake/rules/General/CGAL
View File

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