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

fvMeshDistributor::New: Only construct a real distributor when running in parallel

Browse Source 
otherwise return a fvMeshDistributors::none
This commit is contained in:
Henry Weller
2022-02-01 11:32:27 +00:00
parent 360fd3f804
commit 827be2d71d
1 changed files with 58 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/finiteVolume/fvMesh/fvMeshDistributors/fvMeshDistributor/fvMeshDistributorNew.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) 2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -32,64 +32,69 @@ Foam::autoPtr<Foam::fvMeshDistributor> Foam::fvMeshDistributor::New
fvMesh& mesh
)
{
typeIOobject<IOdictionary> dictHeader
(
IOobject
(
"dynamicMeshDict",
mesh.time().constant(),
mesh.dbDir(),
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
)
);
if (dictHeader.headerOk())
// Only construct a real distributor when running in parallel
// otherwise return a fvMeshDistributors::none
if (Pstream::parRun())
{
IOdictionary dict(dictHeader);
typeIOobject<IOdictionary> dictHeader
(
IOobject
(
"dynamicMeshDict",
mesh.time().constant(),
mesh.dbDir(),
mesh,
IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE,
false
)
);
if (dict.found("distributor"))
if (dictHeader.headerOk())
{
const dictionary& distributorDict = dict.subDict("distributor");
IOdictionary dict(dictHeader);
const word fvMeshDistributorTypeName
(
distributorDict.lookup("type")
);
Info<< "Selecting fvMeshDistributor "
<< fvMeshDistributorTypeName << endl;
libs.open
(
distributorDict,
"libs",
fvMeshConstructorTablePtr_
);
if (!fvMeshConstructorTablePtr_)
if (dict.found("distributor"))
{
FatalErrorInFunction
<< "fvMeshDistributors table is empty"
<< exit(FatalError);
const dictionary& distributorDict = dict.subDict("distributor");
const word fvMeshDistributorTypeName
(
distributorDict.lookup("type")
);
Info<< "Selecting fvMeshDistributor "
<< fvMeshDistributorTypeName << endl;
libs.open
(
distributorDict,
"libs",
fvMeshConstructorTablePtr_
);
if (!fvMeshConstructorTablePtr_)
{
FatalErrorInFunction
<< "fvMeshDistributors table is empty"
<< exit(FatalError);
}
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(fvMeshDistributorTypeName);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
FatalErrorInFunction
<< "Unknown fvMeshDistributor type "
<< fvMeshDistributorTypeName << nl << nl
<< "Valid fvMeshDistributors are :" << endl
<< fvMeshConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<fvMeshDistributor>(cstrIter()(mesh));
}
fvMeshConstructorTable::iterator cstrIter =
fvMeshConstructorTablePtr_->find(fvMeshDistributorTypeName);
if (cstrIter == fvMeshConstructorTablePtr_->end())
{
FatalErrorInFunction
<< "Unknown fvMeshDistributor type "
<< fvMeshDistributorTypeName << nl << nl
<< "Valid fvMeshDistributors are :" << endl
<< fvMeshConstructorTablePtr_->sortedToc()
<< exit(FatalError);
}
return autoPtr<fvMeshDistributor>(cstrIter()(mesh));
}
}