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' into splitCyclic

Browse Source 
Conflicts:
	src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
	src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
	src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
	src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
	src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
	src/parallel/decompose/scotchDecomp/scotchDecomp.C
	src/parallel/parMetisDecomp/parMetisDecomp.C
	src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
This commit is contained in:
mattijs
2010-03-25 13:54:12 +00:00
parent 50160baa9c 52fc076b47
commit 89c7523c72
538 changed files with 15929 additions and 5466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/parallelProcessing/decomposePar/Make/options
View File

@ -1,5 +1,5 @@
EXE_INC = \
-I$(LIB_SRC)/parallel/decompositionMethods/lnInclude \
-I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
@ -7,6 +7,6 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lgenericPatchFields \
-ldecompositionMethods \
-ldecompositionMethods -lmetisDecomp -lscotchDecomp \
-llagrangian \
-lmeshTools

6
applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C
View File

@ -161,15 +161,13 @@ void Foam::domainDecomposition::distributeCells()
// somewhere in the middle of the domain which might not be anywhere
// near any of the cells.
const point greatPoint(GREAT, GREAT, GREAT);
pointField regionCentres(globalRegion.nRegions(), greatPoint);
pointField regionCentres(globalRegion.nRegions(), point::max);
forAll(globalRegion, cellI)
{
label regionI = globalRegion[cellI];
if (regionCentres[regionI] == greatPoint)
if (regionCentres[regionI] == point::max)
{
regionCentres[regionI] = cellCentres()[cellI];
}

40
applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
View File

@ -40,7 +40,6 @@ Description
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
<<<<<<< HEAD
void Foam::domainDecomposition::append(labelList& lst, const label elem)
{
label sz = lst.size();
@ -413,38 +412,6 @@ void Foam::domainDecomposition::decomposeMesh()
}
// Set the patch map. No filterPatches allowed.
forAll(procBoundaryAddressing_, procI)
{
label nNormal = procPatchSize_[procI].size();
const labelListList& curSubPatchIDs =
procProcessorPatchSubPatchIDs_[procI];
// label nInterProc = procProcessorPatchSize_[procI].size();
label nInterProc = 0;
forAll(curSubPatchIDs, procPatchI)
{
nInterProc += curSubPatchIDs[procPatchI].size();
}
procBoundaryAddressing_[procI].setSize(nNormal + nInterProc);
for (label patchI = 0; patchI < nNormal; patchI++)
{
procBoundaryAddressing_[procI][patchI] = patchI;
}
label patchI = nNormal;
forAll(curSubPatchIDs, procPatchI)
{
forAll(curSubPatchIDs[procPatchI], i)
{
procBoundaryAddressing_[procI][patchI++] =
curSubPatchIDs[procPatchI][i];
}
}
}
//XXXXXXX
// Print a bit
forAll(procPatchStartIndex_, procI)
@ -465,13 +432,6 @@ void Foam::domainDecomposition::decomposeMesh()
}
Info<< endl;
forAll(procBoundaryAddressing_, procI)
{
Info<< "Processor:" << procI << endl;
Info<< " patchMap:" << procBoundaryAddressing_[procI] << endl;
}
Info<< endl;
forAll(procNeighbourProcessors_, procI)
{
Info<< "Processor " << procI << endl;