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

STYLE: communication name "buffered" instead of "blocking"

Browse Source 
- "buffered" corresponds to MPI_Bsend (buffered send),
  whereas the old name "blocking" is misleading since the
  regular MPI_Send also blocks until completion
  (ie, buffer can be reused).

ENH: IPstream::read() returns std::streamsize instead of label (#3152)

- previously returned a 'label' but std::streamsize is consistent with
  the input parameter and will help with later adjustments.

- use <label> instead of <int> for internal accounting of the message
  size, for consistency with the underyling List<char> buffers used.

- improve handling for corner case of IPstream receive with
  non-blocking, although this combination is not used anywhere
This commit is contained in:
Mark Olesen
2024-04-26 10:17:43 +02:00
parent e1d45ec26e
commit 7f355ba343
104 changed files with 351 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/test/parallel-comm1/Test-parallel-comm1.C
View File

@ -62,7 +62,7 @@ scalar sumReduce
scalar procValue;
UIPstream::read
(
UPstream::commsTypes::blocking,
UPstream::commsTypes::buffered,
proci,
reinterpret_cast<char*>(&procValue),
sizeof(scalar),
@ -79,7 +79,7 @@ scalar sumReduce
{
UOPstream::write
(
UPstream::commsTypes::blocking,
UPstream::commsTypes::buffered,
proci,
reinterpret_cast<const char*>(&sum),
sizeof(scalar),
@ -93,7 +93,7 @@ scalar sumReduce
{
UOPstream::write
(
UPstream::commsTypes::blocking,
UPstream::commsTypes::buffered,
UPstream::masterNo(),
reinterpret_cast<const char*>(&localValue),
sizeof(scalar),
@ -105,7 +105,7 @@ scalar sumReduce
{
UIPstream::read
(
UPstream::commsTypes::blocking,
UPstream::commsTypes::buffered,
UPstream::masterNo(),
reinterpret_cast<char*>(&sum),
sizeof(scalar),

8
applications/test/parallel/Test-parallel.C
View File

@ -131,7 +131,7 @@ void testTransfer(const T& input)
for (const int proci : UPstream::subProcs())
{
Perr<< "master sending to proc:" << proci << endl;
OPstream os(UPstream::commsTypes::blocking, proci);
OPstream os(UPstream::commsTypes::buffered, proci);
os << data;
}
}
@ -139,7 +139,7 @@ void testTransfer(const T& input)
{
{
Perr<< "proc sending to master" << endl;
OPstream os(UPstream::commsTypes::blocking, UPstream::masterNo());
OPstream os(UPstream::commsTypes::buffered, UPstream::masterNo());
os << data;
}
@ -169,7 +169,7 @@ void testTokenized(const T& data)
for (const int proci : UPstream::subProcs())
{
Perr<< "master sending to proc:" << proci << endl;
OPstream os(UPstream::commsTypes::blocking, proci);
OPstream os(UPstream::commsTypes::buffered, proci);
os << tok;
}
}
@ -177,7 +177,7 @@ void testTokenized(const T& data)
{
{
Perr<< "proc sending to master" << endl;
OPstream os(UPstream::commsTypes::blocking, UPstream::masterNo());
OPstream os(UPstream::commsTypes::buffered, UPstream::masterNo());
os << tok;
}

2
applications/test/surface-sampling/mydebugSurfaceWriter.H
View File

@ -44,7 +44,7 @@ Description
Format options:
\table
Property | Description | Required | Default
commsType | blocking/nonBlocking/scheduled | no | scheduled
commsType | scheduled/nonBlocking/buffered | no | scheduled
merge | Enable geometry/field merging | no | true
write | Write file(s) | no | false
narrow | Communicate with narrowed values | no | false

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

@ -568,10 +568,9 @@ void syncPoints
}
}
// buffered send
OPstream toNbr
(
UPstream::commsTypes::blocking,
UPstream::commsTypes::buffered,
procPatch.neighbProcNo()
);
toNbr << patchInfo;

2
applications/utilities/preProcessing/mapFieldsPar/MapVolFields.H
View File

@ -48,7 +48,7 @@ void evaluateConstraintTypes(GeometricField<Type, fvPatchField, volMesh>& fld)
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::nonBlocking
)
{

2
etc/controlDict
View File

@ -132,7 +132,7 @@ OptimisationSwitches
// MPI/Parallel settings
// =====================
// Default communication type (nonBlocking | scheduled | blocking);
// Default communication type (nonBlocking | scheduled | buffered)
commsType nonBlocking;
// Transfer double as float for processor boundaries. Mostly defunct.

4
src/OpenFOAM/containers/Lists/SortableList/ParSortableList.C
View File

@ -115,7 +115,7 @@ void Foam::ParSortableList<Type>::checkAndSend
}
{
OPstream toProc(UPstream::commsTypes::blocking, destProci);
OPstream toProc(UPstream::commsTypes::buffered, destProci);
toProc << values << indices;
}
}
@ -309,7 +309,7 @@ void Foam::ParSortableList<Type>::sort()
Pout<< "Receiving from " << proci << endl;
}
IPstream fromProc(UPstream::commsTypes::blocking, proci);
IPstream fromProc(UPstream::commsTypes::buffered, proci);
fromProc >> recValues >> recIndices;

6
src/OpenFOAM/db/IOstreams/Pstreams/OPstreams.C
View File

@ -101,6 +101,12 @@ Foam::UOPstream::~UOPstream()
{
if (sendAtDestruct_)
{
// Note: sendAtDestruct_ and nonBlocking is a questionable combination
// since the transfer buffer will be destroyed before
// the non-blocking send completes!
//
// Could flag as an error, but not actually used anywhere.
if (!bufferIPCsend())
{
FatalErrorInFunction

4
src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H
View File

@ -32,7 +32,7 @@ Description
Use UOPstream to stream data into buffers, call finishedSends() to
notify that data is in buffers and then use IUPstream to get data out
of received buffers. Works with both blocking and non-blocking. Does
of received buffers. Works with both buffered and non-blocking. Does
not make much sense with scheduled since there you would not need these
explicit buffers.
@ -51,7 +51,7 @@ Description
}
}
pBufs.finishedSends(); // no-op for blocking
pBufs.finishedSends(); // no-op for buffered
for (const int proci : UPstream::allProcs())
{

24
src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2017-2023 OpenCFD Ltd.
Copyright (C) 2017-2024 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -96,7 +96,7 @@ protected:
const int comm_;
//- The message size, read on bufferIPCrecv or set directly
int messageSize_;
label messageSize_;
//- Receive position in buffer data, if ony
//- If there is no external location for recvBufPos_
@ -279,8 +279,8 @@ public:
// Static Functions
//- Read buffer contents from given processor.
// \return the message size (bytes read)
static label read
// \return the message size (bytes read). May change in the future
static std::streamsize read
(
const UPstream::commsTypes commsType,
const int fromProcNo,
@ -293,8 +293,8 @@ public:
);
//- Read buffer contents (non-blocking) from given processor.
// \return the message size (bytes read)
inline static label read
// \return the message size (bytes read). May change in the future
inline static std::streamsize read
(
//! [out] request information
UPstream::Request& req,
@ -321,7 +321,7 @@ public:
// Only valid for contiguous data types.
// \return the message size (bytes read). May change in the future
template<class Type>
inline static label read
inline static std::streamsize read
(
const UPstream::commsTypes commsType,
const int fromProcNo,
@ -348,7 +348,7 @@ public:
// Only valid for contiguous data types.
// \return the message size (bytes read). May change in the future
template<class Type>
inline static label read
inline static std::streamsize read
(
const UPstream::commsTypes commsType,
const int fromProcNo,
@ -375,7 +375,7 @@ public:
// Only valid for contiguous data types.
// \return the message size (bytes read). May change in the future
template<class Type>
inline static label read
inline static std::streamsize read
(
//! [out] request information
UPstream::Request& req,
@ -401,7 +401,7 @@ public:
// Only valid for contiguous data types.
// \return the message size (bytes read). May change in the future
template<class Type>
inline static label read
inline static std::streamsize read
(
//! [out] request information
UPstream::Request& req,
@ -474,8 +474,8 @@ public:
// Static Functions
//- Wrapped version of UPstream::broadcast
// \return the message size (bytes read)
static label read
// \return the message size (bytes read). May change in the future
static std::streamsize read
(
const int rootProcNo, //!< normally UPstream::masterNo()
char* buf,

4
src/OpenFOAM/db/IOstreams/Pstreams/UPstream.C
View File

@ -50,9 +50,11 @@ const Foam::Enum
>
Foam::UPstream::commsTypeNames
({
{ commsTypes::blocking, "blocking" }, // "buffered"
{ commsTypes::buffered, "buffered" }, // "buffered"
{ commsTypes::scheduled, "scheduled" },
{ commsTypes::nonBlocking, "nonBlocking" }, // "immediate"
// compatibility names
{ commsTypes::buffered, "blocking" },
});

8
src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H
View File

@ -73,15 +73,17 @@ public:
//- Communications types
enum class commsTypes : char
{
blocking, //!< "blocking" (buffered) : (MPI_Bsend, MPI_Recv)
buffered, //!< "buffered" : (MPI_Bsend, MPI_Recv)
scheduled, //!< "scheduled" (MPI standard) : (MPI_Send, MPI_Recv)
nonBlocking //!< "nonBlocking" (immediate) : (MPI_Isend, MPI_Irecv)
nonBlocking, //!< "nonBlocking" (immediate) : (MPI_Isend, MPI_Irecv)
// Aliases
blocking = buffered //!< compatibility name for buffered
};
//- Enumerated names for the communication types
static const Enum<commsTypes> commsTypeNames;
//- Different MPI-send modes (ignored for commsTypes::blocking)
//- Different MPI-send modes (ignored for commsTypes::buffered)
enum class sendModes : char
{
normal, //!< (MPI_Send, MPI_Isend)

6
src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricBoundaryField.C
View File

@ -598,7 +598,7 @@ void Foam::GeometricBoundaryField<Type, PatchField, GeoMesh>::evaluate()
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::nonBlocking
)
{
@ -689,7 +689,7 @@ void Foam::GeometricBoundaryField<Type, PatchField, GeoMesh>::evaluateLocal()
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::nonBlocking
)
{
@ -755,7 +755,7 @@ Foam::GeometricBoundaryField<Type, PatchField, GeoMesh>
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::nonBlocking
)
{

2
src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H
View File

@ -111,7 +111,7 @@ public:
//- Update the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
const Pstream::commsTypes commsType = Pstream::commsTypes::buffered
);

2
src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H
View File

@ -119,7 +119,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
) = 0;
//- Initialise swap of patch point values

2
src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H
View File

@ -202,7 +202,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);

2
src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H
View File

@ -152,7 +152,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

2
src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H
View File

@ -115,7 +115,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
};

2
src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H
View File

@ -115,7 +115,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
};

2
src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H
View File

@ -154,7 +154,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

2
src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H
View File

@ -153,7 +153,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

2
src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H
View File

@ -126,7 +126,7 @@ public:
//- Update the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
};

2
src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H
View File

@ -121,7 +121,7 @@ public:
//- Update the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
};

2
src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C
View File

@ -192,7 +192,7 @@ Foam::codedFixedValuePointPatchField<Type>::codedFixedValuePointPatchField
this->extrapolateInternal();
// Evaluate to assign a value
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}

2
src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H
View File

@ -243,7 +243,7 @@ public:
//- Evaluate the patch field, sets updated() to false
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
//- Write

2
src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H
View File

@ -132,7 +132,7 @@ public:
//- Update the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
//- Write

8
src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H
View File

@ -562,14 +562,14 @@ public:
//- Initialise evaluation of the patch field (do nothing)
virtual void initEvaluate
(
const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
const Pstream::commsTypes commsType = Pstream::commsTypes::buffered
)
{}
//- Evaluate the patch field, sets updated() to false
virtual void evaluate
(
const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
const Pstream::commsTypes commsType = Pstream::commsTypes::buffered
);
//- Initialise the evaluation of the patch field after a local
@ -577,7 +577,7 @@ public:
virtual void initEvaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -585,7 +585,7 @@ public:
virtual void evaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

10
src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrixUpdateMatrixInterfaces.C
View File

@ -44,7 +44,7 @@ void Foam::LduMatrix<Type, DType, LUType>::initMatrixInterfaces
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::nonBlocking
)
{
@ -88,7 +88,7 @@ void Foam::LduMatrix<Type, DType, LUType>::initMatrixInterfaces
interfacei,
psiif,
interfaceCoeffs[interfacei],
UPstream::commsTypes::blocking
UPstream::commsTypes::buffered
);
}
}
@ -172,7 +172,7 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::nonBlocking
)
{
@ -184,7 +184,7 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
}
// Check/no-check for updatedMatrix() ?
const bool noCheck = (commsType == UPstream::commsTypes::blocking);
const bool noCheck = (commsType == UPstream::commsTypes::buffered);
forAll(interfaces_, interfacei)
{
@ -264,7 +264,7 @@ void Foam::LduMatrix<Type, DType, LUType>::updateMatrixInterfaces
interfacei,
psiif,
interfaceCoeffs[interfacei],
UPstream::commsTypes::blocking
UPstream::commsTypes::buffered
);
}
}

8
src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterfaceTemplates.C
View File

@ -43,7 +43,7 @@ void Foam::processorLduInterface::send
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::scheduled
)
{
@ -113,7 +113,7 @@ void Foam::processorLduInterface::receive
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::scheduled
)
{
@ -194,7 +194,7 @@ void Foam::processorLduInterface::compressedSend
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::scheduled
)
{
@ -272,7 +272,7 @@ void Foam::processorLduInterface::compressedReceive
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::scheduled
)
{

10
src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
View File

@ -44,7 +44,7 @@ void Foam::lduMatrix::initMatrixInterfaces
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::nonBlocking
)
{
@ -90,7 +90,7 @@ void Foam::lduMatrix::initMatrixInterfaces
psiif,
coupleCoeffs[interfacei],
cmpt,
UPstream::commsTypes::blocking
UPstream::commsTypes::buffered
);
}
}
@ -229,7 +229,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::nonBlocking
)
{
@ -241,7 +241,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
}
// Check/no-check for updatedMatrix() ?
const bool noCheck = (commsType == UPstream::commsTypes::blocking);
const bool noCheck = (commsType == UPstream::commsTypes::buffered);
// Consume anything still outstanding
forAll(interfaces, interfacei)
@ -326,7 +326,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
psiif,
coupleCoeffs[interfacei],
cmpt,
UPstream::commsTypes::blocking
UPstream::commsTypes::buffered
);
}
}

6
src/OpenFOAM/meshes/pointMesh/pointBoundaryMesh/pointBoundaryMesh.C
View File

@ -111,7 +111,7 @@ void Foam::pointBoundaryMesh::calcGeometry()
if
(
pBufs.commsType() == Pstream::commsTypes::blocking
pBufs.commsType() == Pstream::commsTypes::buffered
|| pBufs.commsType() == Pstream::commsTypes::nonBlocking
)
{
@ -157,7 +157,7 @@ void Foam::pointBoundaryMesh::movePoints(const pointField& p)
if
(
pBufs.commsType() == Pstream::commsTypes::blocking
pBufs.commsType() == Pstream::commsTypes::buffered
|| pBufs.commsType() == Pstream::commsTypes::nonBlocking
)
{
@ -203,7 +203,7 @@ void Foam::pointBoundaryMesh::updateMesh()
if
(
pBufs.commsType() == Pstream::commsTypes::blocking
pBufs.commsType() == Pstream::commsTypes::buffered
|| pBufs.commsType() == Pstream::commsTypes::nonBlocking
)
{

4
src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C
View File

@ -494,7 +494,7 @@ void Foam::mapDistributeBase::distribute
return;
}
if (commsType == UPstream::commsTypes::blocking)
if (commsType == UPstream::commsTypes::buffered)
{
// Since buffered sending can reuse the field to collect the
// received data.
@ -939,7 +939,7 @@ void Foam::mapDistributeBase::distribute
return;
}
if (commsType == UPstream::commsTypes::blocking)
if (commsType == UPstream::commsTypes::buffered)
{
// Since buffered sending can reuse the field to collect the
// received data.

6
src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
View File

@ -304,7 +304,7 @@ void Foam::polyBoundaryMesh::calcGeometry()
if
(
pBufs.commsType() == Pstream::commsTypes::blocking
pBufs.commsType() == Pstream::commsTypes::buffered
|| pBufs.commsType() == Pstream::commsTypes::nonBlocking
)
{
@ -1297,7 +1297,7 @@ void Foam::polyBoundaryMesh::movePoints(const pointField& p)
if
(
pBufs.commsType() == Pstream::commsTypes::blocking
pBufs.commsType() == Pstream::commsTypes::buffered
|| pBufs.commsType() == Pstream::commsTypes::nonBlocking
)
{
@ -1347,7 +1347,7 @@ void Foam::polyBoundaryMesh::updateMesh()
if
(
pBufs.commsType() == Pstream::commsTypes::blocking
pBufs.commsType() == Pstream::commsTypes::buffered
|| pBufs.commsType() == Pstream::commsTypes::nonBlocking
)
{

4
src/Pstream/dummy/UIPBstreamRead.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2022-2023 OpenCFD Ltd.
Copyright (C) 2022-2024 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -37,7 +37,7 @@ void Foam::UIPBstream::bufferIPCrecv()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::label Foam::UIPBstream::read
std::streamsize Foam::UIPBstream::read
(
const int rootProcNo,
char* buf,

4
src/Pstream/dummy/UIPstreamRead.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2021-2023 OpenCFD Ltd.
Copyright (C) 2021-2024 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -38,7 +38,7 @@ void Foam::UIPstream::bufferIPCrecv()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::label Foam::UIPstream::read
std::streamsize Foam::UIPstream::read
(
const UPstream::commsTypes commsType,
const int fromProcNo,

57
src/Pstream/mpi/UIPBstreamRead.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2022-2023 OpenCFD Ltd.
Copyright (C) 2022-2024 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -39,7 +39,7 @@ void Foam::UIPBstream::bufferIPCrecv()
// Expected message size, similar to MPI_Probe
// Same type must be expected in UOPBstream::bufferIPCsend()
label bufSize(0);
std::streamsize bufSize(0);
// Broadcast #1 - data size
if
@ -47,7 +47,7 @@ void Foam::UIPBstream::bufferIPCrecv()
!UPstream::broadcast
(
reinterpret_cast<char*>(&bufSize),
sizeof(label),
sizeof(std::streamsize),
comm_,
fromProcNo_ //< is actually rootProcNo
)
@ -63,46 +63,45 @@ void Foam::UIPBstream::bufferIPCrecv()
Pout<< "UOPBstream IPC read buffer :"
<< " root:" << fromProcNo_
<< " comm:" << comm_
<< " probed size:" << bufSize
<< " probed size:" << label(bufSize)
<< " wanted size:" << recvBuf_.capacity()
<< Foam::endl;
}
// No buffer size allocated/specified
if (!recvBuf_.capacity())
// Set buffer size, avoiding any copying and resize doubling etc.
recvBuf_.clear();
if (recvBuf_.capacity() < label(bufSize))
{
recvBuf_.resize(bufSize);
recvBuf_.setCapacity_nocopy(label(bufSize));
}
recvBuf_.resize_nocopy(label(bufSize));
// This is the only real information we can trust
messageSize_ = bufSize;
messageSize_ = label(bufSize);
// Broadcast #2 - data content
// - skip if there is no data to receive
if (messageSize_)
{
if
if
(
(bufSize > 0)
&& !UPstream::broadcast
(
!UPstream::broadcast
(
recvBuf_.data(),
messageSize_, // same as bufSize
comm_,
fromProcNo_ //< is actually rootProcNo
)
recvBuf_.data(),
recvBuf_.size(), // same as bufSize
comm_,
fromProcNo_ //< is actually rootProcNo
)
{
FatalErrorInFunction
<< "MPI_Bcast failure receiving buffer data:" << bufSize << nl
<< Foam::abort(FatalError);
}
)
{
FatalErrorInFunction
<< "MPI_Bcast failure receiving buffer data:"
<< recvBuf_.size() << nl
<< Foam::abort(FatalError);
}
// Set addressed size. Leave actual allocated memory intact.
recvBuf_.resize(messageSize_);
if (!messageSize_)
if (recvBuf_.empty())
{
setEof();
}
@ -111,7 +110,7 @@ void Foam::UIPBstream::bufferIPCrecv()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::label Foam::UIPBstream::read
std::streamsize Foam::UIPBstream::read
(
const int rootProcNo,
char* buf,

121
src/Pstream/mpi/UIPstreamRead.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2019-2023 OpenCFD Ltd.
Copyright (C) 2019-2024 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -37,9 +37,8 @@ License
// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
// General blocking/non-blocking MPI receive, optionally with probed
// message information.
static Foam::label UPstream_mpi_receive
// General blocking/non-blocking MPI receive
static std::streamsize UPstream_mpi_receive
(
const Foam::UPstream::commsTypes commsType,
char* buf,
@ -54,34 +53,48 @@ static Foam::label UPstream_mpi_receive
PstreamGlobals::reset_request(req);
if (UPstream::debug)
// TODO: some corrective action, at least when not nonBlocking
#if 0
// No warnings here, just on the sender side.
if (bufSize > std::streamsize(INT_MAX))
{
Pout<< "UIPstream::read : starting read from:" << fromProcNo
<< " tag:" << tag << " comm:" << communicator
<< " wanted size:" << label(bufSize)
<< " commsType:" << UPstream::commsTypeNames[commsType]
<< Foam::endl;
Perr<< "UIPstream::read() : from rank " << fromProcNo
<< " exceeds INT_MAX bytes" << Foam::endl;
error::printStack(Perr);
}
#endif
if (UPstream::warnComm >= 0 && communicator != UPstream::warnComm)
{
Pout<< "UIPstream::read : starting read from:" << fromProcNo
<< " size:" << label(bufSize)
<< " tag:" << tag << " comm:" << communicator
<< " wanted size:" << label(bufSize)
<< " commsType:" << UPstream::commsTypeNames[commsType]
<< " warnComm:" << UPstream::warnComm
<< Foam::endl;
error::printStack(Pout);
}
else if (UPstream::debug)
{
Pout<< "UIPstream::read : starting read from:" << fromProcNo
<< " size:" << label(bufSize)
<< " tag:" << tag << " comm:" << communicator
<< " commsType:" << UPstream::commsTypeNames[commsType]
<< Foam::endl;
}
int returnCode = MPI_ERR_UNKNOWN;
profilingPstream::beginTiming();
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::scheduled
)
{
int returnCode = 0;
// Not UPstream::commsTypes::nonBlocking
MPI_Status status;
{
@ -97,6 +110,8 @@ static Foam::label UPstream_mpi_receive
);
}
profilingPstream::addGatherTime();
if (returnCode != MPI_SUCCESS)
{
FatalErrorInFunction
@ -104,36 +119,31 @@ static Foam::label UPstream_mpi_receive
<< Foam::abort(FatalError);
return 0;
}
profilingPstream::addGatherTime();
// Check size of message read
int messageSize;
MPI_Get_count(&status, MPI_BYTE, &messageSize);
if (UPstream::debug)
else if (UPstream::debug)
{
Pout<< "UIPstream::read : finished read from:" << fromProcNo
<< " tag:" << tag << " read size:" << label(bufSize)
<< " commsType:" << UPstream::commsTypeNames[commsType]
Pout<< "UIPstream::read : finished recv from:"
<< fromProcNo
<< " size:" << label(bufSize) << " tag:" << tag
<< Foam::endl;
}
if (messageSize > bufSize)
// Check size of message read
int count(0);
MPI_Get_count(&status, MPI_BYTE, &count);
if (bufSize < std::streamsize(count))
{
FatalErrorInFunction
<< "buffer (" << label(bufSize)
<< ") not large enough for incoming message ("
<< messageSize << ')'
<< label(count) << ')'
<< Foam::abort(FatalError);
}
return messageSize;
return std::streamsize(count);
}
else if (commsType == UPstream::commsTypes::nonBlocking)
{
int returnCode = 0;
MPI_Request request;
{
@ -158,19 +168,20 @@ static Foam::label UPstream_mpi_receive
return 0;
}
PstreamGlobals::push_request(request, req);
profilingPstream::addRequestTime();
if (UPstream::debug)
{
Pout<< "UIPstream::read : started read from:" << fromProcNo
<< " tag:" << tag << " read size:" << label(bufSize)
<< " commsType:" << UPstream::commsTypeNames[commsType]
Pout<< "UIPstream::read : started non-blocking recv from:"
<< fromProcNo
<< " size:" << label(bufSize) << " tag:" << tag
<< " request:" <<
(req ? label(-1) : PstreamGlobals::outstandingRequests_.size())
<< Foam::endl;
}
PstreamGlobals::push_request(request, req);
profilingPstream::addRequestTime();
// Assume the message will be completely received.
return bufSize;
}
@ -197,9 +208,24 @@ void Foam::UIPstream::bufferIPCrecv()
<< Foam::endl;
}
// No buffer size allocated/specified - probe size of incoming message
if (!recvBuf_.capacity())
// Fallback value
messageSize_ = recvBuf_.capacity();
if (commsType() == UPstream::commsTypes::nonBlocking)
{
// Non-blocking
// ~~~~~~~~~~~~
// No chance of probing for size nor relying on the returned message
// size (since it returns immediately without any further checks)
//
// Fortunately there are not many (any?) places that are using
// a non-blocking IPstream with streaming anyhow.
messageSize_ = recvBuf_.size();
}
else if (!recvBuf_.capacity())
{
// No buffer size allocated/specified - probe size of incoming message
profilingPstream::beginTiming();
MPI_Status status;
@ -212,24 +238,26 @@ void Foam::UIPstream::bufferIPCrecv()
&status
);
MPI_Get_count(&status, MPI_BYTE, &messageSize_);
profilingPstream::addProbeTime();
recvBuf_.resize(messageSize_);
int count(0);
MPI_Get_count(&status, MPI_BYTE, &count);
if (UPstream::debug)
{
Pout<< "UIPstream::UIPstream : probed size:"
<< messageSize_ << Foam::endl;
<< label(count) << Foam::endl;
}
recvBuf_.resize(label(count));
messageSize_ = label(count);
}
messageSize_ = UPstream_mpi_receive
std::streamsize count = UPstream_mpi_receive
(
commsType(),
recvBuf_.data(),
recvBuf_.capacity(),
messageSize_, // The expected size
fromProcNo_,
tag_,
comm_,
@ -237,9 +265,10 @@ void Foam::UIPstream::bufferIPCrecv()
);
// Set addressed size. Leave actual allocated memory intact.
recvBuf_.resize(messageSize_);
recvBuf_.resize(label(count));
messageSize_ = label(count);
if (!messageSize_)
if (recvBuf_.empty())
{
setEof();
}
@ -248,7 +277,7 @@ void Foam::UIPstream::bufferIPCrecv()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::label Foam::UIPstream::read
std::streamsize Foam::UIPstream::read
(
const UPstream::commsTypes commsType,
const int fromProcNo,

46
src/Pstream/mpi/UOPBstreamWrite.C
View File

@ -40,7 +40,17 @@ bool Foam::UOPBstream::bufferIPCsend()
PstreamGlobals::checkCommunicator(comm_, toProcNo_);
// Same type must be expected in UIPBstream::bufferIPCrecv()
label bufSize(sendBuf_.size());
std::streamsize bufSize(sendBuf_.size());
// TODO: some corrective action
#if 0
if (bufSize > std::streamsize(INT_MAX))
{
Perr<< "UOPBstream::write() :"
<< " exceeds INT_MAX bytes" << Foam::endl;
error::printStack(Perr);
}
#endif
// Broadcast #1 - data size
if
@ -48,7 +58,7 @@ bool Foam::UOPBstream::bufferIPCsend()
!UPstream::broadcast
(
reinterpret_cast<char*>(&bufSize),
sizeof(label),
sizeof(std::streamsize),
comm_,
toProcNo_ //< is actually rootProcNo
)
@ -60,26 +70,26 @@ bool Foam::UOPBstream::bufferIPCsend()
return false;
}
// Broadcast #2 - data content
// - skip if there is no data to send
if (bufSize)
{
if
if
(
(bufSize > 0)
&& !UPstream::broadcast
(
!UPstream::broadcast
(
sendBuf_.data(),
sendBuf_.size(), // same as bufSize
comm_,
toProcNo_ //< is actually rootProcNo
)
sendBuf_.data(),
sendBuf_.size(), // same as bufSize
comm_,
toProcNo_ //< is actually rootProcNo
)
{
FatalErrorInFunction
<< "MPI_Bcast failure sending buffer data:" << bufSize << nl
<< Foam::abort(FatalError);
return false;
}
)
{
FatalErrorInFunction
<< "MPI_Bcast failure sending buffer data:"
<< sendBuf_.size() << nl
<< Foam::abort(FatalError);
return false;
}
return true;

46
src/Pstream/mpi/UOPstreamWrite.C
View File

@ -62,24 +62,34 @@ bool Foam::UOPstream::write
{
PstreamGlobals::reset_request(req);
if (UPstream::debug)
// TODO: some corrective action, at least when not nonBlocking
#if 0
if (bufSize > std::streamsize(INT_MAX))
{
Pout<< "UOPstream::write : starting write to:" << toProcNo
<< " tag:" << tag
<< " comm:" << communicator << " size:" << label(bufSize)
<< " commType:" << UPstream::commsTypeNames[commsType]
<< Foam::endl;
Perr<< "UOPstream::write() : to rank " << toProcNo
<< " exceeds INT_MAX bytes" << Foam::endl;
error::printStack(Perr);
}
#endif
if (UPstream::warnComm >= 0 && communicator != UPstream::warnComm)
{
Pout<< "UOPstream::write : starting write to:" << toProcNo
<< " tag:" << tag
<< " comm:" << communicator << " size:" << label(bufSize)
<< " size:" << label(bufSize)
<< " tag:" << tag << " comm:" << communicator
<< " commType:" << UPstream::commsTypeNames[commsType]
<< " warnComm:" << UPstream::warnComm
<< Foam::endl;
error::printStack(Pout);
}
else if (UPstream::debug)
{
Pout<< "UOPstream::write : starting write to:" << toProcNo
<< " size:" << label(bufSize)
<< " tag:" << tag << " comm:" << communicator
<< " commType:" << UPstream::commsTypeNames[commsType]
<< Foam::endl;
}
PstreamGlobals::checkCommunicator(communicator, toProcNo);
@ -87,7 +97,7 @@ bool Foam::UOPstream::write
profilingPstream::beginTiming();
if (commsType == UPstream::commsTypes::blocking)
if (commsType == UPstream::commsTypes::buffered)
{
returnCode = MPI_Bsend
(
@ -104,9 +114,9 @@ bool Foam::UOPstream::write
if (UPstream::debug)
{
Pout<< "UOPstream::write : finished write to:" << toProcNo
<< " tag:" << tag << " size:" << label(bufSize)
<< " commsType:" << UPstream::commsTypeNames[commsType]
Pout<< "UOPstream::write : finished buffered send to:"
<< toProcNo
<< " size:" << label(bufSize) << " tag:" << tag
<< Foam::endl;
}
}
@ -142,9 +152,9 @@ bool Foam::UOPstream::write
if (UPstream::debug)
{
Pout<< "UOPstream::write : finished write to:" << toProcNo
<< " tag:" << tag << " size:" << label(bufSize)
<< " commsType:" << UPstream::commsTypeNames[commsType]
Pout<< "UOPstream::write : finished send to:"
<< toProcNo
<< " size:" << label(bufSize) << " tag:" << tag
<< Foam::endl;
}
}
@ -181,9 +191,9 @@ bool Foam::UOPstream::write
if (UPstream::debug)
{
Pout<< "UOPstream::write : started write to:" << toProcNo
<< " tag:" << tag << " size:" << label(bufSize)
<< " commType:" << UPstream::commsTypeNames[commsType]
Pout<< "UOPstream::write : started non-blocking send to:"
<< toProcNo
<< " size:" << label(bufSize) << " tag:" << tag
<< " request:" <<
(req ? label(-1) : PstreamGlobals::outstandingRequests_.size())
<< Foam::endl;

2
src/Pstream/mpi/UPstream.C
View File

@ -787,7 +787,7 @@ Foam::UPstream::probeMessage
int flag = 0;
MPI_Status status;
if (UPstream::commsTypes::blocking == commsType)
if (UPstream::commsTypes::buffered == commsType)
{
// Blocking
profilingPstream::beginTiming();

14
src/Pstream/mpi/UPstreamBroadcast.C
View File

@ -47,13 +47,6 @@ bool Foam::UPstream::broadcast
//Needed? PstreamGlobals::checkCommunicator(comm, rootProcNo);
if (UPstream::debug)
{
Pout<< "UPstream::broadcast : root:" << rootProcNo
<< " comm:" << comm
<< " size:" << label(bufSize)
<< Foam::endl;
}
if (UPstream::warnComm >= 0 && comm != UPstream::warnComm)
{
Pout<< "UPstream::broadcast : root:" << rootProcNo
@ -63,6 +56,13 @@ bool Foam::UPstream::broadcast
<< Foam::endl;
error::printStack(Pout);
}
else if (UPstream::debug)
{
Pout<< "UPstream::broadcast : root:" << rootProcNo
<< " comm:" << comm
<< " size:" << label(bufSize)
<< Foam::endl;
}
profilingPstream::beginTiming();

7
src/Pstream/mpi/UPstreamWrapping.txx
View File

@ -632,7 +632,8 @@ void Foam::PstreamDetail::allToAllConsensus
// Message found, receive into dest buffer location
const label proci = status.MPI_SOURCE;
int count = 0;
// Only send/recv a single (fundamental) data type
int count(0);
MPI_Get_count(&status, datatype, &count);
if (count != 1)
@ -812,10 +813,10 @@ void Foam::PstreamDetail::allToAllConsensus
if (flag)
{
// Message found, receive into dest buffer location
const label proci = status.MPI_SOURCE;
int count = 0;
// Only send/recv a single (fundamental) data type
int count(0);
MPI_Get_count(&status, datatype, &count);
if (count != 1)

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
View File

@ -69,7 +69,7 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
{
if (!this->readValueEntry(dict))
{
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}
}

2
src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
View File

@ -151,7 +151,7 @@ public:
//- Evaluate the patchField
virtual void evaluate
(
const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
const Pstream::commsTypes commsType = Pstream::commsTypes::buffered
);
//- Write

4
src/dynamicFaMesh/interfaceTrackingFvMesh/freeSurfacePointDisplacement.C
View File

@ -364,7 +364,7 @@ Foam::interfaceTrackingFvMesh::pointDisplacement()
{
OPstream toNeighbProc
(
Pstream::commsTypes::blocking,
Pstream::commsTypes::buffered,
procPatch.neighbProcNo()
);
@ -375,7 +375,7 @@ Foam::interfaceTrackingFvMesh::pointDisplacement()
{
IPstream fromNeighbProc
(
Pstream::commsTypes::blocking,
Pstream::commsTypes::buffered,
procPatch.neighbProcNo()
);

8
src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
View File

@ -587,12 +587,12 @@ void Foam::motionSmootherAlgo::correctBoundaryConditions
if (schedEval.init)
{
displacementBf[patchi]
.initEvaluate(Pstream::commsTypes::blocking);
.initEvaluate(Pstream::commsTypes::buffered);
}
else
{
displacementBf[patchi]
.evaluate(Pstream::commsTypes::blocking);
.evaluate(Pstream::commsTypes::buffered);
}
}
}
@ -608,12 +608,12 @@ void Foam::motionSmootherAlgo::correctBoundaryConditions
if (schedEval.init)
{
displacementBf[patchi]
.initEvaluate(Pstream::commsTypes::blocking);
.initEvaluate(Pstream::commsTypes::buffered);
}
else
{
displacementBf[patchi]
.evaluate(Pstream::commsTypes::blocking);
.evaluate(Pstream::commsTypes::buffered);
}
}
}

4
src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C
View File

@ -67,12 +67,12 @@ void Foam::motionSmootherAlgo::checkConstraints
forAllReverse(bFld, patchi)
{
bFld[patchi].initEvaluate(Pstream::commsTypes::blocking); // buffered
bFld[patchi].initEvaluate(Pstream::commsTypes::buffered);
}
forAllReverse(bFld, patchi)
{
bFld[patchi].evaluate(Pstream::commsTypes::blocking);
bFld[patchi].evaluate(Pstream::commsTypes::buffered);
}

6
src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C
View File

@ -292,7 +292,7 @@ void Foam::faBoundaryMesh::calcGeometry()
if
(
pBufs.commsType() == Pstream::commsTypes::blocking
pBufs.commsType() == Pstream::commsTypes::buffered
|| pBufs.commsType() == Pstream::commsTypes::nonBlocking
)
{
@ -943,7 +943,7 @@ void Foam::faBoundaryMesh::movePoints(const pointField& p)
if
(
pBufs.commsType() == Pstream::commsTypes::blocking
pBufs.commsType() == Pstream::commsTypes::buffered
|| pBufs.commsType() == Pstream::commsTypes::nonBlocking
)
{
@ -989,7 +989,7 @@ void Foam::faBoundaryMesh::updateMesh()
if
(
pBufs.commsType() == Pstream::commsTypes::blocking
pBufs.commsType() == Pstream::commsTypes::buffered
|| pBufs.commsType() == Pstream::commsTypes::nonBlocking
)
{

8
src/finiteArea/faMesh/faMeshDemandDrivenData.C
View File

@ -1606,7 +1606,7 @@ void Foam::faMesh::calcPointAreaNormals(vectorField& result) const
{
UOPstream::write
(
UPstream::commsTypes::blocking,
UPstream::commsTypes::buffered,
procPatch.neighbProcNo(),
patchPointNormals
);
@ -1618,7 +1618,7 @@ void Foam::faMesh::calcPointAreaNormals(vectorField& result) const
{
UIPstream::read
(
UPstream::commsTypes::blocking,
UPstream::commsTypes::buffered,
procPatch.neighbProcNo(),
patchPointNormals
);
@ -1916,7 +1916,7 @@ void Foam::faMesh::calcPointAreaNormalsByQuadricsFit(vectorField& result) const
{
OPstream toNeighbProc
(
Pstream::commsTypes::blocking,
Pstream::commsTypes::buffered,
procPatch.neighbProcNo(),
toNgbProcLsPoints.size_bytes()
+ toNgbProcLsPointStarts.size_bytes()
@ -1945,7 +1945,7 @@ void Foam::faMesh::calcPointAreaNormalsByQuadricsFit(vectorField& result) const
{
IPstream fromNeighbProc
(
Pstream::commsTypes::blocking,
Pstream::commsTypes::buffered,
procPatch.neighbProcNo(),
10*patchPointLabels.size()*sizeof(vector)
+ fromNgbProcLsPointStarts.size_bytes()

2
src/finiteArea/fields/faPatchFields/basic/basicSymmetry/basicSymmetryFaPatchField.H
View File

@ -130,7 +130,7 @@ public:
// HJ, 30/Jun/2009
virtual void evaluate
(
const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
const Pstream::commsTypes commsType = Pstream::commsTypes::buffered
);
//- Return face-gradient transform diagonal

4
src/finiteArea/fields/faPatchFields/basic/coupled/coupledFaPatchField.H
View File

@ -162,7 +162,7 @@ public:
virtual void initEvaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{
initEvaluate(commsType);
@ -172,7 +172,7 @@ public:
virtual void evaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{
evaluate(commsType);

2
src/finiteArea/fields/faPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFaPatchField.H
View File

@ -136,7 +136,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
};

2
src/finiteArea/fields/faPatchFields/basic/fixedGradient/fixedGradientFaPatchField.H
View File

@ -210,7 +210,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);

2
src/finiteArea/fields/faPatchFields/basic/mixed/mixedFaPatchField.H
View File

@ -231,7 +231,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);
//- Return the matrix diagonal coefficients corresponding to the

4
src/finiteArea/fields/faPatchFields/basic/sliced/slicedFaPatchField.H
View File

@ -178,7 +178,7 @@ public:
virtual void initEvaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -186,7 +186,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

2
src/finiteArea/fields/faPatchFields/basic/zeroGradient/zeroGradientFaPatchField.H
View File

@ -133,7 +133,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);
//- Return the matrix diagonal coefficients corresponding to the

2
src/finiteArea/fields/faPatchFields/constraint/cyclic/cyclicFaPatchField.C
View File

@ -92,7 +92,7 @@ Foam::cyclicFaPatchField<Type>::cyclicFaPatchField
if (IOobjectOption::isReadRequired(requireValue))
{
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}

4
src/finiteArea/fields/faPatchFields/constraint/processor/processorFaPatchField.H
View File

@ -191,7 +191,7 @@ public:
virtual void initEvaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -200,7 +200,7 @@ public:
virtual void evaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

2
src/finiteArea/fields/faPatchFields/constraint/wedge/wedgeFaPatchField.H
View File

@ -124,7 +124,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
const Pstream::commsTypes commsType = Pstream::commsTypes::buffered
);

2
src/finiteArea/fields/faPatchFields/derived/clampedPlate/clampedPlateFaPatchField.H
View File

@ -155,7 +155,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
//- Return the matrix diagonal coefficients corresponding to the

8
src/finiteArea/fields/faPatchFields/faPatchField/faPatchField.H
View File

@ -564,7 +564,7 @@ public:
virtual void initEvaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -572,7 +572,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);
//- Initialise the evaluation of the patch field after a local
@ -580,7 +580,7 @@ public:
virtual void initEvaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -588,7 +588,7 @@ public:
virtual void evaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

8
src/finiteArea/fields/faePatchFields/faePatchField/faePatchField.H
View File

@ -482,7 +482,7 @@ public:
virtual void initEvaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -490,7 +490,7 @@ public:
virtual void evaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -516,14 +516,14 @@ public:
//- Initialise the evaluation of the patch field, generally a no-op
virtual void initEvaluate
(
const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
const Pstream::commsTypes commsType = Pstream::commsTypes::buffered
)
{}
//- Evaluate the patch field, generally a no-op
virtual void evaluate
(
const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
const Pstream::commsTypes commsType = Pstream::commsTypes::buffered
)
{}

2
src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.H
View File

@ -125,7 +125,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
//- Return face-gradient transform diagonal

4
src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.H
View File

@ -188,7 +188,7 @@ public:
virtual void initEvaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{
initEvaluate(commsType);
@ -198,7 +198,7 @@ public:
virtual void evaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{
evaluate(commsType);

2
src/finiteVolume/fields/fvPatchFields/basic/directionMixed/directionMixedFvPatchField.H
View File

@ -191,7 +191,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);
//- Return face-gradient transform diagonal

2
src/finiteVolume/fields/fvPatchFields/basic/extrapolatedCalculated/extrapolatedCalculatedFvPatchField.H
View File

@ -135,7 +135,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
};

2
src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.H
View File

@ -210,7 +210,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);
//- Return the matrix diagonal coefficients corresponding to the

2
src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.H
View File

@ -268,7 +268,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);
//- Return the matrix diagonal coefficients corresponding to the

4
src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.H
View File

@ -176,7 +176,7 @@ public:
virtual void initEvaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -184,7 +184,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

2
src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H
View File

@ -142,7 +142,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);
//- Return the matrix diagonal coefficients corresponding to the

2
src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C
View File

@ -70,7 +70,7 @@ Foam::cyclicFvPatchField<Type>::cyclicFvPatchField
if (needValue)
{
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}

2
src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C
View File

@ -121,7 +121,7 @@ Foam::cyclicACMIFvPatchField<Type>::cyclicACMIFvPatchField
const int oldConsistency = consistency;
consistency = 0;
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
consistency = oldConsistency;
}

2
src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C
View File

@ -66,7 +66,7 @@ Foam::jumpCyclicAMIFvPatchField<Type>::jumpCyclicAMIFvPatchField
cyclicAMIFvPatchField<Type>(p, iF, dict)
{
// Call this evaluation in derived classes
//this->evaluate(Pstream::commsTypes::blocking);
//this->evaluate(Pstream::commsTypes::buffered);
}

4
src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.H
View File

@ -199,7 +199,7 @@ public:
virtual void initEvaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -208,7 +208,7 @@ public:
virtual void evaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

2
src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.H
View File

@ -145,7 +145,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
//- Return face-gradient transform diagonal

2
src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.H
View File

@ -146,7 +146,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
//- Return face-gradient transform diagonal

2
src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
View File

@ -192,7 +192,7 @@ Foam::codedFixedValueFvPatchField<Type>::codedFixedValueFvPatchField
this->extrapolateInternal();
// Evaluate to assign a value
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}

2
src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.H
View File

@ -245,7 +245,7 @@ public:
//- Evaluate the patch field, sets updated() to false
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
//- Write

2
src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H
View File

@ -251,7 +251,7 @@ public:
// to false.
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
//- Write

2
src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
View File

@ -89,7 +89,7 @@ Foam::fanFvPatchField<Type>::fanFvPatchField
if (!this->readValueEntry(dict))
{
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}

2
src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C
View File

@ -94,7 +94,7 @@ Foam::fixedJumpFvPatchField<Type>::fixedJumpFvPatchField
{
if (!this->readValueEntry(dict))
{
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}
}

2
src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C
View File

@ -73,7 +73,7 @@ Foam::fixedJumpAMIFvPatchField<Type>::fixedJumpAMIFvPatchField
if (!this->readValueEntry(dict))
{
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}

2
src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.H
View File

@ -219,7 +219,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);
//- Return face-gradient transform diagonal

2
src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
View File

@ -93,7 +93,7 @@ flowRateInletVelocityFvPatchVectorField
// Value field required if mass based
if (!this->readValueEntry(dict))
{
evaluate(Pstream::commsTypes::blocking);
evaluate(Pstream::commsTypes::buffered);
}
}

2
src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
View File

@ -87,7 +87,7 @@ flowRateOutletVelocityFvPatchVectorField
// Value field required if mass based
if (!this->readValueEntry(dict))
{
evaluate(Pstream::commsTypes::blocking);
evaluate(Pstream::commsTypes::buffered);
}
}

2
src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.H
View File

@ -168,7 +168,7 @@ public:
//- Evaluate the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
//- Write

2
src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C
View File

@ -72,7 +72,7 @@ matchedFlowRateOutletVelocityFvPatchVectorField
// Value field required if mass based
if (!this->readValueEntry(dict))
{
evaluate(Pstream::commsTypes::blocking);
evaluate(Pstream::commsTypes::buffered);
}
}

2
src/finiteVolume/fields/fvPatchFields/derived/partialSlip/partialSlipFvPatchField.H
View File

@ -215,7 +215,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);
//- Return face-gradient transform diagonal

2
src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
View File

@ -72,7 +72,7 @@ timeVaryingMappedFixedValueFvPatchField
// by re-setting of fvatchfield::updated_ flag. This is
// so if first use is in the next time step it retriggers
// a new update.
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}

2
src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
View File

@ -77,7 +77,7 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
if (!this->readValueEntry(dict))
{
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}
}

2
src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
View File

@ -74,7 +74,7 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
if (!this->readValueEntry(dict))
{
this->evaluate(Pstream::commsTypes::blocking);
this->evaluate(Pstream::commsTypes::buffered);
}
}

8
src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H
View File

@ -635,7 +635,7 @@ public:
virtual void initEvaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -643,7 +643,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
);
//- Initialise the evaluation of the patch field after a local
@ -651,7 +651,7 @@ public:
virtual void initEvaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -659,7 +659,7 @@ public:
virtual void evaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

8
src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
View File

@ -511,7 +511,7 @@ public:
virtual void initEvaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -519,7 +519,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -528,7 +528,7 @@ public:
virtual void initEvaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}
@ -536,7 +536,7 @@ public:
virtual void evaluateLocal
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

2
src/functionObjects/field/mapFields/mapFieldsTemplates.C
View File

@ -43,7 +43,7 @@ void Foam::functionObjects::mapFields::evaluateConstraintTypes
if
(
commsType == UPstream::commsTypes::blocking
commsType == UPstream::commsTypes::buffered
|| commsType == UPstream::commsTypes::nonBlocking
)
{

2
src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
View File

@ -190,7 +190,7 @@ public:
//- Update the patch field
virtual void evaluate
(
const Pstream::commsTypes commsType=Pstream::commsTypes::blocking
const Pstream::commsTypes commsType=Pstream::commsTypes::buffered
);
//- Write

2
src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
View File

@ -107,7 +107,7 @@ timeVaryingMappedFixedValuePointPatchField
// of the pointPatchField::updated_ flag. This is
// so if first use is in the next time step it retriggers
// a new update.
pointPatchField<Type>::evaluate(Pstream::commsTypes::blocking);
pointPatchField<Type>::evaluate(Pstream::commsTypes::buffered);
}
}

2
src/meshTools/AMIInterpolation/patches/cyclicACMI/cyclicACMIPointPatchField/cyclicACMIPointPatchField.H
View File

@ -199,7 +199,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

2
src/meshTools/AMIInterpolation/patches/cyclicAMI/cyclicAMIPointPatchField/cyclicAMIPointPatchField.H
View File

@ -203,7 +203,7 @@ public:
virtual void evaluate
(
const Pstream::commsTypes commsType =
Pstream::commsTypes::blocking
Pstream::commsTypes::buffered
)
{}

2
src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.H
View File

@ -138,7 +138,7 @@ public:
// adjoint pressure BC
virtual void evaluate
(
const Pstream::commsTypes commsType = Pstream::commsTypes::blocking
const Pstream::commsTypes commsType = Pstream::commsTypes::buffered
);
//virtual void updateCoeffs();

3
src/sampling/surface/isoSurface/isoSurfacePoint.C
View File

@ -164,10 +164,9 @@ void Foam::isoSurfacePoint::syncUnseparatedPoints
patchInfo[nbrPointi] = pointValues[meshPts[pointi]];
}
// buffered send
OPstream toNbr
(
UPstream::commsTypes::blocking,
UPstream::commsTypes::buffered,
procPatch.neighbProcNo()
);
toNbr << patchInfo;

Some files were not shown because too many files have changed in this diff Show More