From 07bbae0c55ed10748ced1d6f37630505200891ce Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@esi-group.com> Date: Sat, 24 Oct 2020 13:32:44 +0200 Subject: [PATCH] STYLE: use brace constructors for Foam::zero and Foam::one - makes it clearer that these are constructors and not function calls --- .../utilities/mesh/manipulation/subsetMesh/subsetMesh.C | 2 +- .../dataConversion/foamToVTK/convertProcessorPatches.H | 2 +- .../dataConversion/foamToVTK/convertVolumeFields.H | 2 +- .../PDRsetFields/pdrFields/obstacles/PDRobstacle.C | 4 ++-- .../preProcessing/changeDictionary/changeDictionary.C | 2 +- src/OpenFOAM/db/Time/timeSelector.C | 2 +- .../meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C | 2 +- src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C | 2 +- .../flowRateInletVelocityFvPatchVectorField.C | 2 +- .../flowRateOutletVelocityFvPatchVectorField.C | 2 +- .../matchedFlowRateOutletVelocityFvPatchVectorField.C | 2 +- src/functionObjects/field/externalCoupled/externalCoupled.C | 2 +- src/functionObjects/utilities/vtkWrite/vtkWrite.C | 2 +- src/mesh/blockMesh/PDRblockMesh/PDRblock.C | 2 +- src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C | 4 ++-- .../searchableSurfaces/searchableDisk/searchableDisk.H | 2 +- src/meshTools/sets/cellSources/boxToCell/boxToCell.C | 4 ++-- src/meshTools/sets/cellSources/cellToCell/cellToCell.C | 6 +++--- src/meshTools/sets/cellSources/faceToCell/faceToCell.C | 6 +++--- .../sets/cellSources/faceZoneToCell/faceZoneToCell.C | 6 +++--- src/meshTools/sets/cellSources/patchToCell/patchToCell.C | 6 +++--- src/meshTools/sets/cellSources/pointToCell/pointToCell.C | 6 +++--- src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C | 6 +++--- src/meshTools/sets/faceSources/boxToFace/boxToFace.C | 4 ++-- src/meshTools/sets/faceSources/cellToFace/cellToFace.C | 6 +++--- src/meshTools/sets/faceSources/faceToFace/faceToFace.C | 6 +++--- src/meshTools/sets/faceSources/patchToFace/patchToFace.C | 6 +++--- src/meshTools/sets/faceSources/pointToFace/pointToFace.C | 6 +++--- src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C | 6 +++--- src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C | 4 ++-- src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C | 6 +++--- src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C | 6 +++--- src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C | 6 +++--- src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C | 6 +++--- src/sampling/surface/isoSurface/isoSurfaceTopo.C | 4 ++-- 35 files changed, 71 insertions(+), 71 deletions(-) diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C index 0b68e1f7008..f20f3f4e686 100644 --- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C +++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C @@ -446,7 +446,7 @@ int main(int argc, char *argv[]) // Default exposed patch id - labelList exposedPatchIDs(one(), -1); + labelList exposedPatchIDs(one{}, -1); if (args.found("patches")) { diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H index cc2aba6bb3f..70a1eead5fc 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertProcessorPatches.H @@ -95,7 +95,7 @@ Description auto writer = autoPtr<vtk::patchWriter>::New ( meshProxy.mesh(), - labelList(one(), pp.index()), + labelList(one{}, pp.index()), writeOpts, nearCellValue, ( diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H index d91da0a2933..40eab7c23b8 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/convertVolumeFields.H @@ -195,7 +195,7 @@ Description auto writer = autoPtr<vtk::patchWriter>::New ( meshProxy.mesh(), - labelList(one(), pp.index()), + labelList(one{}, pp.index()), writeOpts, nearCellValue, // Output patch: "boundary"/name diff --git a/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacle.C b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacle.C index 91ccc58d14f..a13bba92bc3 100644 --- a/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacle.C +++ b/applications/utilities/preProcessing/PDRsetFields/pdrFields/obstacles/PDRobstacle.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -571,7 +571,7 @@ Foam::meshedSurface Foam::PDRobstacle::surface() const // pts += obs.pt; - faceList fcs(one(), face(identity(4))); + faceList fcs(one{}, face(identity(4))); surf.transfer(pts, fcs); diff --git a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C index b9270ae1fd8..7feceb54ded 100644 --- a/applications/utilities/preProcessing/changeDictionary/changeDictionary.C +++ b/applications/utilities/preProcessing/changeDictionary/changeDictionary.C @@ -122,7 +122,7 @@ HashTable<wordList> extractPatchGroups(const dictionary& boundaryDict) } else { - groupToPatch.insert(groupName, wordList(one(), patchName)); + groupToPatch.insert(groupName, wordList(one{}, patchName)); } } } diff --git a/src/OpenFOAM/db/Time/timeSelector.C b/src/OpenFOAM/db/Time/timeSelector.C index 0f009f52d84..37b199bb0d6 100644 --- a/src/OpenFOAM/db/Time/timeSelector.C +++ b/src/OpenFOAM/db/Time/timeSelector.C @@ -287,7 +287,7 @@ Foam::instantList Foam::timeSelector::selectIfPresent } // No timeSelector option specified. Do not change runTime. - return instantList(one(), instant(runTime.value(), runTime.timeName())); + return instantList(one{}, instant(runTime.value(), runTime.timeName())); } diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C index 2cb398068ad..022ac5a30c6 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C @@ -497,7 +497,7 @@ Foam::polyBoundaryMesh::groupPatchIDs() const } else { - groupPatchIDs.insert(groupName, labelList(one(), patchi)); + groupPatchIDs.insert(groupName, labelList(one{}, patchi)); } } } diff --git a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C index 08010734eb9..80fea6ac545 100644 --- a/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C +++ b/src/finiteArea/faMesh/faBoundaryMesh/faBoundaryMesh.C @@ -258,7 +258,7 @@ Foam::labelList Foam::faBoundaryMesh::indices if (patchId >= 0) { - return labelList(one(), patchId); + return labelList(one{}, patchId); } } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C index cfec36285c9..5bc42d46c60 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C @@ -209,7 +209,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs() if (volumetric_ || rhoName_ == "none") { - updateValues(one()); + updateValues(one{}); } else { diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C index 8489ffd8137..126158e7c44 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C @@ -192,7 +192,7 @@ void Foam::flowRateOutletVelocityFvPatchVectorField::updateCoeffs() if (volumetric_ || rhoName_ == "none") { - updateValues(one()); + updateValues(one{}); } else { diff --git a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C index ffb87ebbd57..01da573f772 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/matchedFlowRateOutletVelocity/matchedFlowRateOutletVelocityFvPatchVectorField.C @@ -211,7 +211,7 @@ void Foam::matchedFlowRateOutletVelocityFvPatchVectorField::updateCoeffs() if (volumetric_) { - updateValues(inletPatchID, one(), one()); + updateValues(inletPatchID, one{}, one{}); } else { diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C index 927e764d27f..3760669f01f 100644 --- a/src/functionObjects/field/externalCoupled/externalCoupled.C +++ b/src/functionObjects/field/externalCoupled/externalCoupled.C @@ -616,7 +616,7 @@ bool Foam::functionObjects::externalCoupled::read(const dictionary& dict) regionToGroups_.insert ( regionGroupNames_.last(), - labelList(one(), nGroups) + labelList(one{}, nGroups) ); } groupNames_.append(groupName); diff --git a/src/functionObjects/utilities/vtkWrite/vtkWrite.C b/src/functionObjects/utilities/vtkWrite/vtkWrite.C index 7eaeb707fe6..7e0ca767ace 100644 --- a/src/functionObjects/utilities/vtkWrite/vtkWrite.C +++ b/src/functionObjects/utilities/vtkWrite/vtkWrite.C @@ -457,7 +457,7 @@ bool Foam::functionObjects::vtkWrite::write() auto writer = autoPtr<vtk::patchWriter>::New ( meshProxy.mesh(), - labelList(one(), pp.index()), + labelList(one{}, pp.index()), writeOpts_, // Output name for patch: "boundary"/name ( diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblock.C b/src/mesh/blockMesh/PDRblockMesh/PDRblock.C index b8fa154114b..aa6170b9246 100644 --- a/src/mesh/blockMesh/PDRblockMesh/PDRblock.C +++ b/src/mesh/blockMesh/PDRblockMesh/PDRblock.C @@ -534,7 +534,7 @@ Foam::PDRblock::PDRblock bentry.name_ = "patch" + Foam::name(patchi); bentry.type_ = "patch"; bentry.size_ = 0; - bentry.faces_ = labelList(one(), patchi); + bentry.faces_ = labelList(one{}, patchi); } reset(xgrid, ygrid, zgrid); diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C index 439efb3fdeb..8fe226fe54c 100644 --- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C +++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C @@ -484,7 +484,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh const boolList& surfBaffleRegions ) : - extendedEdgeMesh(one::minus()) + extendedEdgeMesh(one::minus{}) { // Extract and reorder the data from surfaceFeatures const triSurface& surf = sFeat.surface(); @@ -547,7 +547,7 @@ Foam::extendedEdgeMesh::extendedEdgeMesh const labelUList& featurePoints ) : - extendedEdgeMesh(one::minus()) + extendedEdgeMesh(one::minus{}) { sortPointsAndEdges ( diff --git a/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.H b/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.H index 43594ae8d74..23c66670e08 100644 --- a/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.H +++ b/src/meshTools/searchableSurfaces/searchableDisk/searchableDisk.H @@ -161,7 +161,7 @@ public: // Usually the element centres (should be of length size()). virtual tmp<pointField> coordinates() const { - return tmp<pointField>::New(one(), origin()); + return tmp<pointField>::New(one{}, origin()); } //- Get bounding spheres (centre and radius squared), one per element. diff --git a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C index 4cd28c13064..65e71cc9028 100644 --- a/src/meshTools/sets/cellSources/boxToCell/boxToCell.C +++ b/src/meshTools/sets/cellSources/boxToCell/boxToCell.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -137,7 +137,7 @@ Foam::boxToCell::boxToCell ) : topoSetCellSource(mesh), - bbs_(one(), treeBoundBox(checkIs(is))) + bbs_(one{}, treeBoundBox(checkIs(is))) {} diff --git a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C index 06607dad62c..3a03593ae61 100644 --- a/src/meshTools/sets/cellSources/cellToCell/cellToCell.C +++ b/src/meshTools/sets/cellSources/cellToCell/cellToCell.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -60,7 +60,7 @@ Foam::cellToCell::cellToCell ) : topoSetCellSource(mesh), - names_(one(), setName) + names_(one{}, setName) {} @@ -89,7 +89,7 @@ Foam::cellToCell::cellToCell ) : topoSetCellSource(mesh), - names_(one(), word(checkIs(is))) + names_(one{}, word(checkIs(is))) {} diff --git a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C index b1f1b8bfabd..c477fb319c5 100644 --- a/src/meshTools/sets/cellSources/faceToCell/faceToCell.C +++ b/src/meshTools/sets/cellSources/faceToCell/faceToCell.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -144,7 +144,7 @@ Foam::faceToCell::faceToCell ) : topoSetCellSource(mesh), - names_(one(), setName), + names_(one{}, setName), option_(option) {} @@ -175,7 +175,7 @@ Foam::faceToCell::faceToCell ) : topoSetCellSource(mesh), - names_(one(), word(checkIs(is))), + names_(one{}, word(checkIs(is))), option_(faceActionNames_.read(checkIs(is))) {} diff --git a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C index 8d58d16a657..ee6493d14c4 100644 --- a/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C +++ b/src/meshTools/sets/cellSources/faceZoneToCell/faceZoneToCell.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2016-2018 OpenCFD Ltd. + Copyright (C) 2016-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -120,7 +120,7 @@ Foam::faceZoneToCell::faceZoneToCell ) : topoSetCellSource(mesh), - selectedZones_(one(), zoneName), + selectedZones_(one{}, zoneName), option_(option) {} @@ -152,7 +152,7 @@ Foam::faceZoneToCell::faceZoneToCell ) : topoSetCellSource(mesh), - selectedZones_(one(), wordRe(checkIs(is))), + selectedZones_(one{}, wordRe(checkIs(is))), option_(faceActionNames_.read(checkIs(is))) {} diff --git a/src/meshTools/sets/cellSources/patchToCell/patchToCell.C b/src/meshTools/sets/cellSources/patchToCell/patchToCell.C index 201a81960bb..2233e3f4002 100644 --- a/src/meshTools/sets/cellSources/patchToCell/patchToCell.C +++ b/src/meshTools/sets/cellSources/patchToCell/patchToCell.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -115,7 +115,7 @@ Foam::patchToCell::patchToCell ) : topoSetCellSource(mesh), - selectedPatches_(one(), patchName) + selectedPatches_(one{}, patchName) {} @@ -145,7 +145,7 @@ Foam::patchToCell::patchToCell ) : topoSetCellSource(mesh), - selectedPatches_(one(), wordRe(checkIs(is))) + selectedPatches_(one{}, wordRe(checkIs(is))) {} diff --git a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C index f33e35e1c46..a3293523399 100644 --- a/src/meshTools/sets/cellSources/pointToCell/pointToCell.C +++ b/src/meshTools/sets/cellSources/pointToCell/pointToCell.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018-2019 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -124,7 +124,7 @@ Foam::pointToCell::pointToCell ) : topoSetCellSource(mesh), - names_(one(), setName), + names_(one{}, setName), option_(option) {} @@ -155,7 +155,7 @@ Foam::pointToCell::pointToCell ) : topoSetCellSource(mesh), - names_(one(), word(checkIs(is))), + names_(one{}, word(checkIs(is))), option_(pointActionNames_.read(checkIs(is))) {} diff --git a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C index 139ede1a4a2..c8ed9326813 100644 --- a/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C +++ b/src/meshTools/sets/cellSources/zoneToCell/zoneToCell.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -116,7 +116,7 @@ Foam::zoneToCell::zoneToCell ) : topoSetCellSource(mesh), - selectedZones_(one(), zoneName) + selectedZones_(one{}, zoneName) {} @@ -146,7 +146,7 @@ Foam::zoneToCell::zoneToCell ) : topoSetCellSource(mesh), - selectedZones_(one(), wordRe(checkIs(is))) + selectedZones_(one{}, wordRe(checkIs(is))) {} diff --git a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C index 853a8a87b02..c5e128a114f 100644 --- a/src/meshTools/sets/faceSources/boxToFace/boxToFace.C +++ b/src/meshTools/sets/faceSources/boxToFace/boxToFace.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -137,7 +137,7 @@ Foam::boxToFace::boxToFace ) : topoSetFaceSource(mesh), - bbs_(one(), treeBoundBox(checkIs(is))) + bbs_(one{}, treeBoundBox(checkIs(is))) {} diff --git a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C index 03285f0b047..83c092b7982 100644 --- a/src/meshTools/sets/faceSources/cellToFace/cellToFace.C +++ b/src/meshTools/sets/faceSources/cellToFace/cellToFace.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -161,7 +161,7 @@ Foam::cellToFace::cellToFace ) : topoSetFaceSource(mesh), - names_(one(), setName), + names_(one{}, setName), option_(option) {} @@ -192,7 +192,7 @@ Foam::cellToFace::cellToFace ) : topoSetFaceSource(mesh), - names_(one(), word(checkIs(is))), + names_(one{}, word(checkIs(is))), option_(cellActionNames_.read(checkIs(is))) {} diff --git a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C b/src/meshTools/sets/faceSources/faceToFace/faceToFace.C index 905109f19d8..22aca8ba6b2 100644 --- a/src/meshTools/sets/faceSources/faceToFace/faceToFace.C +++ b/src/meshTools/sets/faceSources/faceToFace/faceToFace.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -60,7 +60,7 @@ Foam::faceToFace::faceToFace ) : topoSetFaceSource(mesh), - names_(one(), setName) + names_(one{}, setName) {} @@ -89,7 +89,7 @@ Foam::faceToFace::faceToFace ) : topoSetFaceSource(mesh), - names_(one(), word(checkIs(is))) + names_(one{}, word(checkIs(is))) {} diff --git a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C index 731c9543933..8b1ddc0a2e8 100644 --- a/src/meshTools/sets/faceSources/patchToFace/patchToFace.C +++ b/src/meshTools/sets/faceSources/patchToFace/patchToFace.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -116,7 +116,7 @@ Foam::patchToFace::patchToFace ) : topoSetFaceSource(mesh), - selectedPatches_(one(), patchName) + selectedPatches_(one{}, patchName) {} @@ -146,7 +146,7 @@ Foam::patchToFace::patchToFace ) : topoSetFaceSource(mesh), - selectedPatches_(one(), wordRe(checkIs(is))) + selectedPatches_(one{}, wordRe(checkIs(is))) {} diff --git a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C index 584a32d660a..7b40b6daef5 100644 --- a/src/meshTools/sets/faceSources/pointToFace/pointToFace.C +++ b/src/meshTools/sets/faceSources/pointToFace/pointToFace.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -170,7 +170,7 @@ Foam::pointToFace::pointToFace ) : topoSetFaceSource(mesh), - names_(one(), setName), + names_(one{}, setName), option_(option) {} @@ -201,7 +201,7 @@ Foam::pointToFace::pointToFace ) : topoSetFaceSource(mesh), - names_(one(), word(checkIs(is))), + names_(one{}, word(checkIs(is))), option_(pointActionNames_.read(checkIs(is))) {} diff --git a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C index 5475d90018a..36da6b79655 100644 --- a/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C +++ b/src/meshTools/sets/faceSources/zoneToFace/zoneToFace.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -117,7 +117,7 @@ Foam::zoneToFace::zoneToFace ) : topoSetFaceSource(mesh), - selectedZones_(one(), zoneName) + selectedZones_(one{}, zoneName) {} @@ -147,7 +147,7 @@ Foam::zoneToFace::zoneToFace ) : topoSetFaceSource(mesh), - selectedZones_(one(), wordRe(checkIs(is))) + selectedZones_(one{}, wordRe(checkIs(is))) {} diff --git a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C index 3b66ec6d35e..a972adb52be 100644 --- a/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C +++ b/src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -137,7 +137,7 @@ Foam::boxToPoint::boxToPoint ) : topoSetPointSource(mesh), - bbs_(one(), treeBoundBox(checkIs(is))) + bbs_(one{}, treeBoundBox(checkIs(is))) {} diff --git a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C index 3cb35485c2e..d0e73347558 100644 --- a/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C +++ b/src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -98,7 +98,7 @@ Foam::cellToPoint::cellToPoint ) : topoSetPointSource(mesh), - names_(one(), setName), + names_(one{}, setName), option_(option) {} @@ -129,7 +129,7 @@ Foam::cellToPoint::cellToPoint ) : topoSetPointSource(mesh), - names_(one(), word(checkIs(is))), + names_(one{}, word(checkIs(is))), option_(cellActionNames_.read(checkIs(is))) {} diff --git a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C index 3f7c561dafe..6514ff754c4 100644 --- a/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C +++ b/src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018-2019 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -92,7 +92,7 @@ Foam::faceToPoint::faceToPoint ) : topoSetPointSource(mesh), - names_(one(), setName), + names_(one{}, setName), option_(option) {} @@ -123,7 +123,7 @@ Foam::faceToPoint::faceToPoint ) : topoSetPointSource(mesh), - names_(one(), word(checkIs(is))), + names_(one{}, word(checkIs(is))), option_(faceActionNames_.read(checkIs(is))) {} diff --git a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C index d838064b6f6..5a877827194 100644 --- a/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C +++ b/src/meshTools/sets/pointSources/pointToPoint/pointToPoint.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -60,7 +60,7 @@ Foam::pointToPoint::pointToPoint ) : topoSetPointSource(mesh), - names_(one(), setName) + names_(one{}, setName) {} @@ -89,7 +89,7 @@ Foam::pointToPoint::pointToPoint ) : topoSetPointSource(mesh), - names_(one(), word(checkIs(is))) + names_(one{}, word(checkIs(is))) {} diff --git a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C index 8952f2baf9a..604e4da83c7 100644 --- a/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C +++ b/src/meshTools/sets/pointSources/zoneToPoint/zoneToPoint.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2018 OpenCFD Ltd. + Copyright (C) 2018-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -117,7 +117,7 @@ Foam::zoneToPoint::zoneToPoint ) : topoSetPointSource(mesh), - selectedZones_(one(), zoneName) + selectedZones_(one{}, zoneName) {} @@ -147,7 +147,7 @@ Foam::zoneToPoint::zoneToPoint ) : topoSetPointSource(mesh), - selectedZones_(one(), wordRe(checkIs(is))) + selectedZones_(one{}, wordRe(checkIs(is))) {} diff --git a/src/sampling/surface/isoSurface/isoSurfaceTopo.C b/src/sampling/surface/isoSurface/isoSurfaceTopo.C index 0ac441ed602..784260f72d0 100644 --- a/src/sampling/surface/isoSurface/isoSurfaceTopo.C +++ b/src/sampling/surface/isoSurface/isoSurfaceTopo.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2019 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -1326,7 +1326,7 @@ Foam::isoSurfaceTopo::isoSurfaceTopo } - surfZoneList allZones(one(), surfZone("allFaces", allTris.size())); + surfZoneList allZones(one{}, surfZone("allFaces", allTris.size())); MeshStorage::clear(); MeshStorage updated -- GitLab