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:
	applications/utilities/mesh/generation/blockMesh/blockMeshApp.C
	applications/utilities/parallelProcessing/decomposePar/decomposeMesh.C
	etc/bashrc
	etc/cshrc
	src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
	src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
	src/decompositionMethods/parMetisDecomp/parMetisDecomp.C
	src/dynamicMesh/Make/files
	src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
	src/dynamicMesh/perfectInterface/perfectInterface.C
	src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
	src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.C
	src/dynamicMesh/polyTopoChange/polyTopoChange/polyTopoChange.H
	src/finiteVolume/Make/files
	src/mesh/blockMesh/blockMesh/blockMesh.C
	src/mesh/blockMesh/blockMesh/blockMeshTopology.C
	src/meshTools/Make/files
	src/meshTools/sets/topoSets/faceSet.C
This commit is contained in:
mattijs
2009-11-30 15:20:52 +00:00
parent 8d115b35c1 de0897cd66
commit be1b1ceefc
2132 changed files with 217596 additions and 24407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
View File

@ -282,13 +282,13 @@ void Foam::FaceCellWave<Type>::checkCyclic(const polyPatch& patch) const
}
// Check if patches of given type name are present
// Check if has cyclic patches
template <class Type>
bool Foam::FaceCellWave<Type>::hasPatchType(const word& nameOfType)
bool Foam::FaceCellWave<Type>::hasCyclicPatch() const
{
forAll(mesh_.boundaryMesh(), patchI)
{
if (mesh_.boundaryMesh()[patchI].type() == nameOfType)
if (isA<cyclicPolyPatch>(mesh_.boundaryMesh()[patchI]))
{
return true;
}
@ -799,7 +799,7 @@ Foam::FaceCellWave<Type>::FaceCellWave
changedCell_(mesh_.nCells(), false),
changedCells_(mesh_.nCells()),
nChangedCells_(0),
hasCyclicPatches_(hasPatchType(cyclicPolyPatch::typeName)),
hasCyclicPatches_(hasCyclicPatch()),
nEvals_(0),
nUnvisitedCells_(mesh_.nCells()),
nUnvisitedFaces_(mesh_.nFaces()),
@ -829,7 +829,7 @@ Foam::FaceCellWave<Type>::FaceCellWave
changedCell_(mesh_.nCells(), false),
changedCells_(mesh_.nCells()),
nChangedCells_(0),
hasCyclicPatches_(hasPatchType(cyclicPolyPatch::typeName)),
hasCyclicPatches_(hasCyclicPatch()),
nEvals_(0),
nUnvisitedCells_(mesh_.nCells()),
nUnvisitedFaces_(mesh_.nFaces()),

4
src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
View File

@ -184,8 +184,8 @@ class FaceCellWave
//- Debugging: check info on both sides of cyclic
void checkCyclic(const polyPatch& pPatch) const;
//- Has patches of certain type?
bool hasPatchType(const word& nameOfType);
//- Has cyclic patch?
bool hasCyclicPatch() const;
//- Merge received patch data into global data
void mergeFaceInfo

12
src/OpenFOAM/algorithms/MeshWave/MeshWave.C
View File

@ -22,22 +22,10 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/
#include "MeshWave.H"
#include "polyMesh.H"
#include "processorPolyPatch.H"
#include "cyclicPolyPatch.H"
#include "OPstream.H"
#include "IPstream.H"
#include "PstreamReduceOps.H"
#include "debug.H"
#include "typeInfo.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //