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

nonConformalProcessorCyclic: Corrected transformation of deltas

Browse Source
This commit is contained in:
Will Bainbridge
2024-12-19 15:26:12 +00:00
parent fedf1e596c
commit dcff2b94e8
8 changed files with 9 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.C
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-2024 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -76,24 +76,6 @@ void Foam::coupledFvPatch::makeWeights
}
Foam::tmp<Foam::vectorField> Foam::coupledFvPatch::delta
(
const vectorField& nbrDelta
) const
{
if (transform().transforms())
{
return
coupledFvPatch::delta()
- transform().transform(nbrDelta);
}
else
{
return coupledFvPatch::delta() - nbrDelta;
}
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::vectorField> Foam::coupledFvPatch::delta() const

3
src/finiteVolume/fvMesh/fvPatches/basic/coupled/coupledFvPatch.H
View File

@ -72,9 +72,6 @@ protected:
const vectorField& nbrDelta
) const;
//- Return delta (P to N) vectors across coupled patch
tmp<vectorField> delta(const vectorField& nbrDelta) const;
public:

6
src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C
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-2024 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,7 +54,9 @@ void Foam::cyclicFvPatch::makeWeights(scalarField& w) const
Foam::tmp<Foam::vectorField> Foam::cyclicFvPatch::delta() const
{
return coupledFvPatch::delta(nbrPatch().coupledFvPatch::delta());
return
coupledFvPatch::delta()
- transform().transform(nbrPatch().coupledFvPatch::delta());
}

18
src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalCyclic/nonConformalCyclicFvPatch.C
View File

@ -101,22 +101,4 @@ const Foam::labelUList& Foam::nonConformalCyclicFvPatch::faceCells() const
}
void Foam::nonConformalCyclicFvPatch::makeWeights(scalarField& w) const
{
nonConformalCoupledFvPatch::makeWeights
(
w,
nbrPatch().Sf(),
nbrPatch().coupledFvPatch::delta()
);
}
Foam::tmp<Foam::vectorField>
Foam::nonConformalCyclicFvPatch::delta() const
{
return coupledFvPatch::delta(nbrPatch().coupledFvPatch::delta());
}
// ************************************************************************* //

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

@ -122,13 +122,6 @@ public:
//- Return the face-cells
virtual const labelUList& faceCells() const;
//- Make patch weighting factors
void makeWeights(scalarField&) const;
//- Return delta (P to N) vectors across coupled patch
virtual tmp<vectorField> delta() const;
};

38
src/finiteVolume/fvMesh/fvPatches/constraint/nonConformalProcessorCyclic/nonConformalProcessorCyclicFvPatch.C
View File

@ -100,42 +100,4 @@ Foam::nonConformalProcessorCyclicFvPatch::faceCells() const
}
void Foam::nonConformalProcessorCyclicFvPatch::makeWeights(scalarField& w) const
{
if (Pstream::parRun())
{
nonConformalCoupledFvPatch::makeWeights
(
w,
- boundaryMesh().mesh().Sf().boundaryField()[index()],
boundaryMesh().mesh().Cf().boundaryField()[index()]
- boundaryMesh().mesh().C().boundaryField()[index()]
);
}
else
{
w = 1;
}
}
Foam::tmp<Foam::vectorField>
Foam::nonConformalProcessorCyclicFvPatch::delta() const
{
if (Pstream::parRun())
{
return
coupledFvPatch::delta
(
boundaryMesh().mesh().Cf().boundaryField()[index()]
- boundaryMesh().mesh().C().boundaryField()[index()]
);
}
else
{
return coupledFvPatch::delta();
}
}
// ************************************************************************* //

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

@ -119,13 +119,6 @@ public:
//- Return the face-cells
virtual const labelUList& faceCells() const;
//- Make patch weighting factors
virtual void makeWeights(scalarField& w) const;
//- Return delta (P to N) vectors across coupled patch
virtual tmp<vectorField> delta() const;
};

7
src/finiteVolume/fvMesh/fvPatches/constraint/processor/processorFvPatch.C
View File

@ -78,8 +78,8 @@ Foam::tmp<Foam::vectorField> Foam::processorFvPatch::delta() const
if (!boundaryMesh().mesh().conformal())
{
return
coupledFvPatch::delta
(
coupledFvPatch::delta()
- (
boundaryMesh().mesh().Cf().boundaryField()[index()]
- boundaryMesh().mesh().C().boundaryField()[index()]
);
@ -87,7 +87,8 @@ Foam::tmp<Foam::vectorField> Foam::processorFvPatch::delta() const
else
{
return
coupledFvPatch::delta
coupledFvPatch::delta()
- transform().transform
(
procPolyPatch_.neighbFaceCentres()
- procPolyPatch_.neighbFaceCellCentres()