mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge commit 'OpenCFD/master' into olesenm
This commit is contained in:
Mark Olesen
@ -6,17 +6,17 @@ wmake libso dummy
|
||||
|
||||
case "$WM_MPLIB" in
|
||||
GAMMA)
|
||||
wmake libso gamma
|
||||
;;
|
||||
wmake libso gamma
|
||||
;;
|
||||
|
||||
LAM | *MPI* )
|
||||
export WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
|
||||
set +x
|
||||
echo
|
||||
echo "Note: ignore spurious warnings about missing mpicxx.h headers"
|
||||
set -x
|
||||
wmake libso mpi
|
||||
;;
|
||||
WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
|
||||
set +x
|
||||
echo
|
||||
echo "Note: ignore spurious warnings about missing mpicxx.h headers"
|
||||
set -x
|
||||
wmake libso mpi
|
||||
;;
|
||||
esac
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
|
||||
@ -55,14 +55,15 @@ indexedOctree/treeDataTriSurface.C
|
||||
searchableSurface = searchableSurface
|
||||
$(searchableSurface)/distributedTriSurfaceMesh.C
|
||||
$(searchableSurface)/searchableBox.C
|
||||
$(searchableSurface)/searchableCylinder.C
|
||||
$(searchableSurface)/searchablePlane.C
|
||||
$(searchableSurface)/searchablePlate.C
|
||||
$(searchableSurface)/searchableSphere.C
|
||||
$(searchableSurface)/searchableSurface.C
|
||||
$(searchableSurface)/searchableSurfaces.C
|
||||
$(searchableSurface)/searchableSurfacesQueries.C
|
||||
$(searchableSurface)/triSurfaceMesh.C
|
||||
$(searchableSurface)/searchableSurfaceWithGaps.C
|
||||
$(searchableSurface)/triSurfaceMesh.C
|
||||
|
||||
topoSets = sets/topoSets
|
||||
$(topoSets)/cellSet.C
|
||||
|
||||
468
src/meshTools/searchableSurface/searchableCylinder.C
Normal file
468
src/meshTools/searchableSurface/searchableCylinder.C
Normal file
@ -0,0 +1,468 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2 of the License, or (at your
|
||||
option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM; if not, write to the Free Software Foundation,
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "searchableCylinder.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
|
||||
defineTypeNameAndDebug(searchableCylinder, 0);
|
||||
addToRunTimeSelectionTable(searchableSurface, searchableCylinder, dict);
|
||||
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
|
||||
|
||||
Foam::pointIndexHit Foam::searchableCylinder::findNearest
|
||||
(
|
||||
const point& sample,
|
||||
const scalar nearestDistSqr
|
||||
) const
|
||||
{
|
||||
pointIndexHit info(false, sample, -1);
|
||||
|
||||
vector v(sample - point1_);
|
||||
|
||||
// Decompose sample-point1 into normal and parallel component
|
||||
scalar parallel = (v & unitDir_);
|
||||
|
||||
// Remove the parallel component
|
||||
v -= parallel*unitDir_;
|
||||
scalar magV = mag(v);
|
||||
|
||||
if (parallel <= 0)
|
||||
{
|
||||
// nearest is at point1 end cap. Clip to radius.
|
||||
if (magV < ROOTVSMALL)
|
||||
{
|
||||
info.setPoint(point1_);
|
||||
}
|
||||
else
|
||||
{
|
||||
//info.setPoint(point1_ + min(magV, radius_)*v/magV);
|
||||
info.setPoint(point1_ + radius_*(v/magV));
|
||||
}
|
||||
}
|
||||
else if (parallel >= magDir_)
|
||||
{
|
||||
// nearest is at point2
|
||||
if (magV < ROOTVSMALL)
|
||||
{
|
||||
info.setPoint(point2_);
|
||||
}
|
||||
else
|
||||
{
|
||||
info.setPoint(point2_ + min(magV, radius_)*v/magV);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (magV < ROOTVSMALL)
|
||||
{
|
||||
info.setPoint(point1_ + parallel*unitDir_);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Project onto radius
|
||||
info.setPoint(point1_ + parallel*unitDir_ + radius_*v/magV);
|
||||
}
|
||||
}
|
||||
|
||||
if (magSqr(sample - info.rawPoint()) < nearestDistSqr)
|
||||
{
|
||||
info.setHit();
|
||||
info.setIndex(0);
|
||||
}
|
||||
|
||||
return info;
|
||||
}
|
||||
|
||||
|
||||
// From http://www.gamedev.net/community/forums/topic.asp?topic_id=467789 -
|
||||
// intersection of cylinder with ray
|
||||
void Foam::searchableCylinder::findLineAll
|
||||
(
|
||||
const point& start,
|
||||
const point& end,
|
||||
pointIndexHit& near,
|
||||
pointIndexHit& far
|
||||
) const
|
||||
{
|
||||
near.setMiss();
|
||||
far.setMiss();
|
||||
|
||||
// Line as P = start + t*V
|
||||
const vector V(end-start);
|
||||
|
||||
//Pout<< "point1:" << point1_ << " point2:" << point2_
|
||||
// << " start:" << start << " end:" << end << endl;
|
||||
|
||||
const vector x = (start-point1_) ^ unitDir_;
|
||||
const vector y = V ^ unitDir_;
|
||||
const scalar d = sqr(radius_);
|
||||
|
||||
// Second order equation of the form a*t^2 + b*t + c
|
||||
const scalar a = (y&y);
|
||||
const scalar b = 2*(x&y);
|
||||
const scalar c = (x&x)-d;
|
||||
|
||||
const scalar disc = b*b-4*a*c;
|
||||
|
||||
//Pout<< "a:" << a << " b:" << b << " c:" << c << " disc:" << disc
|
||||
// << endl;
|
||||
|
||||
if (disc < 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
else if (disc < ROOTVSMALL)
|
||||
{
|
||||
// Single solution
|
||||
if (mag(a) > ROOTVSMALL)
|
||||
{
|
||||
scalar t = -b/(2*a);
|
||||
if (t >= 0 && t <= 1)
|
||||
{
|
||||
near.setPoint(start + t*V);
|
||||
near.setHit();
|
||||
near.setIndex(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (mag(a) > ROOTVSMALL)
|
||||
{
|
||||
scalar sqrtDisc = sqrt(disc);
|
||||
|
||||
scalar t1 = (-b + sqrtDisc)/2*a;
|
||||
scalar t2 = (-b - sqrtDisc)/2*a;
|
||||
|
||||
if (t1 < t2)
|
||||
{
|
||||
if (t1 >= 0 && t1 <= 1)
|
||||
{
|
||||
near.setPoint(start + t1*V);
|
||||
near.setHit();
|
||||
near.setIndex(0);
|
||||
}
|
||||
if (t2 >= 0 && t2 <= 1)
|
||||
{
|
||||
far.setPoint(start + t2*V);
|
||||
far.setHit();
|
||||
far.setIndex(0);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (t2 >= 0 && t2 <= 1)
|
||||
{
|
||||
near.setPoint(start + t2*V);
|
||||
near.setHit();
|
||||
near.setIndex(0);
|
||||
}
|
||||
if (t1 >= 0 && t1 <= 1)
|
||||
{
|
||||
far.setPoint(start + t1*V);
|
||||
far.setHit();
|
||||
far.setIndex(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::searchableCylinder::searchableCylinder
|
||||
(
|
||||
const IOobject& io,
|
||||
const point& point1,
|
||||
const point& point2,
|
||||
const scalar radius
|
||||
)
|
||||
:
|
||||
searchableSurface(io),
|
||||
point1_(point1),
|
||||
point2_(point2),
|
||||
magDir_(mag(point2_-point1_)),
|
||||
unitDir_((point2_-point1_)/magDir_),
|
||||
radius_(radius)
|
||||
{
|
||||
Pout<< "point1_:" << point1_ << endl;
|
||||
Pout<< "point2_:" << point2_ << endl;
|
||||
Pout<< "magDir_:" << magDir_ << endl;
|
||||
Pout<< "unitDir_:" << unitDir_ << endl;
|
||||
Pout<< "radius_:" << radius_ << endl;
|
||||
}
|
||||
|
||||
|
||||
Foam::searchableCylinder::searchableCylinder
|
||||
(
|
||||
const IOobject& io,
|
||||
const dictionary& dict
|
||||
)
|
||||
:
|
||||
searchableSurface(io),
|
||||
point1_(dict.lookup("point1")),
|
||||
point2_(dict.lookup("point2")),
|
||||
magDir_(mag(point2_-point1_)),
|
||||
unitDir_((point2_-point1_)/magDir_),
|
||||
radius_(readScalar(dict.lookup("radius")))
|
||||
{
|
||||
Pout<< "point1_:" << point1_ << endl;
|
||||
Pout<< "point2_:" << point2_ << endl;
|
||||
Pout<< "magDir_:" << magDir_ << endl;
|
||||
Pout<< "unitDir_:" << unitDir_ << endl;
|
||||
Pout<< "radius_:" << radius_ << endl;
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::searchableCylinder::~searchableCylinder()
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
const Foam::wordList& Foam::searchableCylinder::regions() const
|
||||
{
|
||||
if (regions_.empty())
|
||||
{
|
||||
regions_.setSize(1);
|
||||
regions_[0] = "region0";
|
||||
}
|
||||
return regions_;
|
||||
}
|
||||
|
||||
|
||||
void Foam::searchableCylinder::findNearest
|
||||
(
|
||||
const pointField& samples,
|
||||
const scalarField& nearestDistSqr,
|
||||
List<pointIndexHit>& info
|
||||
) const
|
||||
{
|
||||
info.setSize(samples.size());
|
||||
|
||||
forAll(samples, i)
|
||||
{
|
||||
info[i] = findNearest(samples[i], nearestDistSqr[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Foam::searchableCylinder::findLine
|
||||
(
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
List<pointIndexHit>& info
|
||||
) const
|
||||
{
|
||||
info.setSize(start.size());
|
||||
|
||||
pointIndexHit b;
|
||||
|
||||
forAll(start, i)
|
||||
{
|
||||
// Pick nearest intersection. If none intersected take second one.
|
||||
findLineAll(start[i], end[i], info[i], b);
|
||||
if (!info[i].hit() && b.hit())
|
||||
{
|
||||
info[i] = b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Foam::searchableCylinder::findLineAny
|
||||
(
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
List<pointIndexHit>& info
|
||||
) const
|
||||
{
|
||||
info.setSize(start.size());
|
||||
|
||||
pointIndexHit b;
|
||||
|
||||
forAll(start, i)
|
||||
{
|
||||
// Discard far intersection
|
||||
findLineAll(start[i], end[i], info[i], b);
|
||||
if (!info[i].hit() && b.hit())
|
||||
{
|
||||
info[i] = b;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Foam::searchableCylinder::findLineAll
|
||||
(
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
List<List<pointIndexHit> >& info
|
||||
) const
|
||||
{
|
||||
info.setSize(start.size());
|
||||
|
||||
forAll(start, i)
|
||||
{
|
||||
pointIndexHit near, far;
|
||||
findLineAll(start[i], end[i], near, far);
|
||||
|
||||
if (near.hit())
|
||||
{
|
||||
if (far.hit())
|
||||
{
|
||||
info[i].setSize(2);
|
||||
info[i][0] = near;
|
||||
info[i][1] = far;
|
||||
}
|
||||
else
|
||||
{
|
||||
info[i].setSize(1);
|
||||
info[i][0] = near;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (far.hit())
|
||||
{
|
||||
info[i].setSize(1);
|
||||
info[i][0] = far;
|
||||
}
|
||||
else
|
||||
{
|
||||
info[i].clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Foam::searchableCylinder::getRegion
|
||||
(
|
||||
const List<pointIndexHit>& info,
|
||||
labelList& region
|
||||
) const
|
||||
{
|
||||
region.setSize(info.size());
|
||||
region = 0;
|
||||
}
|
||||
|
||||
|
||||
void Foam::searchableCylinder::getNormal
|
||||
(
|
||||
const List<pointIndexHit>& info,
|
||||
vectorField& normal
|
||||
) const
|
||||
{
|
||||
normal.setSize(info.size());
|
||||
normal = vector::zero;
|
||||
|
||||
forAll(info, i)
|
||||
{
|
||||
if (info[i].hit())
|
||||
{
|
||||
vector v(info[i].hitPoint() - point1_);
|
||||
|
||||
// Decompose sample-point1 into normal and parallel component
|
||||
scalar parallel = v & unitDir_;
|
||||
|
||||
if (parallel < 0)
|
||||
{
|
||||
normal[i] = -unitDir_;
|
||||
}
|
||||
else if (parallel > magDir_)
|
||||
{
|
||||
normal[i] = -unitDir_;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Remove the parallel component
|
||||
v -= parallel*unitDir_;
|
||||
normal[i] = v/mag(v);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Foam::searchableCylinder::getVolumeType
|
||||
(
|
||||
const pointField& points,
|
||||
List<volumeType>& volType
|
||||
) const
|
||||
{
|
||||
volType.setSize(points.size());
|
||||
volType = INSIDE;
|
||||
|
||||
forAll(points, pointI)
|
||||
{
|
||||
const point& pt = points[pointI];
|
||||
|
||||
vector v(pt - point1_);
|
||||
|
||||
// Decompose sample-point1 into normal and parallel component
|
||||
scalar parallel = v & unitDir_;
|
||||
|
||||
if (parallel < 0)
|
||||
{
|
||||
// left of point1 endcap
|
||||
volType[pointI] = OUTSIDE;
|
||||
}
|
||||
else if (parallel > magDir_)
|
||||
{
|
||||
// right of point2 endcap
|
||||
volType[pointI] = OUTSIDE;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Remove the parallel component
|
||||
v -= parallel*unitDir_;
|
||||
|
||||
if (mag(v) > radius_)
|
||||
{
|
||||
volType[pointI] = OUTSIDE;
|
||||
}
|
||||
else
|
||||
{
|
||||
volType[pointI] = INSIDE;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
225
src/meshTools/searchableSurface/searchableCylinder.H
Normal file
225
src/meshTools/searchableSurface/searchableCylinder.H
Normal file
@ -0,0 +1,225 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2 of the License, or (at your
|
||||
option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM; if not, write to the Free Software Foundation,
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Class
|
||||
Foam::searchableCylinder
|
||||
|
||||
Description
|
||||
Searching on cylinder
|
||||
|
||||
SourceFiles
|
||||
searchableCylinder.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef searchableCylinder_H
|
||||
#define searchableCylinder_H
|
||||
|
||||
#include "treeBoundBox.H"
|
||||
#include "searchableSurface.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
|
||||
// Forward declaration of classes
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class searchableCylinder Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class searchableCylinder
|
||||
:
|
||||
public searchableSurface
|
||||
{
|
||||
private:
|
||||
|
||||
// Private Member Data
|
||||
|
||||
//- 'left' point
|
||||
const point point1_;
|
||||
|
||||
//- 'right' point
|
||||
const point point2_;
|
||||
|
||||
//- length of vector point2-point1
|
||||
const scalar magDir_;
|
||||
|
||||
//- normalised vector point2-point1
|
||||
const vector unitDir_;
|
||||
|
||||
//- Radius squared
|
||||
const scalar radius_;
|
||||
|
||||
//- Names of regions
|
||||
mutable wordList regions_;
|
||||
|
||||
|
||||
// Private Member Functions
|
||||
|
||||
//- Find nearest point on cylinder.
|
||||
pointIndexHit findNearest
|
||||
(
|
||||
const point& sample,
|
||||
const scalar nearestDistSqr
|
||||
) const;
|
||||
|
||||
//- Find intersection with cylinder
|
||||
void findLineAll
|
||||
(
|
||||
const point& start,
|
||||
const point& end,
|
||||
pointIndexHit& near,
|
||||
pointIndexHit& far
|
||||
) const;
|
||||
|
||||
|
||||
//- Disallow default bitwise copy construct
|
||||
searchableCylinder(const searchableCylinder&);
|
||||
|
||||
//- Disallow default bitwise assignment
|
||||
void operator=(const searchableCylinder&);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("searchableCylinder");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct from components
|
||||
searchableCylinder
|
||||
(
|
||||
const IOobject& io,
|
||||
const point&,
|
||||
const point&,
|
||||
const scalar radius
|
||||
);
|
||||
|
||||
//- Construct from dictionary (used by searchableSurface)
|
||||
searchableCylinder
|
||||
(
|
||||
const IOobject& io,
|
||||
const dictionary& dict
|
||||
);
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~searchableCylinder();
|
||||
|
||||
|
||||
// Member Functions
|
||||
|
||||
virtual const wordList& regions() const;
|
||||
|
||||
//- Whether supports volume type below
|
||||
virtual bool hasVolumeType() const
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
//- Range of local indices that can be returned.
|
||||
virtual label size() const
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
// Multiple point queries.
|
||||
|
||||
virtual void findNearest
|
||||
(
|
||||
const pointField& sample,
|
||||
const scalarField& nearestDistSqr,
|
||||
List<pointIndexHit>&
|
||||
) const;
|
||||
|
||||
virtual void findLine
|
||||
(
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
List<pointIndexHit>&
|
||||
) const;
|
||||
|
||||
virtual void findLineAny
|
||||
(
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
List<pointIndexHit>&
|
||||
) const;
|
||||
|
||||
//- Get all intersections in order from start to end.
|
||||
virtual void findLineAll
|
||||
(
|
||||
const pointField& start,
|
||||
const pointField& end,
|
||||
List<List<pointIndexHit> >&
|
||||
) const;
|
||||
|
||||
//- From a set of points and indices get the region
|
||||
virtual void getRegion
|
||||
(
|
||||
const List<pointIndexHit>&,
|
||||
labelList& region
|
||||
) const;
|
||||
|
||||
//- From a set of points and indices get the normal
|
||||
virtual void getNormal
|
||||
(
|
||||
const List<pointIndexHit>&,
|
||||
vectorField& normal
|
||||
) const;
|
||||
|
||||
//- Determine type (inside/outside/mixed) for point. unknown if
|
||||
// cannot be determined (e.g. non-manifold surface)
|
||||
virtual void getVolumeType
|
||||
(
|
||||
const pointField&,
|
||||
List<volumeType>&
|
||||
) const;
|
||||
|
||||
|
||||
// regIOobject implementation
|
||||
|
||||
bool writeData(Ostream&) const
|
||||
{
|
||||
notImplemented("searchableCylinder::writeData(Ostream&) const");
|
||||
return false;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -7,6 +7,7 @@ field/magSqr/magSqr.C
|
||||
field/magGrad/magGrad.C
|
||||
field/div/div.C
|
||||
field/randomise/randomise.C
|
||||
field/interpolate/interpolate.C
|
||||
|
||||
basic/add/add.C
|
||||
|
||||
|
||||
@ -0,0 +1,136 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2 of the License, or (at your
|
||||
option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM; if not, write to the Free Software Foundation,
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#include "interpolate.H"
|
||||
#include "addToRunTimeSelectionTable.H"
|
||||
|
||||
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
namespace calcTypes
|
||||
{
|
||||
defineTypeNameAndDebug(interpolate, 0);
|
||||
addToRunTimeSelectionTable(calcType, interpolate, dictionary);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::calcTypes::interpolate::interpolate()
|
||||
:
|
||||
calcType()
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
|
||||
|
||||
Foam::calcTypes::interpolate::~interpolate()
|
||||
{}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||
|
||||
void Foam::calcTypes::interpolate::init()
|
||||
{
|
||||
Foam::argList::validArgs.append("interpolate");
|
||||
argList::validArgs.append("fieldName1 .. fieldNameN");
|
||||
}
|
||||
|
||||
|
||||
void Foam::calcTypes::interpolate::preCalc
|
||||
(
|
||||
const argList& args,
|
||||
const Time& runTime,
|
||||
const fvMesh& mesh
|
||||
)
|
||||
{
|
||||
if (args.additionalArgs().size() < 2)
|
||||
{
|
||||
Info<< nl << "must specify one or more fields" << nl;
|
||||
args.printUsage();
|
||||
FatalError.exit();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Foam::calcTypes::interpolate::calc
|
||||
(
|
||||
const argList& args,
|
||||
const Time& runTime,
|
||||
const fvMesh& mesh
|
||||
)
|
||||
{
|
||||
const stringList& params = args.additionalArgs();
|
||||
|
||||
for (label fieldi=1; fieldi<params.size(); fieldi++)
|
||||
{
|
||||
const word fieldName(params[fieldi]);
|
||||
|
||||
IOobject fieldHeader
|
||||
(
|
||||
fieldName,
|
||||
runTime.timeName(),
|
||||
mesh,
|
||||
IOobject::MUST_READ
|
||||
);
|
||||
|
||||
// Check field exists
|
||||
if (fieldHeader.headerOk())
|
||||
{
|
||||
bool processed = false;
|
||||
|
||||
writeInterpolateField<scalar>(fieldHeader, mesh, processed);
|
||||
writeInterpolateField<vector>(fieldHeader, mesh, processed);
|
||||
writeInterpolateField<sphericalTensor>
|
||||
(
|
||||
fieldHeader,
|
||||
mesh,
|
||||
processed
|
||||
);
|
||||
writeInterpolateField<symmTensor>(fieldHeader, mesh, processed);
|
||||
writeInterpolateField<tensor>(fieldHeader, mesh, processed);
|
||||
|
||||
if (!processed)
|
||||
{
|
||||
FatalError
|
||||
<< "Unable to process " << fieldName << nl
|
||||
<< "No call to interpolate for fields of type "
|
||||
<< fieldHeader.headerClassName() << nl << nl
|
||||
<< exit(FatalError);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Info<< " No " << fieldName << endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -0,0 +1,138 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2 of the License, or (at your
|
||||
option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM; if not, write to the Free Software Foundation,
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Class
|
||||
Foam::calcTypes::interpolate
|
||||
|
||||
Description
|
||||
Interpolates volume fields to surface fields for each time.
|
||||
|
||||
SourceFiles
|
||||
interpolate.C
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
#ifndef interpolate_H
|
||||
#define interpolate_H
|
||||
|
||||
#include "calcType.H"
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
namespace Foam
|
||||
{
|
||||
|
||||
namespace calcTypes
|
||||
{
|
||||
|
||||
/*---------------------------------------------------------------------------*\
|
||||
Class interpolate Declaration
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
class interpolate
|
||||
:
|
||||
public calcType
|
||||
{
|
||||
// Private Member Functions
|
||||
|
||||
//- Disallow default bitwise copy construct
|
||||
interpolate(const interpolate&);
|
||||
|
||||
//- Disallow default bitwise assignment
|
||||
void operator=(const interpolate&);
|
||||
|
||||
|
||||
protected:
|
||||
|
||||
// Member Functions
|
||||
|
||||
// Calculation routines
|
||||
|
||||
//- Initialise - typically setting static variables,
|
||||
// e.g. command line arguments
|
||||
virtual void init();
|
||||
|
||||
//- Pre-time loop calculations
|
||||
virtual void preCalc
|
||||
(
|
||||
const argList& args,
|
||||
const Time& runTime,
|
||||
const fvMesh& mesh
|
||||
);
|
||||
|
||||
//- Time loop calculations
|
||||
virtual void calc
|
||||
(
|
||||
const argList& args,
|
||||
const Time& runTime,
|
||||
const fvMesh& mesh
|
||||
);
|
||||
|
||||
|
||||
// I-O
|
||||
|
||||
//- Write interpolate fields
|
||||
template<class Type>
|
||||
void writeInterpolateField
|
||||
(
|
||||
const IOobject& header,
|
||||
const fvMesh& mesh,
|
||||
bool& processed
|
||||
);
|
||||
|
||||
|
||||
public:
|
||||
|
||||
//- Runtime type information
|
||||
TypeName("interpolate");
|
||||
|
||||
|
||||
// Constructors
|
||||
|
||||
//- Construct null
|
||||
interpolate();
|
||||
|
||||
|
||||
// Destructor
|
||||
|
||||
virtual ~interpolate();
|
||||
};
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End namespace calcTypes
|
||||
} // End namespace Foam
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#ifdef NoRepository
|
||||
# include "writeInterpolateField.C"
|
||||
#endif
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
#endif
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -0,0 +1,62 @@
|
||||
/*---------------------------------------------------------------------------*\
|
||||
========= |
|
||||
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
\\ / O peration |
|
||||
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
|
||||
\\/ M anipulation |
|
||||
-------------------------------------------------------------------------------
|
||||
License
|
||||
This file is part of OpenFOAM.
|
||||
|
||||
OpenFOAM is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU General Public License as published by the
|
||||
Free Software Foundation; either version 2 of the License, or (at your
|
||||
option) any later version.
|
||||
|
||||
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OpenFOAM; if not, write to the Free Software Foundation,
|
||||
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
template<class Type>
|
||||
void Foam::calcTypes::interpolate::writeInterpolateField
|
||||
(
|
||||
const IOobject& header,
|
||||
const fvMesh& mesh,
|
||||
bool& processed
|
||||
)
|
||||
{
|
||||
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
|
||||
typedef GeometricField<Type, fvsPatchField, surfaceMesh> surfaceFieldType;
|
||||
|
||||
if (header.headerClassName() == fieldType::typeName)
|
||||
{
|
||||
Info<< " Reading " << header.name() << endl;
|
||||
fieldType field(header, mesh);
|
||||
|
||||
Info<< " Calculating interpolate" << header.name() << endl;
|
||||
surfaceFieldType interpolateField
|
||||
(
|
||||
IOobject
|
||||
(
|
||||
"interpolate" + header.name(),
|
||||
mesh.time().timeName(),
|
||||
mesh,
|
||||
IOobject::NO_READ
|
||||
),
|
||||
fvc::interpolate(field)
|
||||
);
|
||||
interpolateField.write();
|
||||
|
||||
processed = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
@ -82,7 +82,7 @@ void Foam::fieldAverage::initialise()
|
||||
// Add mean fields to the field lists
|
||||
forAll(faItems_, i)
|
||||
{
|
||||
const word fieldName = faItems_[i].fieldName();
|
||||
const word& fieldName = faItems_[i].fieldName();
|
||||
if (obr_.foundObject<volScalarField>(fieldName))
|
||||
{
|
||||
addMeanField<scalar>(i, meanScalarFields_);
|
||||
@ -117,7 +117,7 @@ void Foam::fieldAverage::initialise()
|
||||
{
|
||||
if (faItems_[i].prime2Mean())
|
||||
{
|
||||
const word fieldName = faItems_[i].fieldName();
|
||||
const word& fieldName = faItems_[i].fieldName();
|
||||
if (!faItems_[i].mean())
|
||||
{
|
||||
FatalErrorIn("Foam::fieldAverage::initialise()")
|
||||
|
||||
@ -86,7 +86,7 @@ autoPtr<radiationModel> radiationModel::New
|
||||
|
||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||
|
||||
} // End radiation
|
||||
} // End namespace radiation
|
||||
} // End namespace Foam
|
||||
|
||||
// ************************************************************************* //
|
||||
|
||||
@ -88,7 +88,7 @@ RASModel::RASModel
|
||||
dimensioned<scalar>::lookupOrAddToDict
|
||||
(
|
||||
"kappa",
|
||||
subDict("wallFunctionCoeffs"),
|
||||
wallFunctionDict_,
|
||||
0.4187
|
||||
)
|
||||
),
|
||||
@ -97,7 +97,7 @@ RASModel::RASModel
|
||||
dimensioned<scalar>::lookupOrAddToDict
|
||||
(
|
||||
"E",
|
||||
subDict("wallFunctionCoeffs"),
|
||||
wallFunctionDict_,
|
||||
9.0
|
||||
)
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user