From 3c183eba6cb9d9eac42de253a16a19450239d1ea Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 5 Sep 2012 16:40:59 +0100
Subject: [PATCH] ENH: polyPatch: adding constraint patches to group
---
.../chemFoam/createSingleCellMesh.H | 10 ++++++-
.../advanced/autoRefineMesh/autoRefineMesh.C | 3 +-
.../fluent3DMeshToFoam/fluent3DMeshToFoam.L | 5 ++--
.../extrudeMesh/extrudedMesh/extrudedMesh.C | 11 ++++---
.../extrude2DMesh/extrude2DMeshApp.C | 3 +-
.../surface/surfaceToPatch/surfaceToPatch.C | 5 ++--
src/OpenFOAM/containers/Lists/UList/UListIO.C | 4 +--
src/OpenFOAM/meshes/polyMesh/polyMeshIO.C | 3 +-
.../basic/coupled/coupledPolyPatch.C | 10 ++++---
.../basic/coupled/coupledPolyPatch.H | 8 +++--
.../basic/generic/genericPolyPatch.C | 12 ++++----
.../basic/generic/genericPolyPatch.H | 8 +++--
.../constraint/cyclic/cyclicPolyPatch.C | 12 ++++----
.../constraint/cyclic/cyclicPolyPatch.H | 8 +++--
.../cyclicSlip/cyclicSlipPolyPatch.H | 12 ++++----
.../constraint/empty/emptyPolyPatch.C | 12 ++++----
.../constraint/empty/emptyPolyPatch.H | 8 +++--
.../nonuniformTransformCyclicPolyPatch.H | 12 ++++----
.../constraint/oldCyclic/oldCyclicPolyPatch.C | 12 ++++----
.../constraint/oldCyclic/oldCyclicPolyPatch.H | 8 +++--
.../constraint/processor/processorPolyPatch.C | 7 +++--
.../constraint/processor/processorPolyPatch.H | 5 ++--
.../processorCyclicPolyPatch.C | 7 +++--
.../processorCyclicPolyPatch.H | 5 ++--
.../constraint/symmetry/symmetryPolyPatch.C | 12 ++++----
.../constraint/symmetry/symmetryPolyPatch.H | 8 +++--
.../constraint/wedge/wedgePolyPatch.C | 10 ++++---
.../constraint/wedge/wedgePolyPatch.H | 8 +++--
.../polyPatches/derived/wall/wallPolyPatch.C | 12 ++++----
.../polyPatches/derived/wall/wallPolyPatch.H | 8 +++--
.../polyPatches/polyPatch/polyPatch.C | 30 ++++++++++++++++---
.../polyPatches/polyPatch/polyPatch.H | 16 ++++++----
.../polyPatches/polyPatch/polyPatchNew.C | 17 +++++++++--
.../fvMesh/fvMeshSubset/fvMeshSubset.C | 8 +++--
.../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C | 10 ++++---
.../cyclicAMIPolyPatch/cyclicAMIPolyPatch.H | 6 ++--
.../mappedPolyPatch/mappedPolyPatch.C | 16 +++++-----
.../mappedPolyPatch/mappedPolyPatch.H | 8 +++--
.../mappedVariableThicknessWallPolyPatch.C | 16 +++++-----
.../mappedVariableThicknessWallPolyPatch.H | 8 +++--
.../mappedPolyPatch/mappedWallPolyPatch.C | 16 +++++-----
.../mappedPolyPatch/mappedWallPolyPatch.H | 8 +++--
42 files changed, 259 insertions(+), 148 deletions(-)
diff --git a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
index c125a7f31fb..e5e7de6496f 100644
--- a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
+++ b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H
@@ -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);
diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
index 22b757e8610..b158dbae38e 100644
--- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
+++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
@@ -208,7 +208,8 @@ label addPatch(polyMesh& mesh, const word& patchName)
0,
mesh.nInternalFaces(),
patchI,
- patches
+ patches,
+ emptyPolyPatch::typeName
);
forAll(patches, i)
diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
index c67f5b289b4..54055e8406f 100644
--- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
+++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
@@ -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
);
}
}
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.C
index 4aeb9809f80..16180be1b8c 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudedMesh/extrudedMesh.C
@@ -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);
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
index 667b0a9b2b8..f161523ffd4 100644
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMeshApp.C
@@ -213,7 +213,8 @@ int main(int argc, char *argv[])
poly2DMesh.patchSizes()[patchI],
poly2DMesh.patchStarts()[patchI],
patchI,
- mesh().boundaryMesh()
+ mesh().boundaryMesh(),
+ polyPatch::typeName
);
}
diff --git a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
index f7fbc53ab8d..12131e8c724 100644
--- a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
+++ b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
@@ -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();
diff --git a/src/OpenFOAM/containers/Lists/UList/UListIO.C b/src/OpenFOAM/containers/Lists/UList/UListIO.C
index a5ffea46792..9f4ad79aabb 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListIO.C
+++ b/src/OpenFOAM/containers/Lists/UList/UListIO.C
@@ -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;
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
index a296fd336ad..313eb3e25bb 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
@@ -223,7 +223,8 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
newBoundary[patchI].size(),
newBoundary[patchI].start(),
patchI,
- boundary_
+ boundary_,
+ newBoundary[patchI].type()
);
}
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
index fd9b0a0828f..4e433001344 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
@@ -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_))
{}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
index dac7ddaeb25..7cb56879c44 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
index 0911e2271a6..d8cfbcdacd8 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
@@ -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)
{}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
index 8c093b40153..6a22d8af6f5 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
index b5d12a042c8..ce8f260382f 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
@@ -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),
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
index 8af422f0938..f2f1c49a870 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
index 155c036f455..fc2de2d14f5 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclicSlip/cyclicSlipPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
index 63a97a8b70f..e6c071bcd11 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C
@@ -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)
{}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
index 23694fc79b8..89cbf8fc317 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
index f359891c927..8ed56b38787 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
index aa8fca5d6a3..7dc587bbfe5 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.C
@@ -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),
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
index 45dfe5b7e27..5d996988c21 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/oldCyclic/oldCyclicPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
index be7f1cb3fae..05664dd6eaf 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C
@@ -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_(),
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
index 7f62967641a..2b39411ee51 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
index 1f194578e05..eaa818b9fe2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.C
@@ -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())
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
index 77eea65d6c6..8d94466543b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
index 446d4074b90..71c7a2cfcf0 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C
@@ -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)
{}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
index b9806082cdb..9df659518f7 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
index 6223661b815..b7c9783cb98 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
@@ -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();
}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
index 6e940c29b78..2caa492d9f1 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
index 06916da09f4..f6c3d510615 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C
@@ -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)
{}
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
index faf837285c7..cdbd1a64db3 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
index e22381b7dd6..a10563c3d1b 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
index dd06c031950..007db9d2fd2 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H
@@ -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
diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
index 224b630ae43..0b67ab83352 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/polyPatch/polyPatchNew.C
@@ -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));
}
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index c202e380b81..59dbc40a8a6 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -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 : "
diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
index 61125254b04..cd8f992236e 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
+++ b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.C
@@ -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),
diff --git a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
index f1418c6f04b..b1f420318ee 100644
--- a/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
+++ b/src/meshTools/AMIInterpolation/patches/cyclic/cyclicAMIPolyPatch/cyclicAMIPolyPatch.H
@@ -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
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.C
index c87303cb0e3..804b96affbc 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.C
@@ -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)
{}
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.H
index 32cbd1a29ae..3e63482d52c 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPolyPatch.H
@@ -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
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
index fb286890b05..6248dce6506 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.C
@@ -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()))
{}
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H
index 4a5912da5e2..7b7c326488e 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedVariableThicknessWallPolyPatch.H
@@ -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
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C
index 9894474e47e..61bc54a3d0f 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.C
@@ -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)
{}
diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.H b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.H
index 8590eeb2461..e4c7e646473 100644
--- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.H
+++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedWallPolyPatch.H
@@ -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
--
GitLab