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: use returnReduceAnd(), returnReduceOr() functions

Browse Source 
DOC: document which MPI send/recv are associated with commType
This commit is contained in:
Mark Olesen
2022-08-24 12:00:44 +02:00
committed by Andrew Heather
parent 473e14418a
commit 70208a7399
172 changed files with 574 additions and 840 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sampling/functions/Function1/Sample/SampleFunction1.C
View File

@ -45,7 +45,7 @@ void Foam::Function1Types::Sample<Type>::setSampleCell() const
celli_ = mesh.findCell(position_);
if (!returnReduce(celli_ != -1, orOp<bool>()))
if (returnReduceAnd(celli_ < 0))
{
FatalErrorInFunction
<< "Sample cell could not be found at position "

4
src/sampling/meshToMesh/meshToMesh.C
View File

@ -381,9 +381,7 @@ void Foam::meshToMesh::normaliseWeights
scalarListList& wght
) const
{
const label nCell = returnReduce(wght.size(), sumOp<label>());
if (nCell > 0)
if (returnReduceOr(wght.size()))
{
forAll(wght, celli)
{

8
src/sampling/meshToMesh/meshToMeshTemplates.C
View File

@ -140,7 +140,7 @@ void Foam::meshToMesh::mapSrcToTgt
if (singleMeshProc_ == -1)
{
if (returnReduce(tgtToSrcCellVec_.size(), sumOp<label>()) == 0)
if (returnReduceAnd(tgtToSrcCellVec_.empty()))
{
// No correction vectors calculated. Fall back to first order.
mapSrcToTgt(srcField, cop, result);
@ -353,7 +353,7 @@ void Foam::meshToMesh::mapTgtToSrc
if (singleMeshProc_ == -1)
{
if (returnReduce(srcToTgtCellVec_.size(), sumOp<label>()) == 0)
if (returnReduceAnd(srcToTgtCellVec_.empty()))
{
// No correction vectors calculated. Fall back to first order.
mapTgtToSrc(tgtField, cop, result);
@ -478,7 +478,7 @@ void Foam::meshToMesh::mapInternalSrcToTgt
const bool secondOrder
) const
{
if (secondOrder && returnReduce(tgtToSrcCellVec_.size(), sumOp<label>()))
if (secondOrder && returnReduceOr(tgtToSrcCellVec_.size()))
{
mapSrcToTgt
(
@ -711,7 +711,7 @@ void Foam::meshToMesh::mapInternalTgtToSrc
const bool secondOrder
) const
{
if (secondOrder && returnReduce(srcToTgtCellVec_.size(), sumOp<label>()))
if (secondOrder && returnReduceOr(srcToTgtCellVec_.size()))
{
mapTgtToSrc
(

6
src/sampling/sampledSet/shortestPath/shortestPathSet.C
View File

@ -497,8 +497,8 @@ bool Foam::shortestPathSet::genSingleLeakPath
<< " Skipped route detection." << endl;
}
}
reduce(targetFound, orOp<bool>());
if (!targetFound)
if (!returnReduceOr(targetFound))
{
//Pout<< "now :"
// << " nLeakCell:"
@ -638,7 +638,7 @@ bool Foam::shortestPathSet::genSingleLeakPath
// Situation 1: we found the destination cell (do nothing),
// frontCellI is -1 on all processors
if (returnReduce(frontCellI == -1, andOp<bool>()))
if (returnReduceAnd(frontCellI == -1))
{
//Pout<< "now :"
// << " nLeakCell:"

5
src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
View File

@ -562,10 +562,9 @@ bool Foam::sampledSurfaces::performAction(unsigned request)
if
(
returnReduce
returnReduceAnd
(
!ListOps::found(ids, lessOp1<label>(0)),
andOp<bool>()
!ListOps::found(ids, lessOp1<label>(0))
)
)
{

8
src/sampling/surface/cutting/cuttingSurfaceBaseSelection.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2018-2019 OpenCFD Ltd.
Copyright (C) 2018-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -61,11 +61,7 @@ Foam::bitSet Foam::cuttingSurfaceBase::cellSelection
// Zones requested and in use?
const bool hasZones =
returnReduce
(
(-1 != mesh.cellZones().findIndex(zoneNames)),
andOp<bool>()
);
returnReduceAnd(-1 != mesh.cellZones().findIndex(zoneNames));
if (hasZones)
{

4
src/sampling/surface/distanceSurface/distanceSurfaceFilter.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2020-2021 OpenCFD Ltd.
Copyright (C) 2020-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -431,7 +431,7 @@ void Foam::distanceSurface::filterRegionProximity
// If filtering with region proximity results in zero faces,
// revert to face-only proximity filter
if (returnReduce(acceptFaces.none(), andOp<bool>()))
if (returnReduceAnd(acceptFaces.none()))
{
acceptFaces.reset();
prune = false;

4
src/sampling/surface/isoSurface/isoSurfaceTopo.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2019 OpenFOAM Foundation
Copyright (C) 2019-2021 OpenCFD Ltd.
Copyright (C) 2019-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -1587,7 +1587,7 @@ Foam::isoSurfaceTopo::isoSurfaceTopo
<< " faces on " << nEdgeRemove << " open edges" << endl;
}
if (returnReduce(faceSelection.none(), andOp<bool>()))
if (returnReduceAnd(faceSelection.none()))
{
break;
}