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 invertedBox instead of greatBox for signalling no clipping

Browse Source 
- more stable/predictable to check for a bounding box !empty() rather
  than comparing to greatBox directly.
This commit is contained in:
Mark Olesen
2017-02-01 14:31:09 +00:00
parent 0ffae6461a
commit e76d5ce567
13 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/functionObjects/field/streamLine/streamLine.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / 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 License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -76,7 +76,7 @@ Usage
trackLength | Tracking segment length | no | trackLength | Tracking segment length | no |
nSubCycle | Number of tracking steps per cell | no| nSubCycle | Number of tracking steps per cell | no|
cloudName | Cloud name to use | yes | 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 | seedSampleSet| Seeding method (see below)| yes |
\endtable \endtable
@ -136,10 +136,10 @@ class streamLine
// Private Member Functions // Private Member Functions
//- Disallow default bitwise copy construct //- Disallow default bitwise copy construct
streamLine(const streamLine&); streamLine(const streamLine&) = delete;
//- Disallow default bitwise assignment //- Disallow default bitwise assignment
void operator=(const streamLine&); void operator=(const streamLine&) = delete;
public: public:

8
src/functionObjects/field/streamLine/streamLineBase.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -545,8 +545,8 @@ bool Foam::functionObjects::streamLineBase::read(const dictionary& dict)
} }
bounds_ = boundBox::greatBox; bounds_ = boundBox::invertedBox;
if (dict.readIfPresent("bounds", bounds_)) if (dict.readIfPresent("bounds", bounds_) && !bounds_.empty())
{ {
Info<< " clipping all segments to " << bounds_ << nl << endl; Info<< " clipping all segments to " << bounds_ << nl << endl;
} }
@ -701,7 +701,7 @@ bool Foam::functionObjects::streamLineBase::write()
if (Pstream::master()) if (Pstream::master())
{ {
if (bounds_ != boundBox::greatBox) if (!bounds_.empty())
{ {
// Clip to bounding box // Clip to bounding box
trimToBox(treeBoundBox(bounds_)); trimToBox(treeBoundBox(bounds_));

4
src/functionObjects/field/wallBoundedStreamLine/wallBoundedStreamLine.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / 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 License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -79,7 +79,7 @@ Usage
trackLength | Tracking segment length | no | trackLength | Tracking segment length | no |
nSubCycle | Number of tracking steps per cell | no| nSubCycle | Number of tracking steps per cell | no|
cloudName | Cloud name to use | yes | 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 | seedSampleSet| Seeding method (see below)| yes |
\endtable \endtable

8
src/functionObjects/graphics/runTimePostProcessing/scene.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2015-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -179,7 +179,7 @@ void Foam::functionObjects::runTimePostPro::scene::initialise
vtkSmartPointer<vtkLightKit> lightKit = vtkSmartPointer<vtkLightKit>::New(); vtkSmartPointer<vtkLightKit> lightKit = vtkSmartPointer<vtkLightKit>::New();
lightKit->AddLightsToRenderer(renderer); lightKit->AddLightsToRenderer(renderer);
if (clipBox_ != boundBox::greatBox) if (!clipBox_.empty())
{ {
const point& min = clipBox_.min(); const point& min = clipBox_.min();
const point& max = clipBox_.max(); const point& max = clipBox_.max();
@ -237,7 +237,7 @@ void Foam::functionObjects::runTimePostPro::scene::setCamera
// Apply clipping if required // Apply clipping if required
// Note: possible optimisation - if the camera is static, this only needs // Note: possible optimisation - if the camera is static, this only needs
// to be done once on initialisation // to be done once on initialisation
if (clipBox_ != boundBox::greatBox) if (!clipBox_.empty())
{ {
// Call ResetCamera() to fit clip box in view // Call ResetCamera() to fit clip box in view
clipBoxActor_->VisibilityOn(); clipBoxActor_->VisibilityOn();
@ -278,7 +278,7 @@ Foam::functionObjects::runTimePostPro::scene::scene
cameraUp_(nullptr), cameraUp_(nullptr),
cameraViewAngle_(nullptr), cameraViewAngle_(nullptr),
cameraZoom_(nullptr), cameraZoom_(nullptr),
clipBox_(boundBox::greatBox), clipBox_(boundBox::invertedBox),
clipBoxActor_(), clipBoxActor_(),
parallelProjection_(true), parallelProjection_(true),
nFrameTotal_(1), nFrameTotal_(1),

4
src/sampling/sampledSurface/distanceSurface/distanceSurface.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -334,7 +334,7 @@ Foam::distanceSurface::distanceSurface
cell_(dict.lookupOrDefault("cell", true)), cell_(dict.lookupOrDefault("cell", true)),
regularise_(dict.lookupOrDefault("regularise", true)), regularise_(dict.lookupOrDefault("regularise", true)),
average_(dict.lookupOrDefault("average", false)), average_(dict.lookupOrDefault("average", false)),
bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)), bounds_(dict.lookupOrDefault("bounds", boundBox::invertedBox)),
zoneKey_(keyType::null), zoneKey_(keyType::null),
needsUpdate_(true), needsUpdate_(true),
isoSurfCellPtr_(nullptr), isoSurfCellPtr_(nullptr),

4
src/sampling/sampledSurface/distanceSurface/distanceSurface.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -145,7 +145,7 @@ public:
const bool cell, const bool cell,
const Switch regularise, const Switch regularise,
const Switch average, const Switch average,
const boundBox& bounds = boundBox::greatBox const boundBox& bounds = boundBox::invertedBox
); );

4
src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -468,7 +468,7 @@ Foam::sampledIsoSurface::sampledIsoSurface
sampledSurface(name, mesh, dict), sampledSurface(name, mesh, dict),
isoField_(dict.lookup("isoField")), isoField_(dict.lookup("isoField")),
isoVal_(readScalar(dict.lookup("isoValue"))), isoVal_(readScalar(dict.lookup("isoValue"))),
bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)), bounds_(dict.lookupOrDefault("bounds", boundBox::invertedBox)),
mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)), mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)),
regularise_(dict.lookupOrDefault("regularise", true)), regularise_(dict.lookupOrDefault("regularise", true)),
average_(dict.lookupOrDefault("average", false)), average_(dict.lookupOrDefault("average", false)),

4
src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -207,7 +207,7 @@ Foam::sampledIsoSurfaceCell::sampledIsoSurfaceCell
MeshStorage(), MeshStorage(),
isoField_(dict.lookup("isoField")), isoField_(dict.lookup("isoField")),
isoVal_(readScalar(dict.lookup("isoValue"))), isoVal_(readScalar(dict.lookup("isoValue"))),
bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)), bounds_(dict.lookupOrDefault("bounds", boundBox::invertedBox)),
regularise_(dict.lookupOrDefault("regularise", true)), regularise_(dict.lookupOrDefault("regularise", true)),
average_(dict.lookupOrDefault("average", true)), average_(dict.lookupOrDefault("average", true)),
zoneKey_(keyType::null), zoneKey_(keyType::null),

4
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -263,7 +263,7 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
: :
sampledSurface(name, mesh, dict), sampledSurface(name, mesh, dict),
plane_(dict), plane_(dict),
bounds_(dict.lookupOrDefault("bounds", boundBox::greatBox)), bounds_(dict.lookupOrDefault("bounds", boundBox::invertedBox)),
mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)), mergeTol_(dict.lookupOrDefault("mergeTol", 1e-6)),
regularise_(dict.lookupOrDefault("regularise", true)), regularise_(dict.lookupOrDefault("regularise", true)),
average_(dict.lookupOrDefault("average", false)), average_(dict.lookupOrDefault("average", false)),

6
src/sampling/surface/isoSurface/isoSurface.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / 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 License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -1619,7 +1619,7 @@ Foam::isoSurface::isoSurface
DynamicList<label> trimTriMap; DynamicList<label> trimTriMap;
// Trimmed to original point // Trimmed to original point
labelList trimTriPointMap; labelList trimTriPointMap;
if (bounds_ != boundBox::greatBox) if (!bounds_.empty())
{ {
trimToBox trimToBox
( (
@ -1652,7 +1652,7 @@ Foam::isoSurface::isoSurface
} }
if (bounds_ != boundBox::greatBox) if (!bounds_.empty())
{ {
// Adjust interpolatedPoints_ // Adjust interpolatedPoints_
inplaceRenumber(triPointMergeMap_, interpolatedPoints_); inplaceRenumber(triPointMergeMap_, interpolatedPoints_);

4
src/sampling/surface/isoSurface/isoSurface.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -411,7 +411,7 @@ public:
const scalarField& pointIsoVals, const scalarField& pointIsoVals,
const scalar iso, const scalar iso,
const bool regularise, const bool regularise,
const boundBox& bounds = boundBox::greatBox, const boundBox& bounds = boundBox::invertedBox,
const scalar mergeTol = 1e-6 // fraction of bounding box const scalar mergeTol = 1e-6 // fraction of bounding box
); );

6
src/sampling/surface/isoSurface/isoSurfaceCell.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -1436,7 +1436,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
DynamicList<label> trimTriMap; DynamicList<label> trimTriMap;
// Trimmed to original point // Trimmed to original point
labelList trimTriPointMap; labelList trimTriPointMap;
if (bounds_ != boundBox::greatBox) if (!bounds_.empty())
{ {
isoSurface::trimToBox isoSurface::trimToBox
( (
@ -1468,7 +1468,7 @@ Foam::isoSurfaceCell::isoSurfaceCell
<< " merged triangles." << endl; << " merged triangles." << endl;
} }
if (bounds_ != boundBox::greatBox) if (!bounds_.empty())
{ {
// Adjust interpolatedPoints_ // Adjust interpolatedPoints_
inplaceRenumber(triPointMergeMap_, interpolatedPoints_); inplaceRenumber(triPointMergeMap_, interpolatedPoints_);

4
src/sampling/surface/isoSurface/isoSurfaceCell.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -330,7 +330,7 @@ public:
const scalarField& pointValues, const scalarField& pointValues,
const scalar iso, const scalar iso,
const bool regularise, const bool regularise,
const boundBox& bounds = boundBox::greatBox, const boundBox& bounds = boundBox::invertedBox,
const scalar mergeTol = 1e-6 // fraction of bounding box const scalar mergeTol = 1e-6 // fraction of bounding box
); );