zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2018-06-21 22:01:08 +01:00
parent 85e249e61d 9151ee6ba8
commit c23f291acb
28 changed files with 291 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/functionObjects/field/interfaceHeight/interfaceHeight.C
View File

@ -28,7 +28,7 @@ License
#include "interpolation.H" #include "interpolation.H"
#include "IOmanip.H" #include "IOmanip.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "lineCellFaceSet.H" #include "lineCellFace.H"
#include "Time.H" #include "Time.H"
#include "uniformDimensionedFields.H" #include "uniformDimensionedFields.H"
#include "volFields.H" #include "volFields.H"
@ -72,7 +72,7 @@ void Foam::functionObjects::interfaceHeight::writePositions()
forAll(locations_, li) forAll(locations_, li)
{ {
// Create a set along a ray projected in the direction of gravity // Create a set along a ray projected in the direction of gravity
const lineCellFaceSet set const sampledSets::lineCellFace set
( (
"", "",
mesh_, mesh_,

24
src/sampling/Make/files
View File

@ -5,18 +5,18 @@ probes/probesGrouping.C
sampledSet/sampledSet/sampledSet.C sampledSet/sampledSet/sampledSet.C
sampledSet/sampledSets/sampledSets.C sampledSet/sampledSets/sampledSets.C
sampledSet/sampledSets/sampledSetsGrouping.C sampledSet/sampledSets/sampledSetsGrouping.C
sampledSet/arcUniform/arcUniformSet.C sampledSet/arcUniform/arcUniform.C
sampledSet/boxUniform/boxUniformSet.C sampledSet/boxUniform/boxUniform.C
sampledSet/circleRandom/circleRandomSet.C sampledSet/circleRandom/circleRandom.C
sampledSet/lineCell/lineCellSet.C sampledSet/lineCell/lineCell.C
sampledSet/lineCellFace/lineCellFaceSet.C sampledSet/lineCellFace/lineCellFace.C
sampledSet/lineFace/lineFaceSet.C sampledSet/lineFace/lineFace.C
sampledSet/lineUniform/lineUniformSet.C sampledSet/lineUniform/lineUniform.C
sampledSet/boundaryPoints/boundaryPointsSet.C sampledSet/boundaryPoints/boundaryPoints.C
sampledSet/boundaryRandom/boundaryRandomSet.C sampledSet/boundaryRandom/boundaryRandom.C
sampledSet/points/pointsSet.C sampledSet/points/points.C
sampledSet/sphereRandom/sphereRandomSet.C sampledSet/sphereRandom/sphereRandom.C
sampledSet/triSurfaceMesh/triSurfaceMeshSet.C sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C
cuttingPlane/cuttingPlane.C cuttingPlane/cuttingPlane.C

17
src/sampling/sampledSet/arcUniform/arcUniformSet.C → src/sampling/sampledSet/arcUniform/arcUniform.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "arcUniformSet.H" #include "arcUniform.H"
#include "sampledSet.H" #include "sampledSet.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -36,14 +36,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(arcUniformSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, arcUniformSet, word); {
defineTypeNameAndDebug(arcUniform, 0);
addToRunTimeSelectionTable(sampledSet, arcUniform, word);
}
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::arcUniformSet::calcSamples void Foam::sampledSets::arcUniform::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -77,7 +80,7 @@ void Foam::arcUniformSet::calcSamples
} }
void Foam::arcUniformSet::genSamples() void Foam::sampledSets::arcUniform::genSamples()
{ {
// Storage for sample points // Storage for sample points
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
@ -114,7 +117,7 @@ void Foam::arcUniformSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::arcUniformSet::arcUniformSet Foam::sampledSets::arcUniform::arcUniform
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -141,7 +144,7 @@ Foam::arcUniformSet::arcUniformSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::arcUniformSet::~arcUniformSet() Foam::sampledSets::arcUniform::~arcUniform()
{} {}

19
src/sampling/sampledSet/arcUniform/arcUniformSet.H → src/sampling/sampledSet/arcUniform/arcUniform.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::arcUniformSet Foam::sampledSets::arcUniform
Description Description
Uniform samples along an arc Uniform samples along an arc
@ -54,12 +54,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
arcUniformSet.C arcUniform.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef arcUniformSet_H #ifndef arcUniform_H
#define arcUniformSet_H #define arcUniform_H
#include "sampledSet.H" #include "sampledSet.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -68,12 +68,14 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class arcUniformSet Declaration Class arcUniform Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class arcUniformSet class arcUniform
: :
public sampledSet public sampledSet
{ {
@ -125,7 +127,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
arcUniformSet arcUniform
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -135,12 +137,13 @@ public:
// Destructor // Destructor
virtual ~arcUniformSet(); virtual ~arcUniform();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

17
src/sampling/sampledSet/boundaryPoints/boundaryPointsSet.C → src/sampling/sampledSet/boundaryPoints/boundaryPoints.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "boundaryPointsSet.H" #include "boundaryPoints.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "treeBoundBox.H" #include "treeBoundBox.H"
@ -36,14 +36,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(boundaryPointsSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, boundaryPointsSet, word); {
defineTypeNameAndDebug(boundaryPoints, 0);
addToRunTimeSelectionTable(sampledSet, boundaryPoints, word);
}
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::boundaryPointsSet::calcSamples void Foam::sampledSets::boundaryPoints::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -188,7 +191,7 @@ void Foam::boundaryPointsSet::calcSamples
} }
void Foam::boundaryPointsSet::genSamples() void Foam::sampledSets::boundaryPoints::genSamples()
{ {
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
DynamicList<label> samplingCells; DynamicList<label> samplingCells;
@ -224,7 +227,7 @@ void Foam::boundaryPointsSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::boundaryPointsSet::boundaryPointsSet Foam::sampledSets::boundaryPoints::boundaryPoints
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -254,7 +257,7 @@ Foam::boundaryPointsSet::boundaryPointsSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::boundaryPointsSet::~boundaryPointsSet() Foam::sampledSets::boundaryPoints::~boundaryPoints()
{} {}

19
src/sampling/sampledSet/boundaryPoints/boundaryPointsSet.H → src/sampling/sampledSet/boundaryPoints/boundaryPoints.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::boundaryPointsSet Foam::sampledSets::boundaryPoints
Description Description
Specified point samples within patches Specified point samples within patches
@ -54,12 +54,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
boundaryPointsSet.C boundaryPoints.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef boundaryPointsSet_H #ifndef boundaryPoints_H
#define boundaryPointsSet_H #define boundaryPoints_H
#include "sampledSet.H" #include "sampledSet.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -69,12 +69,14 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class boundaryPointsSet Declaration Class boundaryPoints Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class boundaryPointsSet class boundaryPoints
: :
public sampledSet public sampledSet
{ {
@ -115,7 +117,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
boundaryPointsSet boundaryPoints
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -125,12 +127,13 @@ public:
//- Destructor //- Destructor
virtual ~boundaryPointsSet(); virtual ~boundaryPoints();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

17
src/sampling/sampledSet/boundaryRandom/boundaryRandomSet.C → src/sampling/sampledSet/boundaryRandom/boundaryRandom.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "boundaryRandomSet.H" #include "boundaryRandom.H"
#include "sampledSet.H" #include "sampledSet.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -39,14 +39,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(boundaryRandomSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, boundaryRandomSet, word); {
defineTypeNameAndDebug(boundaryRandom, 0);
addToRunTimeSelectionTable(sampledSet, boundaryRandom, word);
}
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::boundaryRandomSet::calcSamples void Foam::sampledSets::boundaryRandom::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -175,7 +178,7 @@ void Foam::boundaryRandomSet::calcSamples
} }
void Foam::boundaryRandomSet::genSamples() void Foam::sampledSets::boundaryRandom::genSamples()
{ {
// Storage for sample points // Storage for sample points
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
@ -212,7 +215,7 @@ void Foam::boundaryRandomSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::boundaryRandomSet::boundaryRandomSet Foam::sampledSets::boundaryRandom::boundaryRandom
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -241,7 +244,7 @@ Foam::boundaryRandomSet::boundaryRandomSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::boundaryRandomSet::~boundaryRandomSet() Foam::sampledSets::boundaryRandom::~boundaryRandom()
{} {}

19
src/sampling/sampledSet/boundaryRandom/boundaryRandomSet.H → src/sampling/sampledSet/boundaryRandom/boundaryRandom.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::boundaryRandomSet Foam::sampledSets::boundaryRandom
Description Description
Random samples within patches Random samples within patches
@ -46,12 +46,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
boundaryRandomSet.C boundaryRandom.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef boundaryRandomSet_H #ifndef boundaryRandom_H
#define boundaryRandomSet_H #define boundaryRandom_H
#include "sampledSet.H" #include "sampledSet.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -61,12 +61,14 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class boundaryRandomSet Declaration Class boundaryRandom Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class boundaryRandomSet class boundaryRandom
: :
public sampledSet public sampledSet
{ {
@ -104,7 +106,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
boundaryRandomSet boundaryRandom
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -114,12 +116,13 @@ public:
//- Destructor //- Destructor
virtual ~boundaryRandomSet(); virtual ~boundaryRandom();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

17
src/sampling/sampledSet/boxUniform/boxUniformSet.C → src/sampling/sampledSet/boxUniform/boxUniform.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "boxUniformSet.H" #include "boxUniform.H"
#include "sampledSet.H" #include "sampledSet.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -36,14 +36,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(boxUniformSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, boxUniformSet, word); {
defineTypeNameAndDebug(boxUniform, 0);
addToRunTimeSelectionTable(sampledSet, boxUniform, word);
}
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::boxUniformSet::calcSamples void Foam::sampledSets::boxUniform::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -81,7 +84,7 @@ void Foam::boxUniformSet::calcSamples
} }
void Foam::boxUniformSet::genSamples() void Foam::sampledSets::boxUniform::genSamples()
{ {
// Storage for sample points // Storage for sample points
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
@ -118,7 +121,7 @@ void Foam::boxUniformSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::boxUniformSet::boxUniformSet Foam::sampledSets::boxUniform::boxUniform
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -141,7 +144,7 @@ Foam::boxUniformSet::boxUniformSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::boxUniformSet::~boxUniformSet() Foam::sampledSets::boxUniform::~boxUniform()
{} {}

20
src/sampling/sampledSet/boxUniform/boxUniformSet.H → src/sampling/sampledSet/boxUniform/boxUniform.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::boxUniformSet Foam::sampledSets::boxUniform
Description Description
Uniform 3D-grid of samples Uniform 3D-grid of samples
@ -46,12 +46,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
boxUniformSet.C boxUniform.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef boxUniformSet_H #ifndef boxUniform_H
#define boxUniformSet_H #define boxUniform_H
#include "sampledSet.H" #include "sampledSet.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -67,11 +67,14 @@ namespace Foam
class passiveParticle; class passiveParticle;
template<class Type> class particle; template<class Type> class particle;
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class boxUniformSet Declaration Class boxUniform Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class boxUniformSet class boxUniform
: :
public sampledSet public sampledSet
{ {
@ -109,7 +112,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
boxUniformSet boxUniform
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -119,12 +122,13 @@ public:
//- Destructor //- Destructor
virtual ~boxUniformSet(); virtual ~boxUniform();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

17
src/sampling/sampledSet/circleRandom/circleRandomSet.C → src/sampling/sampledSet/circleRandom/circleRandom.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "circleRandomSet.H" #include "circleRandom.H"
#include "sampledSet.H" #include "sampledSet.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -37,14 +37,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(circleRandomSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, circleRandomSet, word); {
defineTypeNameAndDebug(circleRandom, 0);
addToRunTimeSelectionTable(sampledSet, circleRandom, word);
}
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::circleRandomSet::calcSamples void Foam::sampledSets::circleRandom::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -82,7 +85,7 @@ void Foam::circleRandomSet::calcSamples
} }
void Foam::circleRandomSet::genSamples() void Foam::sampledSets::circleRandom::genSamples()
{ {
// Storage for sample points // Storage for sample points
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
@ -119,7 +122,7 @@ void Foam::circleRandomSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::circleRandomSet::circleRandomSet Foam::sampledSets::circleRandom::circleRandom
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -144,7 +147,7 @@ Foam::circleRandomSet::circleRandomSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::circleRandomSet::~circleRandomSet() Foam::sampledSets::circleRandom::~circleRandom()
{} {}

19
src/sampling/sampledSet/circleRandom/circleRandomSet.H → src/sampling/sampledSet/circleRandom/circleRandom.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::circleRandomSet Foam::sampledSets::circleRandom
Description Description
Random samples within a circle Random samples within a circle
@ -50,12 +50,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
circleRandomSet.C circleRandom.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef circleRandomSet_H #ifndef circleRandom_H
#define circleRandomSet_H #define circleRandom_H
#include "sampledSet.H" #include "sampledSet.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -64,12 +64,14 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class circleRandomSet Declaration Class circleRandom Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class circleRandomSet class circleRandom
: :
public sampledSet public sampledSet
{ {
@ -113,7 +115,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
circleRandomSet circleRandom
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -124,12 +126,13 @@ public:
// Destructor // Destructor
virtual ~circleRandomSet(); virtual ~circleRandom();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

21
src/sampling/sampledSet/lineCell/lineCellSet.C → src/sampling/sampledSet/lineCell/lineCell.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "lineCellSet.H" #include "lineCell.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
#include "polyMesh.H" #include "polyMesh.H"
@ -33,14 +33,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(lineCellSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, lineCellSet, word); {
defineTypeNameAndDebug(lineCell, 0);
addToRunTimeSelectionTable(sampledSet, lineCell, word);
}
} }
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
void Foam::lineCellSet::calcMidPointSample void Foam::sampledSets::lineCell::calcMidPointSample
( (
const polyMesh& mesh, const polyMesh& mesh,
const point& prevPt, const point& prevPt,
@ -100,7 +103,7 @@ void Foam::lineCellSet::calcMidPointSample
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::lineCellSet::calcSamples void Foam::sampledSets::lineCell::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -115,7 +118,7 @@ void Foam::lineCellSet::calcSamples
DynamicList<label> faceFaces; DynamicList<label> faceFaces;
DynamicList<label> faceSegments; DynamicList<label> faceSegments;
DynamicList<scalar> faceCurveDist; DynamicList<scalar> faceCurveDist;
lineFaceSet::calcSamples lineFace::calcSamples
( (
mesh(), mesh(),
searchEngine(), searchEngine(),
@ -151,7 +154,7 @@ void Foam::lineCellSet::calcSamples
} }
void Foam::lineCellSet::genSamples() void Foam::sampledSets::lineCell::genSamples()
{ {
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
DynamicList<label> samplingCells; DynamicList<label> samplingCells;
@ -187,7 +190,7 @@ void Foam::lineCellSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::lineCellSet::lineCellSet Foam::sampledSets::lineCell::lineCell
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -210,7 +213,7 @@ Foam::lineCellSet::lineCellSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::lineCellSet::~lineCellSet() Foam::sampledSets::lineCell::~lineCell()
{} {}

21
src/sampling/sampledSet/lineCell/lineCellSet.H → src/sampling/sampledSet/lineCell/lineCell.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::lineCellSet Foam::sampledSets::lineCell
Description Description
Cell-samples along a line at the mid-points in-between face-intersections Cell-samples along a line at the mid-points in-between face-intersections
@ -46,25 +46,27 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
lineCellSet.C lineCell.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef lineCellSet_H #ifndef lineCell_H
#define lineCellSet_H #define lineCell_H
#include "lineFaceSet.H" #include "lineFace.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class lineCellSet Declaration Class lineCell Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class lineCellSet class lineCell
: :
public sampledSet public sampledSet
{ {
@ -123,7 +125,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
lineCellSet lineCell
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -133,12 +135,13 @@ public:
//- Destructor //- Destructor
virtual ~lineCellSet(); virtual ~lineCell();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

23
src/sampling/sampledSet/lineCellFace/lineCellFaceSet.C → src/sampling/sampledSet/lineCellFace/lineCellFace.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "lineCellFaceSet.H" #include "lineCellFace.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
#include "polyMesh.H" #include "polyMesh.H"
@ -33,14 +33,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(lineCellFaceSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, lineCellFaceSet, word); {
defineTypeNameAndDebug(lineCellFace, 0);
addToRunTimeSelectionTable(sampledSet, lineCellFace, word);
}
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::lineCellFaceSet::calcSamples void Foam::sampledSets::lineCellFace::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -55,7 +58,7 @@ void Foam::lineCellFaceSet::calcSamples
DynamicList<label> faceFaces; DynamicList<label> faceFaces;
DynamicList<label> faceSegments; DynamicList<label> faceSegments;
DynamicList<scalar> faceCurveDist; DynamicList<scalar> faceCurveDist;
lineFaceSet::calcSamples lineFace::calcSamples
( (
mesh(), mesh(),
searchEngine(), searchEngine(),
@ -84,7 +87,7 @@ void Foam::lineCellFaceSet::calcSamples
for (label facei = 1; facei < facePts.size(); ++ facei) for (label facei = 1; facei < facePts.size(); ++ facei)
{ {
lineCellSet::calcMidPointSample lineCell::calcMidPointSample
( (
mesh(), mesh(),
samplingPts.last(), samplingPts.last(),
@ -110,7 +113,7 @@ void Foam::lineCellFaceSet::calcSamples
} }
void Foam::lineCellFaceSet::genSamples() void Foam::sampledSets::lineCellFace::genSamples()
{ {
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
DynamicList<label> samplingCells; DynamicList<label> samplingCells;
@ -146,7 +149,7 @@ void Foam::lineCellFaceSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::lineCellFaceSet::lineCellFaceSet Foam::sampledSets::lineCellFace::lineCellFace
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -167,7 +170,7 @@ Foam::lineCellFaceSet::lineCellFaceSet
} }
Foam::lineCellFaceSet::lineCellFaceSet Foam::sampledSets::lineCellFace::lineCellFace
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -192,7 +195,7 @@ Foam::lineCellFaceSet::lineCellFaceSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::lineCellFaceSet::~lineCellFaceSet() Foam::sampledSets::lineCellFace::~lineCellFace()
{} {}

23
src/sampling/sampledSet/lineCellFace/lineCellFaceSet.H → src/sampling/sampledSet/lineCellFace/lineCellFace.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::lineCellFaceSet Foam::sampledSets::lineCellFace
Description Description
Face-intersections along a line, plus cell-samples at the mid-points Face-intersections along a line, plus cell-samples at the mid-points
@ -47,25 +47,27 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
lineCellFaceSet.C lineCellFace.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef lineCellFaceSet_H #ifndef lineCellFace_H
#define lineCellFaceSet_H #define lineCellFace_H
#include "lineCellSet.H" #include "lineCell.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class lineCellFaceSet Declaration Class lineCellFace Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class lineCellFaceSet class lineCellFace
: :
public sampledSet public sampledSet
{ {
@ -103,7 +105,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
lineCellFaceSet lineCellFace
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -112,7 +114,7 @@ public:
); );
//- Construct from components //- Construct from components
lineCellFaceSet lineCellFace
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -124,12 +126,13 @@ public:
//- Destructor //- Destructor
virtual ~lineCellFaceSet(); virtual ~lineCellFace();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

19
src/sampling/sampledSet/lineFace/lineFaceSet.C → src/sampling/sampledSet/lineFace/lineFace.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "lineFaceSet.H" #include "lineFace.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
#include "polyMesh.H" #include "polyMesh.H"
@ -33,14 +33,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(lineFaceSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, lineFaceSet, word); {
defineTypeNameAndDebug(lineFace, 0);
addToRunTimeSelectionTable(sampledSet, lineFace, word);
}
} }
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
void Foam::lineFaceSet::calcSamples void Foam::sampledSets::lineFace::calcSamples
( (
const polyMesh& mesh, const polyMesh& mesh,
const meshSearch& searchEngine, const meshSearch& searchEngine,
@ -161,7 +164,7 @@ void Foam::lineFaceSet::calcSamples
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::lineFaceSet::calcSamples void Foam::sampledSets::lineFace::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -185,7 +188,7 @@ void Foam::lineFaceSet::calcSamples
} }
void Foam::lineFaceSet::genSamples() void Foam::sampledSets::lineFace::genSamples()
{ {
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
DynamicList<label> samplingCells; DynamicList<label> samplingCells;
@ -221,7 +224,7 @@ void Foam::lineFaceSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::lineFaceSet::lineFaceSet Foam::sampledSets::lineFace::lineFace
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -244,7 +247,7 @@ Foam::lineFaceSet::lineFaceSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::lineFaceSet::~lineFaceSet() Foam::sampledSets::lineFace::~lineFace()
{} {}

19
src/sampling/sampledSet/lineFace/lineFaceSet.H → src/sampling/sampledSet/lineFace/lineFace.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::lineFaceSet Foam::sampledSets::lineFace
Description Description
Face-intersections along a line Face-intersections along a line
@ -46,12 +46,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
lineFaceSet.C lineFace.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef lineFaceSet_H #ifndef lineFace_H
#define lineFaceSet_H #define lineFace_H
#include "sampledSet.H" #include "sampledSet.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -61,12 +61,14 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class lineFaceSet Declaration Class lineFace Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class lineFaceSet class lineFace
: :
public sampledSet public sampledSet
{ {
@ -121,7 +123,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
lineFaceSet lineFace
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -131,12 +133,13 @@ public:
//- Destructor //- Destructor
virtual ~lineFaceSet(); virtual ~lineFace();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

17
src/sampling/sampledSet/lineUniform/lineUniformSet.C → src/sampling/sampledSet/lineUniform/lineUniform.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "lineUniformSet.H" #include "lineUniform.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
#include "polyMesh.H" #include "polyMesh.H"
@ -33,14 +33,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(lineUniformSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, lineUniformSet, word); {
defineTypeNameAndDebug(lineUniform, 0);
addToRunTimeSelectionTable(sampledSet, lineUniform, word);
}
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::lineUniformSet::calcSamples void Foam::sampledSets::lineUniform::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -91,7 +94,7 @@ void Foam::lineUniformSet::calcSamples
} }
void Foam::lineUniformSet::genSamples() void Foam::sampledSets::lineUniform::genSamples()
{ {
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
DynamicList<label> samplingCells; DynamicList<label> samplingCells;
@ -127,7 +130,7 @@ void Foam::lineUniformSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::lineUniformSet::lineUniformSet Foam::sampledSets::lineUniform::lineUniform
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -151,7 +154,7 @@ Foam::lineUniformSet::lineUniformSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::lineUniformSet::~lineUniformSet() Foam::sampledSets::lineUniform::~lineUniform()
{} {}

19
src/sampling/sampledSet/lineUniform/lineUniformSet.H → src/sampling/sampledSet/lineUniform/lineUniform.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::lineUniformSet Foam::sampledSets::lineUniform
Description Description
Uniform samples along a line Uniform samples along a line
@ -48,12 +48,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
lineUniformSet.C lineUniform.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef lineUniformSet_H #ifndef lineUniform_H
#define lineUniformSet_H #define lineUniform_H
#include "passiveParticleCloud.H" #include "passiveParticleCloud.H"
#include "sampledSet.H" #include "sampledSet.H"
@ -63,12 +63,14 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class lineUniformSet Declaration Class lineUniform Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class lineUniformSet class lineUniform
: :
public sampledSet public sampledSet
{ {
@ -110,7 +112,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
lineUniformSet lineUniform
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -120,12 +122,13 @@ public:
//- Destructor //- Destructor
virtual ~lineUniformSet(); virtual ~lineUniform();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

19
src/sampling/sampledSet/points/pointsSet.C → src/sampling/sampledSet/points/points.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "pointsSet.H" #include "points.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
#include "polyMesh.H" #include "polyMesh.H"
@ -33,14 +33,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(pointsSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, pointsSet, word); {
defineTypeNameAndDebug(points, 0);
addToRunTimeSelectionTable(sampledSet, points, word);
}
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::pointsSet::calcSamplesUnordered void Foam::sampledSets::points::calcSamplesUnordered
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -65,7 +68,7 @@ void Foam::pointsSet::calcSamplesUnordered
} }
} }
void Foam::pointsSet::calcSamplesOrdered void Foam::sampledSets::points::calcSamplesOrdered
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -120,7 +123,7 @@ void Foam::pointsSet::calcSamplesOrdered
} }
void Foam::pointsSet::genSamples() void Foam::sampledSets::points::genSamples()
{ {
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
DynamicList<label> samplingCells; DynamicList<label> samplingCells;
@ -170,7 +173,7 @@ void Foam::pointsSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::pointsSet::pointsSet Foam::sampledSets::points::points
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -193,7 +196,7 @@ Foam::pointsSet::pointsSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::pointsSet::~pointsSet() Foam::sampledSets::points::~points()
{} {}

19
src/sampling/sampledSet/points/pointsSet.H → src/sampling/sampledSet/points/points.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::pointsSet Foam::sampledSets::points
Description Description
Specified point samples. Optionally ordered into a continuous path. Specified point samples. Optionally ordered into a continuous path.
@ -60,12 +60,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
pointsSet.C points.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef pointsSet_H #ifndef points_H
#define pointsSet_H #define points_H
#include "sampledSet.H" #include "sampledSet.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -75,12 +75,14 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class pointsSet Declaration Class points Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class pointsSet class points
: :
public sampledSet public sampledSet
{ {
@ -128,7 +130,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
pointsSet points
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -138,12 +140,13 @@ public:
//- Destructor //- Destructor
virtual ~pointsSet(); virtual ~points();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

20
src/sampling/sampledSet/sampledSet/sampledSet.C
View File

@ -27,10 +27,10 @@ License
#include "polyMesh.H" #include "polyMesh.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "writer.H" #include "writer.H"
#include "lineCellSet.H" #include "lineCell.H"
#include "lineCellFaceSet.H" #include "lineCellFace.H"
#include "lineFaceSet.H" #include "lineFace.H"
#include "lineUniformSet.H" #include "lineUniform.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -144,10 +144,14 @@ Foam::autoPtr<Foam::sampledSet> Foam::sampledSet::New
const HashTable<word> oldToNewType = const HashTable<word> oldToNewType =
{ {
Tuple2<word, word>("midPoint", lineCellSet::typeName), Tuple2<word, word>("midPoint", sampledSets::lineCell::typeName),
Tuple2<word, word>("midPointAndFace", lineCellFaceSet::typeName), Tuple2<word, word>
Tuple2<word, word>("face", lineFaceSet::typeName), (
Tuple2<word, word>("uniform", lineUniformSet::typeName) "midPointAndFace",
sampledSets::lineCellFace::typeName
),
Tuple2<word, word>("face", sampledSets::lineFace::typeName),
Tuple2<word, word>("uniform", sampledSets::lineUniform::typeName)
}; };
if (oldToNewType.found(sampleType)) if (oldToNewType.found(sampleType))

17
src/sampling/sampledSet/sphereRandom/sphereRandomSet.C → src/sampling/sampledSet/sphereRandom/sphereRandom.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "sphereRandomSet.H" #include "sphereRandom.H"
#include "sampledSet.H" #include "sampledSet.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -37,14 +37,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(sphereRandomSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, sphereRandomSet, word); {
defineTypeNameAndDebug(sphereRandom, 0);
addToRunTimeSelectionTable(sampledSet, sphereRandom, word);
}
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::sphereRandomSet::calcSamples void Foam::sampledSets::sphereRandom::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -81,7 +84,7 @@ void Foam::sphereRandomSet::calcSamples
} }
void Foam::sphereRandomSet::genSamples() void Foam::sampledSets::sphereRandom::genSamples()
{ {
// Storage for sample points // Storage for sample points
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
@ -118,7 +121,7 @@ void Foam::sphereRandomSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::sphereRandomSet::sphereRandomSet Foam::sampledSets::sphereRandom::sphereRandom
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -142,7 +145,7 @@ Foam::sphereRandomSet::sphereRandomSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::sphereRandomSet::~sphereRandomSet() Foam::sampledSets::sphereRandom::~sphereRandom()
{} {}

19
src/sampling/sampledSet/sphereRandom/sphereRandomSet.H → src/sampling/sampledSet/sphereRandom/sphereRandom.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::sphereRandomSet Foam::sampledSets::sphereRandom
Description Description
Random samples within a sphere Random samples within a sphere
@ -48,12 +48,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
sphereRandomSet.C sphereRandom.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef sphereRandomSet_H #ifndef sphereRandom_H
#define sphereRandomSet_H #define sphereRandom_H
#include "sampledSet.H" #include "sampledSet.H"
#include "DynamicList.H" #include "DynamicList.H"
@ -62,12 +62,14 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class sphereRandomSet Declaration Class sphereRandom Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class sphereRandomSet class sphereRandom
: :
public sampledSet public sampledSet
{ {
@ -108,7 +110,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
sphereRandomSet sphereRandom
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -119,12 +121,13 @@ public:
// Destructor // Destructor
virtual ~sphereRandomSet(); virtual ~sphereRandom();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

17
src/sampling/sampledSet/triSurfaceMesh/triSurfaceMeshSet.C → src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "triSurfaceMeshSet.H" #include "triSurfaceMeshSampledSet.H"
#include "meshSearch.H" #include "meshSearch.H"
#include "DynamicList.H" #include "DynamicList.H"
#include "polyMesh.H" #include "polyMesh.H"
@ -35,14 +35,17 @@ License
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(triSurfaceMeshSet, 0); namespace sampledSets
addToRunTimeSelectionTable(sampledSet, triSurfaceMeshSet, word); {
defineTypeNameAndDebug(triSurfaceMeshSampledSet, 0);
addToRunTimeSelectionTable(sampledSet, triSurfaceMeshSampledSet, word);
}
} }
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::triSurfaceMeshSet::calcSamples void Foam::sampledSets::triSurfaceMeshSampledSet::calcSamples
( (
DynamicList<point>& samplingPts, DynamicList<point>& samplingPts,
DynamicList<label>& samplingCells, DynamicList<label>& samplingCells,
@ -68,7 +71,7 @@ void Foam::triSurfaceMeshSet::calcSamples
} }
void Foam::triSurfaceMeshSet::genSamples() void Foam::sampledSets::triSurfaceMeshSampledSet::genSamples()
{ {
// Storage for sample points // Storage for sample points
DynamicList<point> samplingPts; DynamicList<point> samplingPts;
@ -105,7 +108,7 @@ void Foam::triSurfaceMeshSet::genSamples()
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::triSurfaceMeshSet::triSurfaceMeshSet Foam::sampledSets::triSurfaceMeshSampledSet::triSurfaceMeshSampledSet
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -145,7 +148,7 @@ Foam::triSurfaceMeshSet::triSurfaceMeshSet
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::triSurfaceMeshSet::~triSurfaceMeshSet() Foam::sampledSets::triSurfaceMeshSampledSet::~triSurfaceMeshSampledSet()
{} {}

19
src/sampling/sampledSet/triSurfaceMesh/triSurfaceMeshSet.H → src/sampling/sampledSet/triSurfaceMeshSampledSet/triSurfaceMeshSampledSet.H
View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::triSurfaceMeshSet Foam::sampledSets::triSurfaceMeshSampledSet
Description Description
Samples from all the points of a triSurfaceMesh. Surface files are read Samples from all the points of a triSurfaceMesh. Surface files are read
@ -45,12 +45,12 @@ Usage
\endverbatim \endverbatim
SourceFiles SourceFiles
triSurfaceMeshSet.C triSurfaceMeshSampledSet.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef triSurfaceMeshSet_H #ifndef triSurfaceMeshSampledSet_H
#define triSurfaceMeshSet_H #define triSurfaceMeshSampledSet_H
#include "sampledSet.H" #include "sampledSet.H"
@ -58,12 +58,14 @@ SourceFiles
namespace Foam namespace Foam
{ {
namespace sampledSets
{
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class triSurfaceMeshSet Declaration Class triSurfaceMeshSampledSet Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class triSurfaceMeshSet class triSurfaceMeshSampledSet
: :
public sampledSet public sampledSet
{ {
@ -101,7 +103,7 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
triSurfaceMeshSet triSurfaceMeshSampledSet
( (
const word& name, const word& name,
const polyMesh& mesh, const polyMesh& mesh,
@ -111,12 +113,13 @@ public:
//- Destructor //- Destructor
virtual ~triSurfaceMeshSet(); virtual ~triSurfaceMeshSampledSet();
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace sampledSets
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

56
tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/system/sample
View File

@ -1,56 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object sample;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
type sets;
libs ("libsampling.so");
interpolationScheme cellPointFace;
writeFormat raw;
sampleSets
(
face
{
name cone25;
axis x;
start (0 0 0);
end (0.09208087 0.042939 0);
nPoints 92;
}
face
{
name cone55;
axis x;
start (0.09208087 0.042939 0);
end (0.153683 0.13092 0);
nPoints 61;
}
face
{
name base;
axis x;
start (0.153683 0.13092 0);
end (0.193675 0.13092 0);
nPoints 40;
}
);
fields ( p wallHeatTransRate );
// ************************************************************************* //