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

fvMeshDistribute: Allow the use of a non-empty patch instead of an internal patch when no fields require mapping

Browse Source
This commit is contained in:
Henry Weller
2021-12-10 16:51:35 +00:00
parent 1151440be8
commit d9be4381f5
2 changed files with 86 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
View File

@ -218,7 +218,7 @@ Foam::labelList Foam::fvMeshDistribute::select
}
void Foam::fvMeshDistribute::checkEqualWordList
Foam::label Foam::fvMeshDistribute::checkEqualWordList
(
const string& msg,
const wordList& lst
@ -241,6 +241,8 @@ void Foam::fvMeshDistribute::checkEqualWordList
<< exit(FatalError);
}
}
return lst.size();
}
@ -372,7 +374,7 @@ Foam::label Foam::fvMeshDistribute::findInternalPatch() const
<< "Cannot find a internal patch in " << patches.names() << nl
<< " of types " << patches.types() << nl
<< " An internal patch must be provided for the exposed "
" internal faces." << exit(FatalError);
"internal faces." << exit(FatalError);
}
if (debug)
@ -408,6 +410,43 @@ Foam::label Foam::fvMeshDistribute::findInternalPatch() const
return internalPatchi;
}
Foam::label Foam::fvMeshDistribute::findNonEmptyPatch() const
{
const polyBoundaryMesh& patches = mesh_.boundaryMesh();
label nonEmptyPatchi = -1;
forAllReverse(patches, patchi)
{
const polyPatch& pp = patches[patchi];
if (!isA<emptyPolyPatch>(pp) && !pp.coupled())
{
nonEmptyPatchi = patchi;
break;
}
}
if (nonEmptyPatchi == -1)
{
FatalErrorInFunction
<< "Cannot find a non-empty patch in " << patches.names() << nl
<< " of types " << patches.types() << nl
<< " An non-empty patch must be provided for the exposed "
"internal faces." << exit(FatalError);
}
if (debug)
{
Pout<< "findNonEmptyPatch : using patch " << nonEmptyPatchi
<< " name:" << patches[nonEmptyPatchi].name()
<< " type:" << patches[nonEmptyPatchi].type()
<< " for the exposed non-empty faces." << endl;
}
return nonEmptyPatchi;
}
Foam::autoPtr<Foam::mapPolyMesh> Foam::fvMeshDistribute::deleteProcPatches
(
@ -1883,66 +1922,76 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
//mesh_.clearOut();
mesh_.resetMotion();
label nFields = 0;
// Get data to send. Make sure is synchronised
const wordList volScalars(mesh_.names(volScalarField::typeName));
checkEqualWordList("volScalarFields", volScalars);
nFields += checkEqualWordList("volScalarFields", volScalars);
const wordList volVectors(mesh_.names(volVectorField::typeName));
checkEqualWordList("volVectorFields", volVectors);
nFields += checkEqualWordList("volVectorFields", volVectors);
const wordList volSphereTensors
(
mesh_.names(volSphericalTensorField::typeName)
);
checkEqualWordList("volSphericalTensorFields", volSphereTensors);
nFields += checkEqualWordList("volSphericalTensorFields", volSphereTensors);
const wordList volSymmTensors(mesh_.names(volSymmTensorField::typeName));
checkEqualWordList("volSymmTensorFields", volSymmTensors);
nFields += checkEqualWordList("volSymmTensorFields", volSymmTensors);
const wordList volTensors(mesh_.names(volTensorField::typeName));
checkEqualWordList("volTensorField", volTensors);
nFields += checkEqualWordList("volTensorField", volTensors);
const wordList surfScalars(mesh_.names(surfaceScalarField::typeName));
checkEqualWordList("surfaceScalarFields", surfScalars);
nFields += checkEqualWordList("surfaceScalarFields", surfScalars);
const wordList surfVectors(mesh_.names(surfaceVectorField::typeName));
checkEqualWordList("surfaceVectorFields", surfVectors);
nFields += checkEqualWordList("surfaceVectorFields", surfVectors);
const wordList surfSphereTensors
(
mesh_.names(surfaceSphericalTensorField::typeName)
);
checkEqualWordList("surfaceSphericalTensorFields", surfSphereTensors);
nFields += checkEqualWordList
(
"surfaceSphericalTensorFields",
surfSphereTensors
);
const wordList surfSymmTensors
(
mesh_.names(surfaceSymmTensorField::typeName)
);
checkEqualWordList("surfaceSymmTensorFields", surfSymmTensors);
nFields += checkEqualWordList("surfaceSymmTensorFields", surfSymmTensors);
const wordList surfTensors(mesh_.names(surfaceTensorField::typeName));
checkEqualWordList("surfaceTensorFields", surfTensors);
nFields += checkEqualWordList("surfaceTensorFields", surfTensors);
const wordList pointScalars(mesh_.names(pointScalarField::typeName));
checkEqualWordList("pointScalarFields", pointScalars);
nFields += checkEqualWordList("pointScalarFields", pointScalars);
const wordList pointVectors(mesh_.names(pointVectorField::typeName));
checkEqualWordList("pointVectorFields", pointVectors);
nFields += checkEqualWordList("pointVectorFields", pointVectors);
const wordList pointSphereTensors
(
mesh_.names(pointSphericalTensorField::typeName)
);
checkEqualWordList("pointSphericalTensorFields", pointSphereTensors);
nFields += checkEqualWordList
(
"pointSphericalTensorFields",
pointSphereTensors
);
const wordList pointSymmTensors
(
mesh_.names(pointSymmTensorField::typeName)
);
checkEqualWordList("pointSymmTensorFields", pointSymmTensors);
nFields += checkEqualWordList("pointSymmTensorFields", pointSymmTensors);
const wordList pointTensors(mesh_.names(pointTensorField::typeName));
checkEqualWordList("pointTensorFields", pointTensors);
nFields += checkEqualWordList("pointTensorFields", pointTensors);
const wordList dimScalars(mesh_.names(volScalarField::Internal::typeName));
checkEqualWordList("volScalarField::Internal", dimScalars);
nFields += checkEqualWordList("volScalarField::Internal", dimScalars);
const wordList dimVectors(mesh_.names(volVectorField::Internal::typeName));
checkEqualWordList("volVectorField::Internal", dimVectors);
nFields += checkEqualWordList("volVectorField::Internal", dimVectors);
const wordList dimSphereTensors
(
mesh_.names(volSphericalTensorField::Internal::typeName)
);
checkEqualWordList
nFields += checkEqualWordList
(
"volSphericalTensorField::Internal",
dimSphereTensors
@ -1952,17 +2001,22 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
(
mesh_.names(volSymmTensorField::Internal::typeName)
);
checkEqualWordList
nFields += checkEqualWordList
(
"volSymmTensorField::Internal",
dimSymmTensors
);
const wordList dimTensors(mesh_.names(volTensorField::Internal::typeName));
checkEqualWordList("volTensorField::Internal", dimTensors);
nFields += checkEqualWordList("volTensorField::Internal", dimTensors);
// Find patch to temporarily put exposed and processor faces into.
const label oldInternalPatchi = findInternalPatch();
// Find patch to temporarily put exposed internal and processor faces into.
// If there are no fields patch 0 is used,
// If there are fields the internal patch is used.
const label oldInternalPatchi =
nFields
? findInternalPatch()
: findNonEmptyPatch();
// Delete processor patches, starting from the back. Move all faces into
// oldInternalPatchi.

10
src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
View File

@ -94,8 +94,9 @@ class fvMeshDistribute
const label value
);
//- Check all procs have same names and in exactly same order.
static void checkEqualWordList(const string&, const wordList&);
//- Check all procs have same names and in exactly same order
// and return the number of fields
static label checkEqualWordList(const string&, const wordList&);
//- Merge wordlists over all processors
static wordList mergeWordList(const wordList&);
@ -104,8 +105,13 @@ class fvMeshDistribute
// Patch handling
//- Find internal patch to put exposed internal faces into
// Used when fields are present and require mapping
label findInternalPatch() const;
//- Find non-empty patch to put exposed internal faces into
// Used when no fields require mapping
label findNonEmptyPatch() const;
//- Save boundary fields
template<class T, class Mesh>
void saveBoundaryFields