From 124702190b5830add6ac237dbb9b603733afb9c3 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 24 Aug 2022 12:00:44 +0200 Subject: [PATCH] ENH: use returnReduceAnd(), returnReduceOr() functions --- .../laserDTRM/laserDTRM.C | 19 +-- .../Test-GAMGAgglomeration.C | 1 - .../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 9 +- .../mesh/advanced/selectCells/selectCells.C | 8 +- .../extrude/extrudeMesh/extrudeMesh.C | 13 +- .../extrudeToRegionMesh/extrudeToRegionMesh.C | 2 +- .../DelaunayMesh/DistributedDelaunayMesh.C | 5 +- .../backgroundMeshDecomposition.C | 4 +- .../conformalVoronoiMesh.C | 40 ++---- .../conformalVoronoiMeshCalcDualMesh.C | 7 +- .../conformalVoronoiMeshIO.C | 6 +- .../generation/snappyHexMesh/snappyHexMesh.C | 9 +- .../manipulation/checkMesh/checkTopology.C | 14 +- .../createBaffles/createBaffles.C | 4 +- .../manipulation/createPatch/createPatch.C | 2 +- .../orientFaceZone/orientFaceZone.C | 3 +- .../manipulation/renumberMesh/renumberMesh.C | 25 ++-- .../splitMeshRegions/splitMeshRegions.C | 2 +- .../reconstructParMesh/reconstructParMesh.C | 2 +- .../parLagrangianDistributorTemplates.C | 21 +-- .../redistributePar/redistributePar.C | 4 +- .../foamToEnsight/checkMeshMoving.H | 4 +- .../foamToEnsight/convertLagrangian.H | 6 +- .../dataConversion/foamToEnsight/readFields.C | 6 +- .../foamToVTK/convertLagrangian.H | 4 +- .../miscellaneous/postChannel/channelIndex.C | 3 +- .../foamUpgradeCyclics/foamUpgradeCyclics.C | 10 +- .../mapFieldsPar/mapLagrangian.C | 7 +- .../preProcessing/viewFactorsGen/shootRays.H | 4 +- .../viewFactorsGen/viewFactorsGen.C | 21 +-- .../db/IOstreams/Pstreams/PstreamBuffers.C | 2 +- .../functionEntries/codeStream/codeStream.C | 4 +- .../db/dynamicLibrary/codedBase/codedBase.C | 5 +- .../functionObjectList/functionObjectList.C | 2 +- .../exprDriver/exprDriverTemplates.C | 5 +- .../fields/fieldExprDriverTemplates.C | 4 +- .../GeometricField/GeometricField.C | 8 +- .../masterUncollatedFileOperation.C | 2 +- .../procFacesGAMGProcAgglomeration.C | 4 +- .../polyMesh/globalMeshData/globalPoints.C | 14 +- .../polyBoundaryMesh/polyBoundaryMesh.C | 6 +- src/OpenFOAM/meshes/polyMesh/polyMesh.C | 36 +++-- .../meshes/polyMesh/polyMeshFromShapeMesh.C | 3 +- .../polyMeshTetDecomposition.C | 2 +- .../symmetryPlane/symmetryPlanePolyPatch.C | 5 +- .../constraint/wedge/wedgePolyPatch.C | 5 +- .../meshes/polyMesh/zones/faceZone/faceZone.C | 4 +- .../primitiveMeshCheck/primitiveMeshCheck.C | 19 ++- .../primitiveMeshCheckEdgeLength.C | 5 +- .../dynamicMotionSolverFvMeshAMI.C | 6 +- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 19 +-- .../createShellMesh/createShellMesh.C | 8 +- .../layerAdditionRemoval.C | 14 +- .../layerAdditionRemoval/removeCellLayer.C | 11 +- .../layerAdditionRemoval/setLayerPairing.C | 7 +- .../meshModifiers/meshCutter/meshCutter.C | 4 +- .../multiDirRefinement/multiDirRefinement.C | 14 +- .../refinementIterator/refinementIterator.C | 12 +- .../displacement/displacement/zoneMotion.C | 2 +- .../polyMeshFilter/polyMeshFilter.C | 3 +- .../polyTopoChange/addPatchCellLayer.C | 2 +- .../polyTopoChange/hexRef8/hexRef8.C | 2 +- .../polyTopoChange/hexRef8/hexRef8Data.C | 18 +-- .../hexRef8/refinementHistory.C | 17 ++- src/engine/engineMesh/engineMesh/engineMesh.C | 11 +- .../faMesh/faBoundaryMesh/faBoundaryMesh.C | 4 +- src/finiteArea/faMesh/faMeshPatches.C | 8 +- .../faMesh/faMeshTools/faMeshTools.C | 2 +- src/finiteArea/faMesh/faMeshTopology.C | 10 +- .../cfdTools/general/MRF/MRFZone.C | 8 +- .../porosityModel/porosityModel.C | 7 +- .../expressions/base/fvExprDriverTemplates.C | 7 +- .../patch/patchExprDriverTemplates.C | 2 +- .../derived/mappedField/Sampled/Sampled.C | 4 +- .../swirlFanVelocityFvPatchField.C | 4 +- ...lFlowRateInletVelocityFvPatchVectorField.C | 6 +- .../turbulentDFSEMInletFvPatchVectorField.C | 10 +- .../solidBody/solidBodyFvGeometryScheme.C | 2 +- .../fvMesh/fvMeshSubset/fvMeshSubsetProxy.C | 4 +- .../fvMesh/fvMeshTools/fvMeshTools.C | 2 +- .../volPointInterpolation.C | 5 +- .../surfaceFieldValue/surfaceFieldValue.C | 14 +- .../surfaceFieldValueTemplates.C | 4 +- .../volFieldValue/volFieldValueI.H | 4 +- .../field/reference/reference.C | 4 +- .../zeroGradient/zeroGradientTemplates.C | 4 +- .../lagrangian/dataCloud/dataCloud.C | 4 +- .../lagrangian/dataCloud/dataCloudTemplates.C | 4 +- .../lagrangian/dsmcFields/dsmcFields.C | 4 +- .../lagrangian/vtkCloud/vtkCloud.C | 4 +- .../pairPatchAgglomeration.C | 4 +- src/fvOptions/cellSetOption/cellSetOption.C | 2 +- .../limitTemperature/limitTemperature.C | 2 +- .../actuationDiskSource/actuationDiskSource.C | 2 +- .../FreeStream/FreeStream.C | 5 +- src/lagrangian/basic/Cloud/Cloud.C | 2 +- .../Templates/ThermoCloud/ThermoCloudI.H | 6 +- .../ensight/ensightOutputCloudTemplates.C | 2 +- .../vtk/foamVtkLagrangianWriterTemplates.C | 11 +- .../RecycleInteraction/RecycleInteraction.C | 2 +- .../medialAxisMeshMover.C | 18 ++- .../meshRefinement/meshRefinement.C | 11 +- .../meshRefinement/meshRefinementBaffles.C | 32 ++--- .../meshRefinement/meshRefinementBlock.C | 4 +- .../meshRefinement/meshRefinementRefine.C | 2 +- .../refinementFeatures/refinementFeatures.C | 4 +- .../refinementSurfaces/refinementSurfaces.C | 12 +- .../shellSurfaces/shellSurfaces.C | 2 +- .../snappyHexMeshDriver/snappyLayerDriver.C | 12 +- .../snappyHexMeshDriver/snappyRefineDriver.C | 123 +++++------------- .../snappyHexMeshDriver/snappySnapDriver.C | 26 ++-- .../AMIInterpolation/AMIInterpolation.C | 4 +- .../cyclicAMIPolyPatchTopologyChange.C | 4 +- .../cyclicPeriodicAMIPolyPatch.C | 22 ++-- .../algorithms/MeshWave/FaceCellWave.C | 8 +- .../algorithms/PointEdgeWave/PointEdgeWave.C | 26 +--- .../cellClassification/cellClassification.C | 8 +- src/meshTools/meshStructure/meshStructure.C | 4 +- .../output/vtk/patch/foamVtkPatchMeshWriter.C | 2 +- src/meshTools/polyTopoChange/polyTopoChange.C | 7 +- .../primitiveMeshGeometry.C | 5 +- src/meshTools/processorLOD/box/box.C | 2 +- src/meshTools/regionSplit/localPointRegion.C | 4 +- src/meshTools/regionSplit/regionSplit.C | 4 +- src/meshTools/regionSplit2D/regionSplit2D.C | 4 +- .../searchableSurfaceWithGaps.C | 5 +- .../searchableSurfaces/searchableSurfaces.C | 10 +- .../cellSources/haloToCell/haloToCell.C | 4 +- .../cellSources/surfaceToCell/surfaceToCell.C | 7 +- .../faceSources/holeToFace/holeToFace.C | 7 +- .../zeroATCcells/faceCells/faceCells.C | 9 +- .../zeroATCcells/pointCells/pointCells.C | 12 +- .../sensitivitySurfacePointsIncompressible.C | 4 +- .../NURBS/NURBS3DSurface/NURBS3DSurface.C | 12 +- .../cellVolumeWeightCellCellStencil.C | 7 +- .../inverseDistanceCellCellStencil.C | 13 +- .../inverseDistance/waveMethod.C | 4 +- .../trackingInverseDistanceCellCellStencil.C | 11 +- .../dynamicOversetFvMesh.C | 3 +- .../dynamicOversetFvMeshTemplates.C | 11 +- .../preserveBafflesConstraint.C | 7 +- .../preserveFaceZonesConstraint.C | 17 +-- .../preservePatchesConstraint.C | 16 +-- .../singleProcessorFaceSetsConstraint.C | 15 +-- .../decompositionMethod/decompositionMethod.C | 9 +- .../hierarchGeomDecomp/hierarchGeomDecomp.C | 6 +- .../metisLikeDecomp/metisLikeDecomp.C | 8 +- .../simpleGeomDecomp/simpleGeomDecomp.C | 2 +- .../decompose/ptscotchDecomp/ptscotchDecomp.C | 2 +- .../distributedTriSurfaceMesh.C | 8 +- .../regionModel/regionModel/regionModel.C | 2 +- .../thermalBaffleModel/thermalBaffleModel.C | 22 ++-- .../structuredRenumber/OppositeFaceCellWave.C | 15 +-- .../Function1/Sample/SampleFunction1.C | 2 +- src/sampling/meshToMesh/meshToMesh.C | 4 +- src/sampling/meshToMesh/meshToMeshTemplates.C | 8 +- .../sampledSet/shortestPath/shortestPathSet.C | 6 +- .../sampledSurfaces/sampledSurfaces.C | 5 +- .../cutting/cuttingSurfaceBaseSelection.C | 8 +- .../distanceSurface/distanceSurfaceFilter.C | 4 +- .../surface/isoSurface/isoSurfaceTopo.C | 4 +- src/surfMesh/polySurface/polySurface.C | 4 +- src/surfMesh/writers/common/surfaceWriter.C | 2 +- .../solarLoad/faceReflecting/faceReflecting.C | 2 +- .../solarLoad/faceShading/faceShading.C | 17 +-- .../radiationModels/solarLoad/solarLoad.C | 6 +- .../radiationModels/viewFactor/viewFactor.C | 3 +- 167 files changed, 563 insertions(+), 829 deletions(-) diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C index 4d9e61e8e1..422b4d364d 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C @@ -157,12 +157,7 @@ void Foam::radiation::laserDTRM::initialiseReflection() ); } - if (reflections_.size()) - { - reflectionSwitch_ = true; - } - - reflectionSwitch_ = returnReduce(reflectionSwitch_, orOp()); + reflectionSwitch_ = returnReduceOr(reflections_.size()); } } @@ -299,14 +294,12 @@ void Foam::radiation::laserDTRM::initialise() DTRMCloud_.addParticle(pPtr); } - if (returnReduce(cellI, maxOp