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

Rationalised and standardised the naming of neighbour patch functions in the cyclic patch implementations

Browse Source
This commit is contained in:
Henry Weller
2020-01-04 19:32:52 +00:00
parent 43602e0e18
commit bf6de2bcc2
65 changed files with 549 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
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
@ -1048,7 +1048,7 @@ int main(int argc, char *argv[])
if (iter != fluentToFoamType.end())
{
// See if we have a periodic and can derive the other side.
word neighbPatchName;
word nbrPatchName;
if (iter() == cyclicPolyPatch::typeName)
{
// Periodic
@ -1056,22 +1056,22 @@ int main(int argc, char *argv[])
if (n != string::npos)
{
neighbPatchName = name.substr(0, n) + "-SIDE-2";
nbrPatchName = name.substr(0, n) + "-SIDE-2";
}
else
{
n = name.rfind("-SIDE-2");
if (n != string::npos)
{
neighbPatchName = name.substr(0, n) + "-SIDE-1";
nbrPatchName = name.substr(0, n) + "-SIDE-1";
}
}
}
if (neighbPatchName.size())
if (nbrPatchName.size())
{
Info<< "Adding cyclicPolyPatch for Fluent zone " << name
<< " with neighbour patch " << neighbPatchName
<< " with neighbour patch " << nbrPatchName
<< endl;
newPatches[patchi] = new cyclicPolyPatch
@ -1082,7 +1082,7 @@ int main(int argc, char *argv[])
patchi,
mesh.boundaryMesh(),
cyclicPolyPatch::typeName,
neighbPatchName,
nbrPatchName,
cyclicPolyPatch::NOORDERING
);
}

6
applications/utilities/mesh/manipulation/checkMesh/checkGeometry.C
View File

@ -554,7 +554,7 @@ void Foam::writeAMIWeightsSums(const polyMesh& mesh)
{
Info<< "Calculating AMI weights between owner patch: "
<< cpp.name() << " and neighbour patch: "
<< cpp.neighbPatch().name() << endl;
<< cpp.nbrPatch().name() << endl;
writeAMIWeightsSum
(
@ -566,8 +566,8 @@ void Foam::writeAMIWeightsSums(const polyMesh& mesh)
writeAMIWeightsSum
(
mesh,
cpp.neighbPatch(),
cpp.neighbWeightsSum(),
cpp.nbrPatch(),
cpp.nbrWeightsSum(),
fileName("postProcessing") / "tgt_" + tmName
);
}

8
applications/utilities/mesh/manipulation/createPatch/createPatch.C
View File

@ -224,7 +224,7 @@ void writeCyclicMatchObjs(const fileName& prefix, const polyMesh& mesh)
);
}
const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
const cyclicPolyPatch& nbrPatch = cycPatch.nbrPatch();
{
OFstream str(prefix+nbrPatch.name()+".obj");
Pout<< "Writing " << nbrPatch.name()
@ -306,7 +306,7 @@ void syncPoints
pointField patchInfo(procPatch.nPoints(), nullValue);
const labelList& meshPts = procPatch.meshPoints();
const labelList& nbrPts = procPatch.neighbPoints();
const labelList& nbrPts = procPatch.nbrPoints();
forAll(nbrPts, pointi)
{
@ -395,7 +395,7 @@ void syncPoints
const edgeList& coupledPoints = cycPatch.coupledPoints();
const labelList& meshPts = cycPatch.meshPoints();
const cyclicPolyPatch& nbrPatch = cycPatch.neighbPatch();
const cyclicPolyPatch& nbrPatch = cycPatch.nbrPatch();
const labelList& nbrMeshPts = nbrPatch.meshPoints();
pointField half0Values(coupledPoints.size());
@ -782,7 +782,7 @@ int main(int argc, char *argv[])
!= cyclicPolyPatch::TRANSLATIONAL
)
{
const cyclicPolyPatch& nbr = cycpp.neighbPatch();
const cyclicPolyPatch& nbr = cycpp.nbrPatch();
const_cast<vector&>(cpp.transform().t()) =
nbr[0].centre(mesh.points())

4
applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.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-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -186,7 +186,7 @@ void Foam::domainDecomposition::decomposeMesh(const fileName& dict)
const labelUList& patchFaceCells = pp.faceCells();
const labelUList& nbrPatchFaceCells =
pp.neighbPatch().faceCells();
pp.nbrPatch().faceCells();
forAll(patchFaceCells, facei)
{

4
applications/utilities/parallelProcessing/decomposePar/domainDecompositionTemplates.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) 2014-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2014-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -57,7 +57,7 @@ void Foam::domainDecomposition::processInterCyclics
// cyclic: check opposite side on this processor
const labelUList& patchFaceCells = pp.faceCells();
const labelUList& nbrPatchFaceCells =
pp.neighbPatch().faceCells();
pp.nbrPatch().faceCells();
// Store old sizes. Used to detect which inter-proc patches
// have been added to.