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

ENH: polyPatch: adding constraint patches to group

Browse Source
This commit is contained in:
mattijs
2012-09-05 16:40:59 +01:00
parent 8913633b0b
commit 3c183eba6c
42 changed files with 259 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
applications/solvers/combustion/chemFoam/createSingleCellMesh.H
View File

@ -33,6 +33,14 @@ fvMesh mesh
List<polyPatch*> patches(1);
patches[0] = new emptyPolyPatch("boundary", 6, 0, 0, mesh.boundaryMesh());
patches[0] = new emptyPolyPatch
(
"boundary",
6,
0,
0,
mesh.boundaryMesh(),
emptyPolyPatch::typeName
);
mesh.addFvPatches(patches);

3
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
View File

@ -208,7 +208,8 @@ label addPatch(polyMesh& mesh, const word& patchName)
0,
mesh.nInternalFaces(),
patchI,
patches
patches,
emptyPolyPatch::typeName
);
forAll(patches, i)

5
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -1113,7 +1113,8 @@ int main(int argc, char *argv[])
0,
0,
patchi,
mesh.boundaryMesh()
mesh.boundaryMesh(),
polyPatch::typeName
);
}
}

11
applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -351,7 +351,8 @@ Foam::extrudedMesh::extrudedMesh
sz,
facei,
0,
boundaryMesh()
boundaryMesh(),
wallPolyPatch::typeName
);
facei += sz;
@ -362,7 +363,8 @@ Foam::extrudedMesh::extrudedMesh
extrudePatch.size(),
facei,
1,
boundaryMesh()
boundaryMesh(),
polyPatch::typeName
);
facei += extrudePatch.size();
@ -373,7 +375,8 @@ Foam::extrudedMesh::extrudedMesh
extrudePatch.size(),
facei,
2,
boundaryMesh()
boundaryMesh(),
polyPatch::typeName
);
addPatches(patches);

3
applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
View File

@ -213,7 +213,8 @@ int main(int argc, char *argv[])
poly2DMesh.patchSizes()[patchI],
poly2DMesh.patchStarts()[patchI],
patchI,
mesh().boundaryMesh()
mesh().boundaryMesh(),
polyPatch::typeName
);
}

5
applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -78,7 +78,8 @@ label addPatch(polyMesh& mesh, const word& patchName)
0,
mesh.nFaces(),
patchI,
patches
patches,
polyPatch::typeName
);
mesh.removeBoundary();

4
src/OpenFOAM/containers/Lists/UList/UListIO.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -91,7 +91,7 @@ Foam::Ostream& Foam::operator<<(Foam::Ostream& os, const Foam::UList<T>& L)
// Write end delimiter
os << token::END_BLOCK;
}
else if (L.size() < 11 && contiguous<T>())
else if (L.size() == 1 || (L.size() < 11 && contiguous<T>()))
{
// Write size and start delimiter
os << L.size() << token::BEGIN_LIST;

3
src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
View File

@ -223,7 +223,8 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
newBoundary[patchI].size(),
newBoundary[patchI].start(),
patchI,
boundary_
boundary_,
newBoundary[patchI].type()
);
}
}

10
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
View File

@ -426,10 +426,11 @@ Foam::coupledPolyPatch::coupledPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, size, start, index, bm),
polyPatch(name, size, start, index, bm, patchType),
matchTolerance_(defaultMatchTol_)
{}
@ -439,10 +440,11 @@ Foam::coupledPolyPatch::coupledPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, dict, index, bm),
polyPatch(name, dict, index, bm, patchType),
matchTolerance_(dict.lookupOrDefault("matchTolerance", defaultMatchTol_))
{}

8
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -183,7 +183,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from dictionary
@ -192,7 +193,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

12
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -45,10 +45,11 @@ Foam::genericPolyPatch::genericPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, size, start, index, bm)
polyPatch(name, size, start, index, bm, patchType)
{}
@ -57,10 +58,11 @@ Foam::genericPolyPatch::genericPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, dict, index, bm),
polyPatch(name, dict, index, bm, patchType),
actualTypeName_(dict.lookup("type")),
dict_(dict)
{}

8
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -75,7 +75,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from dictionary
@ -84,7 +85,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

12
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
View File

@ -600,10 +600,11 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
coupledPolyPatch(name, size, start, index, bm),
coupledPolyPatch(name, size, start, index, bm, patchType),
neighbPatchName_(word::null),
neighbPatchID_(-1),
transform_(UNKNOWN),
@ -632,7 +633,7 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
const vector& separationVector
)
:
coupledPolyPatch(name, size, start, index, bm),
coupledPolyPatch(name, size, start, index, bm, typeName),
neighbPatchName_(neighbPatchName),
neighbPatchID_(-1),
transform_(transform),
@ -652,10 +653,11 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
coupledPolyPatch(name, dict, index, bm),
coupledPolyPatch(name, dict, index, bm, patchType),
neighbPatchName_(dict.lookupOrDefault("neighbourPatch", word::null)),
neighbPatchID_(-1),
transform_(UNKNOWN),

8
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -201,7 +201,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from components
@ -225,7 +226,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

12
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -67,10 +67,11 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
cyclicPolyPatch(name, size, start, index, bm)
cyclicPolyPatch(name, size, start, index, bm, patchType)
{}
//- Construct from dictionary
@ -79,10 +80,11 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
cyclicPolyPatch(name, dict, index, bm)
cyclicPolyPatch(name, dict, index, bm, patchType)
{}
//- Construct as copy, resetting the boundary mesh

12
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,10 +44,11 @@ Foam::emptyPolyPatch::emptyPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, size, start, index, bm)
polyPatch(name, size, start, index, bm, patchType)
{}
@ -56,10 +57,11 @@ Foam::emptyPolyPatch::emptyPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, dict, index, bm)
polyPatch(name, dict, index, bm, patchType)
{}

8
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -65,7 +65,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from dictionary
@ -74,7 +75,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

12
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -67,10 +67,11 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
cyclicPolyPatch(name, size, start, index, bm)
cyclicPolyPatch(name, size, start, index, bm, patchType)
{}
//- Construct from dictionary
@ -79,10 +80,11 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
cyclicPolyPatch(name, dict, index, bm)
cyclicPolyPatch(name, dict, index, bm, patchType)
{}
//- Construct as copy, resetting the boundary mesh

12
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -587,10 +587,11 @@ Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
coupledPolyPatch(name, size, start, index, bm),
coupledPolyPatch(name, size, start, index, bm, patchType),
featureCos_(0.9),
transform_(UNKNOWN),
rotationAxis_(vector::zero),
@ -604,10 +605,11 @@ Foam::oldCyclicPolyPatch::oldCyclicPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
coupledPolyPatch(name, dict, index, bm),
coupledPolyPatch(name, dict, index, bm, patchType),
featureCos_(0.9),
transform_(UNKNOWN),
rotationAxis_(vector::zero),

8
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -198,7 +198,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from dictionary
@ -207,7 +208,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

7
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
View File

@ -57,7 +57,7 @@ Foam::processorPolyPatch::processorPolyPatch
const int neighbProcNo
)
:
coupledPolyPatch(name, size, start, index, bm),
coupledPolyPatch(name, size, start, index, bm, typeName),
myProcNo_(myProcNo),
neighbProcNo_(neighbProcNo),
neighbFaceCentres_(),
@ -71,10 +71,11 @@ Foam::processorPolyPatch::processorPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
coupledPolyPatch(name, dict, index, bm),
coupledPolyPatch(name, dict, index, bm, patchType),
myProcNo_(readLabel(dict.lookup("myProcNo"))),
neighbProcNo_(readLabel(dict.lookup("neighbProcNo"))),
neighbFaceCentres_(),

5
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -143,7 +143,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh&
const polyBoundaryMesh&,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

7
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -76,10 +76,11 @@ Foam::processorCyclicPolyPatch::processorCyclicPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
processorPolyPatch(name, dict, index, bm),
processorPolyPatch(name, dict, index, bm, patchType),
tag_
(
Pstream::nProcs()*max(myProcNo(), neighbProcNo())

5
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -132,7 +132,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh&
const polyBoundaryMesh&,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

12
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,10 +44,11 @@ Foam::symmetryPolyPatch::symmetryPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, size, start, index, bm)
polyPatch(name, size, start, index, bm, patchType)
{}
@ -56,10 +57,11 @@ Foam::symmetryPolyPatch::symmetryPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, dict, index, bm)
polyPatch(name, dict, index, bm, patchType)
{}

8
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -65,7 +65,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from dictionary
@ -74,7 +75,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

10
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
View File

@ -103,10 +103,11 @@ Foam::wedgePolyPatch::wedgePolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, size, start, index, bm)
polyPatch(name, size, start, index, bm, patchType)
{
initTransforms();
}
@ -117,10 +118,11 @@ Foam::wedgePolyPatch::wedgePolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, dict, index, bm)
polyPatch(name, dict, index, bm, patchType)
{
initTransforms();
}

8
src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -86,7 +86,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from dictionary
@ -95,7 +96,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

12
src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -44,10 +44,11 @@ Foam::wallPolyPatch::wallPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, size, start, index, bm)
polyPatch(name, size, start, index, bm, patchType)
{}
@ -56,10 +57,11 @@ Foam::wallPolyPatch::wallPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, dict, index, bm)
polyPatch(name, dict, index, bm, patchType)
{}

8
src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -65,7 +65,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from dictionary
@ -74,7 +75,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

30
src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
View File

@ -79,7 +79,8 @@ Foam::polyPatch::polyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
patchIdentifier(name, index),
@ -92,7 +93,17 @@ Foam::polyPatch::polyPatch
boundaryMesh_(bm),
faceCellsPtr_(NULL),
mePtr_(NULL)
{}
{
if
(
patchType != word::null
&& constraintType(patchType)
&& findIndex(inGroups(), patchType) == -1
)
{
inGroups().append(patchType);
}
}
Foam::polyPatch::polyPatch
@ -100,7 +111,8 @@ Foam::polyPatch::polyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
patchIdentifier(name, dict, index),
@ -118,7 +130,17 @@ Foam::polyPatch::polyPatch
boundaryMesh_(bm),
faceCellsPtr_(NULL),
mePtr_(NULL)
{}
{
if
(
patchType != word::null
&& constraintType(patchType)
&& findIndex(inGroups(), patchType) == -1
)
{
inGroups().append(patchType);
}
}
Foam::polyPatch::polyPatch

16
src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
View File

@ -141,9 +141,10 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
),
(name, size, start, index, bm)
(name, size, start, index, bm, patchType)
);
declareRunTimeSelectionTable
@ -155,9 +156,10 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
),
(name, dict, index, bm)
(name, dict, index, bm, patchType)
);
@ -170,7 +172,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from dictionary
@ -179,7 +182,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

17
src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -62,7 +62,18 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
<< exit(FatalError);
}
return autoPtr<polyPatch>(cstrIter()(name, size, start, index, bm));
return autoPtr<polyPatch>
(
cstrIter()
(
name,
size,
start,
index,
bm,
patchType
)
);
}
@ -109,7 +120,7 @@ Foam::autoPtr<Foam::polyPatch> Foam::polyPatch::New
}
}
return autoPtr<polyPatch>(cstrIter()(name, dict, index, bm));
return autoPtr<polyPatch>(cstrIter()(name, dict, index, bm, patchType));
}

8
src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -731,7 +731,8 @@ void Foam::fvMeshSubset::setCellSubset
boundaryPatchSizes[oldInternalPatchID],
patchStart,
nNewPatches,
fvMeshSubsetPtr_().boundaryMesh()
fvMeshSubsetPtr_().boundaryMesh(),
emptyPolyPatch::typeName
);
// The index for the first patch is -1 as it originates from
@ -1296,7 +1297,8 @@ void Foam::fvMeshSubset::setLargeCellSubset
boundaryPatchSizes[oldInternalPatchID],
patchStart,
nNewPatches,
fvMeshSubsetPtr_().boundaryMesh()
fvMeshSubsetPtr_().boundaryMesh(),
emptyPolyPatch::typeName
);
//Pout<< " oldInternalFaces : "

10
src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
View File

@ -370,10 +370,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
coupledPolyPatch(name, size, start, index, bm),
coupledPolyPatch(name, size, start, index, bm, patchType),
nbrPatchName_(word::null),
nbrPatchID_(-1),
transform_(UNKNOWN),
@ -395,10 +396,11 @@ Foam::cyclicAMIPolyPatch::cyclicAMIPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
coupledPolyPatch(name, dict, index, bm),
coupledPolyPatch(name, dict, index, bm, patchType),
nbrPatchName_(dict.lookup("neighbourPatch")),
nbrPatchID_(-1),
transform_(UNKNOWN),

6
src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
View File

@ -160,7 +160,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from dictionary
@ -169,7 +170,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

16
src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -45,10 +45,11 @@ Foam::mappedPolyPatch::mappedPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, size, start, index, bm),
polyPatch(name, size, start, index, bm, patchType),
mappedPatchBase(static_cast<const polyPatch&>(*this))
{}
@ -66,7 +67,7 @@ Foam::mappedPolyPatch::mappedPolyPatch
const polyBoundaryMesh& bm
)
:
polyPatch(name, size, start, index, bm),
polyPatch(name, size, start, index, bm, typeName),
mappedPatchBase
(
static_cast<const polyPatch&>(*this),
@ -91,7 +92,7 @@ Foam::mappedPolyPatch::mappedPolyPatch
const polyBoundaryMesh& bm
)
:
polyPatch(name, size, start, index, bm),
polyPatch(name, size, start, index, bm, typeName),
mappedPatchBase
(
static_cast<const polyPatch&>(*this),
@ -108,10 +109,11 @@ Foam::mappedPolyPatch::mappedPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
polyPatch(name, dict, index, bm),
polyPatch(name, dict, index, bm, patchType),
mappedPatchBase(*this, dict)
{}

8
src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -97,7 +97,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from components
@ -134,7 +135,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

16
src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -56,10 +56,11 @@ Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
mappedWallPolyPatch(name, size, start, index, bm),
mappedWallPolyPatch(name, size, start, index, bm, patchType),
thickness_(size)
{}
@ -77,7 +78,7 @@ Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch
const polyBoundaryMesh& bm
)
:
mappedWallPolyPatch(name, size, start, index, bm),
mappedWallPolyPatch(name, size, start, index, bm, typeName),
thickness_(size)
{}
@ -95,7 +96,7 @@ Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch
const polyBoundaryMesh& bm
)
:
mappedWallPolyPatch(name, size, start, index, bm),
mappedWallPolyPatch(name, size, start, index, bm, typeName),
thickness_(size)
{}
@ -105,10 +106,11 @@ Foam::mappedVariableThicknessWallPolyPatch::mappedVariableThicknessWallPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
mappedWallPolyPatch(name, dict, index, bm),
mappedWallPolyPatch(name, dict, index, bm, patchType),
thickness_(scalarField("thickness", dict, this->size()))
{}

8
src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -76,7 +76,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from components
@ -113,7 +114,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh

16
src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -50,10 +50,11 @@ Foam::mappedWallPolyPatch::mappedWallPolyPatch
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
wallPolyPatch(name, size, start, index, bm),
wallPolyPatch(name, size, start, index, bm, patchType),
mappedPatchBase(static_cast<const polyPatch&>(*this))
{}
@ -71,7 +72,7 @@ Foam::mappedWallPolyPatch::mappedWallPolyPatch
const polyBoundaryMesh& bm
)
:
wallPolyPatch(name, size, start, index, bm),
wallPolyPatch(name, size, start, index, bm, typeName),
mappedPatchBase
(
static_cast<const polyPatch&>(*this),
@ -96,7 +97,7 @@ Foam::mappedWallPolyPatch::mappedWallPolyPatch
const polyBoundaryMesh& bm
)
:
wallPolyPatch(name, size, start, index, bm),
wallPolyPatch(name, size, start, index, bm, typeName),
mappedPatchBase
(
static_cast<const polyPatch&>(*this),
@ -113,10 +114,11 @@ Foam::mappedWallPolyPatch::mappedWallPolyPatch
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
)
:
wallPolyPatch(name, dict, index, bm),
wallPolyPatch(name, dict, index, bm, patchType),
mappedPatchBase(*this, dict)
{}

8
src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -97,7 +97,8 @@ public:
const label size,
const label start,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct from components
@ -134,7 +135,8 @@ public:
const word& name,
const dictionary& dict,
const label index,
const polyBoundaryMesh& bm
const polyBoundaryMesh& bm,
const word& patchType
);
//- Construct as copy, resetting the boundary mesh