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: scaling: added scaling to various sampling routines. See #514.

Browse Source
This commit is contained in:
mattijs
2017-08-17 12:47:45 +01:00
committed by Mark Olesen
parent 139edb2468
commit 3392965aba
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/meshTools/sets/cellSources/surfaceToCell/surfaceToCell.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 | \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -435,7 +435,14 @@ Foam::surfaceToCell::surfaceToCell
), ),
nearDist_(readScalar(dict.lookup("nearDistance"))), nearDist_(readScalar(dict.lookup("nearDistance"))),
curvature_(readScalar(dict.lookup("curvature"))), curvature_(readScalar(dict.lookup("curvature"))),
surfPtr_(new triSurface(surfName_)), surfPtr_
(
new triSurface
(
surfName_,
dict.lookupOrDefault<scalar>("scale", -1)
)
),
querySurfPtr_(new triSurfaceSearch(*surfPtr_)), querySurfPtr_(new triSurfaceSearch(*surfPtr_)),
IOwnPtrs_(true) IOwnPtrs_(true)
{ {

7
src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.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 | \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
This file is part of OpenFOAM. This file is part of OpenFOAM.
@ -59,7 +59,7 @@ void Foam::surfaceToPoint::combine(topoSet& set, const bool add) const
{ {
cpuTime timer; cpuTime timer;
triSurface surf(surfName_); triSurface surf(surfName_, scale_);
Info<< " Read surface from " << surfName_ Info<< " Read surface from " << surfName_
<< " in = "<< timer.cpuTimeIncrement() << " s" << endl << endl; << " in = "<< timer.cpuTimeIncrement() << " s" << endl << endl;
@ -131,6 +131,7 @@ Foam::surfaceToPoint::surfaceToPoint
: :
topoSetSource(mesh), topoSetSource(mesh),
surfName_(surfName), surfName_(surfName),
scale_(1.0),
nearDist_(nearDist), nearDist_(nearDist),
includeInside_(includeInside), includeInside_(includeInside),
includeOutside_(includeOutside) includeOutside_(includeOutside)
@ -147,6 +148,7 @@ Foam::surfaceToPoint::surfaceToPoint
: :
topoSetSource(mesh), topoSetSource(mesh),
surfName_(fileName(dict.lookup("file")).expand()), surfName_(fileName(dict.lookup("file")).expand()),
scale_(dict.lookupOrDefault<scalar>("scale", 1.0)),
nearDist_(readScalar(dict.lookup("nearDistance"))), nearDist_(readScalar(dict.lookup("nearDistance"))),
includeInside_(readBool(dict.lookup("includeInside"))), includeInside_(readBool(dict.lookup("includeInside"))),
includeOutside_(readBool(dict.lookup("includeOutside"))) includeOutside_(readBool(dict.lookup("includeOutside")))
@ -163,6 +165,7 @@ Foam::surfaceToPoint::surfaceToPoint
: :
topoSetSource(mesh), topoSetSource(mesh),
surfName_(checkIs(is)), surfName_(checkIs(is)),
scale_(1.0),
nearDist_(readScalar(checkIs(is))), nearDist_(readScalar(checkIs(is))),
includeInside_(readBool(checkIs(is))), includeInside_(readBool(checkIs(is))),
includeOutside_(readBool(checkIs(is))) includeOutside_(readBool(checkIs(is)))

3
src/meshTools/sets/pointSources/surfaceToPoint/surfaceToPoint.H
View File

@ -67,6 +67,9 @@ class surfaceToPoint
//- Name of surface file //- Name of surface file
const fileName surfName_; const fileName surfName_;
//- Optional scaling for surface
const scalar scale_;
//- If > 0 : include points with distance to surface less than nearDist. //- If > 0 : include points with distance to surface less than nearDist.
const scalar nearDist_; const scalar nearDist_;