diff --git a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.H b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.H index 8364a0f959..f800ef4a1c 100644 --- a/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.H +++ b/src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.H @@ -47,7 +47,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class conformedFvsPatch Declaration + Class conformedFvsPatchField Declaration \*---------------------------------------------------------------------------*/ template diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCyclic/nonConformalCyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCyclic/nonConformalCyclicFvPatch.H index 5c519714c4..4440a298c9 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCyclic/nonConformalCyclicFvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCyclic/nonConformalCyclicFvPatch.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,21 +98,24 @@ public: // Access + //- Inherit the cyclic patch method + using cyclicFvPatch::patch; + //- Poly patch const nonConformalCyclicPolyPatch& nonConformalCyclicPatch() const; - //- Neighbour patch - const nonConformalCyclicFvPatch& nbrPatch() const; - - //- ... + //- Inherit the cyclic owner method using cyclicFvPatch::owner; - //- ... + //- Inherit the cyclic neighbour method using cyclicFvPatch::neighbour; - //- ... + //- Inherit the cyclic transform method using cyclicFvPatch::transform; + //- Neighbour patch + const nonConformalCyclicFvPatch& nbrPatch() const; + //- Is this patch coupled? Returns true. For NCC patches the poly // mesh is considered non-coupled whilst the finite volume mesh is // considered coupled. diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalError/nonConformalErrorFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalError/nonConformalErrorFvPatch.C index 0a62daa267..28819b8dd6 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalError/nonConformalErrorFvPatch.C +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalError/nonConformalErrorFvPatch.C @@ -47,7 +47,11 @@ Foam::nonConformalErrorFvPatch::nonConformalErrorFvPatch ) : fvPatch(patch, bm), - nonConformalFvPatch(static_cast(*this)) + nonConformalFvPatch(static_cast(*this)), + nonConformalErrorPolyPatch_ + ( + refCast(patch) + ) {} @@ -59,6 +63,13 @@ Foam::nonConformalErrorFvPatch::~nonConformalErrorFvPatch() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +const Foam::nonConformalErrorPolyPatch& +Foam::nonConformalErrorFvPatch::nonConformalErrorPatch() const +{ + return nonConformalErrorPolyPatch_; +} + + const Foam::labelList& Foam::nonConformalErrorFvPatch::polyFaces() const { return nonConformalFvPatch::polyFaces(); diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalError/nonConformalErrorFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalError/nonConformalErrorFvPatch.H index b5c27baa07..d6e5c2c9ea 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalError/nonConformalErrorFvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalError/nonConformalErrorFvPatch.H @@ -60,6 +60,12 @@ class nonConformalErrorFvPatch public fvPatch, public nonConformalFvPatch { + // Private Data + + //- Reference to the polyPatch + const nonConformalErrorPolyPatch& nonConformalErrorPolyPatch_; + + public: //- Runtime type information @@ -84,6 +90,12 @@ public: // Access + //- Inherit fvPatch patch method + using fvPatch::patch; + + //- Poly patch + const nonConformalErrorPolyPatch& nonConformalErrorPatch() const; + //- Return face face-poly-faces const labelList& polyFaces() const; diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatch.H b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatch.H index a59209b609..8ce6a39292 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatch.H +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatch.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,17 +97,20 @@ public: // Access + //- Inherit the processor cyclic patch method + using processorCyclicFvPatch::patch; + //- Poly patch const nonConformalProcessorCyclicPolyPatch& nonConformalProcessorCyclicPatch() const; - //- ... + //- Inherit the processor cyclic owner method using processorCyclicFvPatch::owner; - //- ... + //- Inherit the processor cyclic neighbour method using processorCyclicFvPatch::neighbour; - //- ... + //- Inherit the processor cyclic transform method using processorCyclicFvPatch::transform; //- Is this patch coupled? Returns true. For NCC patches the poly