zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: improve fileHandler support for redistributePar

Browse Source 
- use file handlers to manage where meshes/fields are to be read and
  written.
This commit is contained in:
mattijs
2022-11-24 09:00:00 +00:00
committed by Andrew Heather
parent 030a467a23
commit c880efb4a6
5 changed files with 963 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
applications/utilities/parallelProcessing/redistributePar/parFaFieldDistributorCache.C
View File

@ -64,6 +64,7 @@ void Foam::parFaFieldDistributorCache::read
const bool decompose, // i.e. read from undecomposed case
const boolList& areaMeshOnProc,
refPtr<fileOperation>& readHandler,
const fileName& areaMeshInstance,
faMesh& mesh
)
@ -76,10 +77,16 @@ void Foam::parFaFieldDistributorCache::read
// Missing an area mesh somewhere?
if (areaMeshOnProc.found(false))
{
const bool oldParRun = UPstream::parRun(false);
const int oldCache = fileOperation::cacheLevel(0);
// A zero-sized mesh with boundaries.
// This is used to create zero-sized fields.
subsetterPtr.reset(new faMeshSubset(mesh, zero{}));
fileOperation::cacheLevel(oldCache);
UPstream::parRun(oldParRun); // Restore parallel state
// Deregister from polyMesh ...
auto& obr = const_cast<objectRegistry&>
(
@ -92,14 +99,26 @@ void Foam::parFaFieldDistributorCache::read
obr.checkOut("faSolution");
}
// Get original objects (before incrementing time!)
if (Pstream::master() && decompose)
if (UPstream::master() && decompose)
{
runTime.caseName() = baseRunTime.caseName();
runTime.processorCase(false);
}
IOobjectList objects(mesh.mesh(), runTime.timeName());
IOobjectList objects; //(mesh.mesh(), runTime.timeName());
if (readHandler)
{
auto oldHandler = fileOperation::fileHandler(readHandler);
const auto oldComm = UPstream::commWorld(fileHandler().comm());
objects = IOobjectList(mesh.mesh(), runTime.timeName());
readHandler = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
if (Pstream::master() && decompose)
{
runTime.caseName() = proc0CaseName;
@ -116,11 +135,13 @@ void Foam::parFaFieldDistributorCache::read
runTime.processorCase(false);
}
#undef doFieldReading
#define doFieldReading(Storage) \
fieldsDistributor::readFields \
( \
areaMeshOnProc, mesh, subsetterPtr, objects, Storage, \
areaMeshOnProc, readHandler, mesh, subsetterPtr, objects, \
Storage, \
true /* (deregister field) */ \
);