songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: fileHandler support for faMeshDistributor and field distributors

Browse Source 
- fatten the interface to continue allowing write control with a bool
  or with a dedicated file handler. This may slim down in the future.

Co-authored-by: mattijs <mattijs>
This commit is contained in:
Mark Olesen 2023-05-23 11:13:26 +02:00
parent d34dfbe0b7
commit 8a060e87cb
10 changed files with 352 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2022 OpenCFD Ltd.
Copyright (C) 2022-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -85,12 +85,33 @@ Foam::parFvFieldDistributor::parFvFieldDistributor
srcMesh_(srcMesh),
tgtMesh_(tgtMesh),
distMap_(distMap),
dummyHandler_(fileOperation::null()),
writeHandler_(dummyHandler_),
isWriteProc_(isWriteProc)
{
createPatchFaceMaps();
}
Foam::parFvFieldDistributor::parFvFieldDistributor
(
const fvMesh& srcMesh,
fvMesh& tgtMesh,
const mapDistributePolyMesh& distMap,
refPtr<fileOperation>& writeHandler
)
:
srcMesh_(srcMesh),
tgtMesh_(tgtMesh),
distMap_(distMap),
dummyHandler_(nullptr),
writeHandler_(writeHandler),
isWriteProc_(Switch::INVALID)
{
createPatchFaceMaps();
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::parFvFieldDistributor::reconstructPoints()
@ -105,9 +126,22 @@ void Foam::parFvFieldDistributor::reconstructPoints()
pointField newPoints(srcMesh_.points(), mapper);
tgtMesh_.movePoints(newPoints);
if (Pstream::master())
if (isWriteProc_.good())
{
if (UPstream::master())
{
tgtMesh_.write();
}
}
else if (writeHandler_ && writeHandler_->good())
{
auto oldHandler = fileOperation::fileHandler(writeHandler_);
const label oldComm = UPstream::commWorld(fileHandler().comm());
tgtMesh_.write();
writeHandler_ = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
}

27
applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributor.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2018-2022 OpenCFD Ltd.
Copyright (C) 2018-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -46,6 +46,7 @@ SourceFiles
#include "PtrList.H"
#include "fvMesh.H"
#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -77,8 +78,14 @@ class parFvFieldDistributor
//- Patch mappers
PtrList<mapDistributeBase> patchFaceMaps_;
//- Do I need to write (eg, master only for reconstruct)
bool isWriteProc_;
//- Storage for dummy handler (when using bool control)
refPtr<fileOperation> dummyHandler_;
//- Write control via a file handler
refPtr<fileOperation>& writeHandler_;
//- Write control as a bool
Switch isWriteProc_;
// Private Member Functions
@ -118,6 +125,20 @@ public:
const bool isWriteProc
);
//- Construct from components
//
// \param srcMesh The source mesh (eg, processor)
// \param tgtMesh The target mesh (eg, reconstructed)
// \param distMap The distribution map
// \param writeHandler Handler for output writing (on this proc)
parFvFieldDistributor
(
const fvMesh& srcMesh,
fvMesh& tgtMesh,
const mapDistributePolyMesh& distMap,
refPtr<fileOperation>& writeHandler
);
// Member Functions

50
applications/utilities/parallelProcessing/redistributePar/parFvFieldDistributorTemplates.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2016-2022 OpenCFD Ltd.
Copyright (C) 2016-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -436,9 +436,23 @@ Foam::label Foam::parFvFieldDistributor::distributeInternalFields
(
distributeInternalField<Type>(*(objects[fieldName]))
);
if (isWriteProc_)
if (isWriteProc_.good())
{
if (isWriteProc_)
{
tfld().write();
}
}
else if (writeHandler_ && writeHandler_->good())
{
auto oldHandler = fileOperation::fileHandler(writeHandler_);
const label oldComm = UPstream::commWorld(fileHandler().comm());
tfld().write();
writeHandler_ = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
}
@ -486,9 +500,23 @@ Foam::label Foam::parFvFieldDistributor::distributeVolumeFields
(
distributeVolumeField<Type>(*(objects[fieldName]))
);
if (isWriteProc_)
if (isWriteProc_.good())
{
if (isWriteProc_)
{
tfld().write();
}
}
else if (writeHandler_ && writeHandler_->good())
{
auto oldHandler = fileOperation::fileHandler(writeHandler_);
const label oldComm = UPstream::commWorld(fileHandler().comm());
tfld().write();
writeHandler_ = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
}
@ -532,9 +560,23 @@ Foam::label Foam::parFvFieldDistributor::distributeSurfaceFields
(
distributeSurfaceField<Type>(*(objects[fieldName]))
);
if (isWriteProc_)
if (isWriteProc_.good())
{
if (isWriteProc_)
{
tfld().write();
}
}
else if (writeHandler_ && writeHandler_->good())
{
auto oldHandler = fileOperation::fileHandler(writeHandler_);
const label oldComm = UPstream::commWorld(fileHandler().comm());
tfld().write();
writeHandler_ = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
}

56
applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2022 OpenCFD Ltd.
Copyright (C) 2022-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -48,6 +48,8 @@ Foam::parPointFieldDistributor::parPointFieldDistributor
tgtMeshRef_(nullptr),
distMapRef_(nullptr),
patchPointMaps_(),
dummyHandler_(fileOperation::null()),
writeHandler_(dummyHandler_),
isWriteProc_(isWriteProc)
{
if (savePoints)
@ -57,6 +59,30 @@ Foam::parPointFieldDistributor::parPointFieldDistributor
}
Foam::parPointFieldDistributor::parPointFieldDistributor
(
const pointMesh& srcMesh,
const bool savePoints,
refPtr<fileOperation>& writeHandler
)
:
srcMesh_(srcMesh),
nOldPoints_(srcMesh.size()),
patchMeshPoints_(),
tgtMeshRef_(nullptr),
distMapRef_(nullptr),
patchPointMaps_(),
dummyHandler_(nullptr),
writeHandler_(writeHandler),
isWriteProc_(Switch::INVALID)
{
if (savePoints)
{
saveMeshPoints();
}
}
Foam::parPointFieldDistributor::parPointFieldDistributor
(
const pointMesh& srcMesh,
@ -72,6 +98,8 @@ Foam::parPointFieldDistributor::parPointFieldDistributor
tgtMeshRef_(tgtMesh),
distMapRef_(distMap),
patchPointMaps_(),
dummyHandler_(fileOperation::null()),
writeHandler_(dummyHandler_),
isWriteProc_(isWriteProc)
{
if (savePoints)
@ -81,6 +109,32 @@ Foam::parPointFieldDistributor::parPointFieldDistributor
}
Foam::parPointFieldDistributor::parPointFieldDistributor
(
const pointMesh& srcMesh,
const pointMesh& tgtMesh,
const mapDistributePolyMesh& distMap,
const bool savePoints,
refPtr<fileOperation>& writeHandler
)
:
srcMesh_(srcMesh),
nOldPoints_(srcMesh.size()),
patchMeshPoints_(),
tgtMeshRef_(tgtMesh),
distMapRef_(distMap),
patchPointMaps_(),
dummyHandler_(nullptr),
writeHandler_(writeHandler),
isWriteProc_(Switch::INVALID)
{
if (savePoints)
{
saveMeshPoints();
}
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::parPointFieldDistributor::hasMeshPoints() const

49
applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributor.H
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2022 OpenCFD Ltd.
Copyright (C) 2022-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -57,6 +57,7 @@ SourceFiles
#include "PtrList.H"
#include "pointMesh.H"
#include "pointFieldsFwd.H"
#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -94,8 +95,14 @@ class parPointFieldDistributor
//- Point patch mappers
PtrList<mapDistributeBase> patchPointMaps_;
//- Do I need to write (eg, master only for reconstruct)
bool isWriteProc_;
//- Storage for dummy handler (when using bool control)
refPtr<fileOperation> dummyHandler_;
//- Write control via a file handler
refPtr<fileOperation>& writeHandler_;
//- Write control as a bool
Switch isWriteProc_;
public:
@ -123,8 +130,20 @@ public:
explicit parPointFieldDistributor
(
const pointMesh& srcMesh,
const bool savePoints = false,
const bool isWriteProc = false
const bool savePoints, // normally false
const bool isWriteProc
);
//- Basic construction
//
// \param srcMesh The source pointMesh
// \param savePoints Call saveMeshPoints() immediately
// \param writeHandler Valid for output writing (on this proc)
explicit parPointFieldDistributor
(
const pointMesh& srcMesh,
const bool savePoints, // normally false
refPtr<fileOperation>& writeHandler
);
//- Full construction of source/target
@ -139,8 +158,24 @@ public:
const pointMesh& srcMesh,
const pointMesh& tgtMesh,
const mapDistributePolyMesh& distMap,
const bool savePoints = false,
const bool isWriteProc = false
const bool savePoints, // normally false
const bool isWriteProc
);
//- Full construction of source/target
//
// \param srcMesh The source pointMesh
// \param tgtMesh The target pointMesh
// \param distMap The distribution map
// \param savePoints Call saveMeshPoints() immediately
// \param writeHandler Valid for output writing (on this proc)
explicit parPointFieldDistributor
(
const pointMesh& srcMesh,
const pointMesh& tgtMesh,
const mapDistributePolyMesh& distMap,
const bool savePoints, // normally false
refPtr<fileOperation>& writeHandler
);

19
applications/utilities/parallelProcessing/redistributePar/parPointFieldDistributorTemplates.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2022 OpenCFD Ltd.
Copyright (C) 2022-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -207,9 +207,24 @@ Foam::label Foam::parPointFieldDistributor::distributePointFields
++nFields;
tmp<fieldType> tfld(distributePointField<Type>(io));
if (isWriteProc_)
if (isWriteProc_.good())
{
if (isWriteProc_)
{
tfld().write();
}
}
else if (writeHandler_ && writeHandler_->good())
{
auto oldHandler = fileOperation::fileHandler(writeHandler_);
const label oldComm = UPstream::commWorld(fileHandler().comm());
tfld().write();
writeHandler_ = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
}

3
applications/utilities/parallelProcessing/redistributePar/redistributePar.C
View File

@ -2622,7 +2622,8 @@ int main(int argc, char *argv[])
(
areaMeshPtr(), // source
areaProcMeshPtr(), // target
faDistMap
faDistMap,
true // isWriteProc (unused)
);
areaFields.redistributeAndWrite(distributor, true);

69
src/finiteArea/distributed/faMeshDistributor.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2022 OpenCFD Ltd.
Copyright (C) 2022-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -96,27 +96,12 @@ void Foam::faMeshDistributor::createInternalEdgeMap() const
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::faMeshDistributor::faMeshDistributor
(
const faMesh& srcMesh,
const faMesh& tgtMesh,
const mapDistributePolyMesh& distMap,
const bool isWriteProc
)
:
srcMesh_(srcMesh),
tgtMesh_(tgtMesh),
distMap_(distMap),
internalEdgeMap_(),
patchEdgeMaps_(),
isWriteProc_(isWriteProc)
void Foam::faMeshDistributor::checkAddressing() const
{
#ifdef FULLDEBUG
{
Pout<< "Create from nFaces:" << srcMesh.faceLabels().size()
<< " to:" << tgtMesh.faceLabels().size() << endl;
Pout<< "Create from nFaces:" << srcMesh_.faceLabels().size()
<< " to:" << tgtMesh_.faceLabels().size() << endl;
// Check face centres
{
@ -155,7 +140,7 @@ Foam::faMeshDistributor::faMeshDistributor
);
Pout<< "distributed edges: " << oldEdgeCentres.size() << " from "
<< srcMesh.nEdges() << " to " << tgtMesh.nEdges() << endl;
<< srcMesh_.nEdges() << " to " << tgtMesh_.nEdges() << endl;
// volume: faces, area: edges
distMap_.distributeFaceData(oldEdgeCentres);
@ -202,6 +187,50 @@ Foam::faMeshDistributor::faMeshDistributor
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::faMeshDistributor::faMeshDistributor
(
const faMesh& srcMesh,
const faMesh& tgtMesh,
const mapDistributePolyMesh& distMap,
const bool isWriteProc
)
:
srcMesh_(srcMesh),
tgtMesh_(tgtMesh),
distMap_(distMap),
internalEdgeMap_(),
patchEdgeMaps_(),
dummyHandler_(fileOperation::null()),
writeHandler_(dummyHandler_),
isWriteProc_(isWriteProc)
{
checkAddressing();
}
Foam::faMeshDistributor::faMeshDistributor
(
const faMesh& srcMesh,
const faMesh& tgtMesh,
const mapDistributePolyMesh& distMap,
refPtr<fileOperation>& writeHandler
)
:
srcMesh_(srcMesh),
tgtMesh_(tgtMesh),
distMap_(distMap),
internalEdgeMap_(),
patchEdgeMaps_(),
dummyHandler_(nullptr),
writeHandler_(writeHandler),
isWriteProc_(Switch::INVALID)
{
checkAddressing();
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::label Foam::faMeshDistributor::distributeAllFields

27
src/finiteArea/distributed/faMeshDistributor.H
View File

@ -45,6 +45,7 @@ SourceFiles
#include "mapDistributePolyMesh.H"
#include "areaFieldsFwd.H"
#include "edgeFieldsFwd.H"
#include "Switch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -77,8 +78,14 @@ class faMeshDistributor
//- Patch edge mappers
mutable PtrList<mapDistributeBase> patchEdgeMaps_;
//- Do I need to write (eg, master only for reconstruct)
bool isWriteProc_;
//- Storage for dummy handler (when using bool control)
refPtr<fileOperation> dummyHandler_;
//- Write control via a file handler
refPtr<fileOperation>& writeHandler_;
//- Write control as a bool
Switch isWriteProc_;
// Private Member Functions
@ -89,6 +96,9 @@ class faMeshDistributor
//- Construct per-patch edge mapping
void createPatchMaps() const;
//- Debug: check addressing
void checkAddressing() const;
static mapDistributePolyMesh createReconstructMap
(
const faMesh& mesh,
@ -117,13 +127,22 @@ public:
// Constructors
//- Construct from components
//- Construct from components, using bool to control writing
faMeshDistributor
(
const faMesh& srcMesh,
const faMesh& tgtMesh,
const mapDistributePolyMesh& faDistMap,
const bool isWriteProc = false
const bool isWriteProc
);
//- Construct from components, using file handler to control writing
faMeshDistributor
(
const faMesh& srcMesh,
const faMesh& tgtMesh,
const mapDistributePolyMesh& faDistMap,
refPtr<fileOperation>& writeHandler
);

63
src/finiteArea/distributed/faMeshDistributorTemplates.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2022 OpenCFD Ltd.
Copyright (C) 2022-2023 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -327,9 +327,23 @@ Foam::label Foam::faMeshDistributor::distributeAreaFields
++nFields;
tmp<fieldType> tfld(distributeAreaField<Type>(io));
if (isWriteProc_)
if (isWriteProc_.good())
{
if (isWriteProc_)
{
tfld().write();
}
}
else if (writeHandler_ && writeHandler_->good())
{
auto oldHandler = fileOperation::fileHandler(writeHandler_);
const label oldComm = UPstream::commWorld(fileHandler().comm());
tfld().write();
writeHandler_ = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
}
@ -371,9 +385,22 @@ Foam::label Foam::faMeshDistributor::distributeEdgeFields
++nFields;
tmp<fieldType> tfld(distributeEdgeField<Type>(io));
if (isWriteProc_)
if (isWriteProc_.good())
{
if (isWriteProc_)
{
tfld().write();
}
}
else if (writeHandler_ && writeHandler_->good())
{
auto oldHandler = fileOperation::fileHandler(writeHandler_);
const label oldComm = UPstream::commWorld(fileHandler().comm());
tfld().write();
writeHandler_ = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
}
@ -397,9 +424,22 @@ void Foam::faMeshDistributor::redistributeAndWrite
tmp<GeometricField<Type, faPatchField, areaMesh>> tfld =
this->distributeField(fld);
if (isWriteProc_)
if (isWriteProc_.good())
{
if (isWriteProc_)
{
tfld().write();
}
}
else if (writeHandler_ && writeHandler_->good())
{
auto oldHandler = fileOperation::fileHandler(writeHandler_);
const label oldComm = UPstream::commWorld(fileHandler().comm());
tfld().write();
writeHandler_ = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
}
}
@ -416,9 +456,22 @@ void Foam::faMeshDistributor::redistributeAndWrite
tmp<GeometricField<Type, faePatchField, edgeMesh>> tfld =
this->distributeField(fld);
if (isWriteProc_)
if (isWriteProc_.good())
{
if (isWriteProc_)
{
tfld().write();
}
}
else if (writeHandler_ && writeHandler_->good())
{
auto oldHandler = fileOperation::fileHandler(writeHandler_);
const label oldComm = UPstream::commWorld(fileHandler().comm());
tfld().write();
writeHandler_ = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
}
}