zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2023-11-16 14:30:36 +00:00
parent 9bdb279d4d 410167884a
commit c73a9eaace
5 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/finiteVolume/fvMesh/fvMeshStitchers/fvMeshStitcher/conformedFvsPatchField.H
View File

@ -47,7 +47,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class conformedFvsPatch Declaration
Class conformedFvsPatchField Declaration
\*---------------------------------------------------------------------------*/
template<class Type>

17
src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCyclic/nonConformalCyclicFvPatch.H
View File

@ -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.

13
src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalError/nonConformalErrorFvPatch.C
View File

@ -47,7 +47,11 @@ Foam::nonConformalErrorFvPatch::nonConformalErrorFvPatch
)
:
fvPatch(patch, bm),
nonConformalFvPatch(static_cast<const fvPatch&>(*this))
nonConformalFvPatch(static_cast<const fvPatch&>(*this)),
nonConformalErrorPolyPatch_
(
refCast<const nonConformalErrorPolyPatch>(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();

12
src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalError/nonConformalErrorFvPatch.H
View File

@ -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;

11
src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatch.H
View File

@ -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