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

cyclic patches: Rationalised the handling of transformation

Browse Source 
A single transformer object is now maintained within cyclic patches and returned
from a single virtual functions massively simplifying the interface and allowing
for further rationalisation of the calculation of the transformation.
This commit is contained in:
Henry Weller
2020-01-02 17:05:01 +00:00
parent 745c95849e
commit 4f0e38ce4a
66 changed files with 372 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/meshTools/algorithms/MeshWave/FaceCellWave.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-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -597,11 +597,11 @@ void Foam::FaceCellWave<Type, TrackingData>::handleProcPatches()
}
// Apply transform to received data for non-parallel planes
if (!procPatch.parallel())
if (procPatch.transform().rotates())
{
transform
(
procPatch.forwardT(),
procPatch.transform().R(),
receiveFaces.size(),
receiveFacesInfo
);
@ -669,12 +669,12 @@ void Foam::FaceCellWave<Type, TrackingData>::handleCyclicPatches()
const cyclicPolyPatch& cycPatch =
refCast<const cyclicPolyPatch>(patch);
if (!cycPatch.parallel())
if (cycPatch.transform().rotates())
{
// received data from other half
transform
(
cycPatch.forwardT(),
cycPatch.transform().R(),
nReceiveFaces,
receiveFacesInfo
);
@ -743,7 +743,7 @@ void Foam::FaceCellWave<Type, TrackingData>::handleAMICyclicPatches()
)
);
if (!nbrPatch.parallel() || nbrPatch.separated())
if (nbrPatch.transform().transformsPosition())
{
// Adapt sendInfo for leaving domain
const vectorField::subField fc = nbrPatch.faceCentres();
@ -805,17 +805,17 @@ void Foam::FaceCellWave<Type, TrackingData>::handleAMICyclicPatches()
}
// Apply transform to received data for non-parallel planes
if (!cycPatch.parallel())
if (cycPatch.transform().rotates())
{
transform
(
cycPatch.forwardT(),
cycPatch.transform().R(),
receiveInfo.size(),
receiveInfo
);
}
if (!cycPatch.parallel() || cycPatch.separated())
if (cycPatch.transform().transformsPosition())
{
// Adapt receiveInfo for entering domain
const vectorField::subField fc = cycPatch.faceCentres();

10
src/meshTools/algorithms/PointEdgeWave/PointEdgeWave.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-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -368,9 +368,9 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleProcPatches()
//}
// Apply transform to received data for non-parallel planes
if (!procPatch.parallel())
if (procPatch.transform().rotates())
{
transform(procPatch, procPatch.forwardT(), patchInfo);
transform(procPatch, procPatch.transform().R(), patchInfo);
}
// Adapt for entering domain
@ -453,10 +453,10 @@ void Foam::PointEdgeWave<Type, TrackingData>::handleCyclicPatches()
// Apply rotation for non-parallel planes
if (!cycPatch.parallel())
if (cycPatch.transform().rotates())
{
// received data from half1
transform(cycPatch, cycPatch.forwardT(), nbrInfo);
transform(cycPatch, cycPatch.transform().R(), nbrInfo);
}
// if (debug)