diff --git a/src/functionObjects/field/streamLine/streamLine.H b/src/functionObjects/field/streamLine/streamLine.H index 1787795b27..0638c5fc68 100644 --- a/src/functionObjects/field/streamLine/streamLine.H +++ b/src/functionObjects/field/streamLine/streamLine.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -76,7 +76,7 @@ Usage trackLength | Tracking segment length | no | nSubCycle | Number of tracking steps per cell | no| cloudName | Cloud name to use | yes | - bounds | Bounding box to trim tracks | no | greatBox + bounds | Bounding box to trim tracks | no | invertedBox seedSampleSet| Seeding method (see below)| yes | \endtable @@ -136,10 +136,10 @@ class streamLine // Private Member Functions //- Disallow default bitwise copy construct - streamLine(const streamLine&); + streamLine(const streamLine&) = delete; //- Disallow default bitwise assignment - void operator=(const streamLine&); + void operator=(const streamLine&) = delete; public: diff --git a/src/functionObjects/field/streamLine/streamLineBase.C b/src/functionObjects/field/streamLine/streamLineBase.C index 3356524a06..d5741a6c2b 100644 --- a/src/functionObjects/field/streamLine/streamLineBase.C +++ b/src/functionObjects/field/streamLine/streamLineBase.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -545,8 +545,8 @@ bool Foam::functionObjects::streamLineBase::read(const dictionary& dict) } - bounds_ = boundBox::greatBox; - if (dict.readIfPresent("bounds", bounds_)) + bounds_ = boundBox::invertedBox; + if (dict.readIfPresent("bounds", bounds_) && !bounds_.empty()) { Info<< " clipping all segments to " << bounds_ << nl << endl; } @@ -701,7 +701,7 @@ bool Foam::functionObjects::streamLineBase::write() if (Pstream::master()) { - if (bounds_ != boundBox::greatBox) + if (!bounds_.empty()) { // Clip to bounding box trimToBox(treeBoundBox(bounds_)); diff --git a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H index e8609eb77d..77dad3fb71 100644 --- a/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H +++ b/src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -79,7 +79,7 @@ Usage trackLength | Tracking segment length | no | nSubCycle | Number of tracking steps per cell | no| cloudName | Cloud name to use | yes | - bounds | Bounding box to trim tracks | no | greatBox + bounds | Bounding box to trim tracks | no | invertedBox seedSampleSet| Seeding method (see below)| yes | \endtable diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.C b/src/functionObjects/graphics/runTimePostProcessing/scene.C index 4af8b0d0e8..ea987cff38 100644 --- a/src/functionObjects/graphics/runTimePostProcessing/scene.C +++ b/src/functionObjects/graphics/runTimePostProcessing/scene.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -179,7 +179,7 @@ void Foam::functionObjects::runTimePostPro::scene::initialise vtkSmartPointer lightKit = vtkSmartPointer::New(); lightKit->AddLightsToRenderer(renderer); - if (clipBox_ != boundBox::greatBox) + if (!clipBox_.empty()) { const point& min = clipBox_.min(); const point& max = clipBox_.max(); @@ -237,7 +237,7 @@ void Foam::functionObjects::runTimePostPro::scene::setCamera // Apply clipping if required // Note: possible optimisation - if the camera is static, this only needs // to be done once on initialisation - if (clipBox_ != boundBox::greatBox) + if (!clipBox_.empty()) { // Call ResetCamera() to fit clip box in view clipBoxActor_->VisibilityOn(); @@ -278,7 +278,7 @@ Foam::functionObjects::runTimePostPro::scene::scene cameraUp_(nullptr), cameraViewAngle_(nullptr), cameraZoom_(nullptr), - clipBox_(boundBox::greatBox), + clipBox_(boundBox::invertedBox), clipBoxActor_(), parallelProjection_(true), nFrameTotal_(1), diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.C b/src/sampling/sampledSurface/distanceSurface/distanceSurface.C index ebb16d8e37..242bce5982 100644 --- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.C +++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -334,7 +334,7 @@ Foam::distanceSurface::distanceSurface cell_(dict.lookupOrDefault("cell", true)), regularise_(dict.lookupOrDefault("regularise", true)), average_(dict.lookupOrDefault("average", false)), - bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)), + bounds_(dict.lookupOrDefault("bounds", boundBox::invertedBox)), zoneKey_(keyType::null), needsUpdate_(true), isoSurfCellPtr_(nullptr), diff --git a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H index 4f28ad9acd..8a7a0507d7 100644 --- a/src/sampling/sampledSurface/distanceSurface/distanceSurface.H +++ b/src/sampling/sampledSurface/distanceSurface/distanceSurface.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -145,7 +145,7 @@ public: const bool cell, const Switch regularise, const Switch average, - const boundBox& bounds = boundBox::greatBox + const boundBox& bounds = boundBox::invertedBox ); diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C index a63cd5132e..5bb6cd0b59 100644 --- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C +++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -468,7 +468,7 @@ Foam::sampledIsoSurface::sampledIsoSurface sampledSurface(name, mesh, dict), isoField_(dict.lookup("isoField")), isoVal_(readScalar(dict.lookup("isoValue"))), - bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)), + bounds_(dict.lookupOrDefault("bounds", boundBox::invertedBox)), mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)), regularise_(dict.lookupOrDefault("regularise", true)), average_(dict.lookupOrDefault("average", false)), diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C index 7b7628fdad..5690220b7c 100644 --- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C +++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -207,7 +207,7 @@ Foam::sampledIsoSurfaceCell::sampledIsoSurfaceCell MeshStorage(), isoField_(dict.lookup("isoField")), isoVal_(readScalar(dict.lookup("isoValue"))), - bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)), + bounds_(dict.lookupOrDefault("bounds", boundBox::invertedBox)), regularise_(dict.lookupOrDefault("regularise", true)), average_(dict.lookupOrDefault("average", true)), zoneKey_(keyType::null), diff --git a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C index 875ee8ca77..ef1217b7ed 100644 --- a/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C +++ b/src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -263,7 +263,7 @@ Foam::sampledCuttingPlane::sampledCuttingPlane : sampledSurface(name, mesh, dict), plane_(dict), - bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)), + bounds_(dict.lookupOrDefault("bounds", boundBox::invertedBox)), mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)), regularise_(dict.lookupOrDefault("regularise", true)), average_(dict.lookupOrDefault("average", false)), diff --git a/src/sampling/surface/isoSurface/isoSurface.C b/src/sampling/surface/isoSurface/isoSurface.C index 4bb5d1549e..5ec5ad1667 100644 --- a/src/sampling/surface/isoSurface/isoSurface.C +++ b/src/sampling/surface/isoSurface/isoSurface.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -1619,7 +1619,7 @@ Foam::isoSurface::isoSurface DynamicList