ENH: Adding array Set and fixing sampledSurfacesTemplates

src/sampling/Make/files

@@ -18,6 +18,7 @@ sampledSet/sampledSets/sampledSetsGrouping.C
 sampledSet/sampledSetsFunctionObject/sampledSetsFunctionObject.C
 sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C
 sampledSet/uniform/uniformSet.C
+sampledSet/array/arraySet.C
 
 setWriters = sampledSet/writers
 

src/sampling/sampledSet/array/arraySet.C

+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "arraySet.H"
+#include "sampledSet.H"
+#include "meshSearch.H"
+#include "DynamicList.H"
+#include "polyMesh.H"
+#include "addToRunTimeSelectionTable.H"
+#include "word.H"
+#include "transform.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(arraySet, 0);
+    addToRunTimeSelectionTable(sampledSet, arraySet, word);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::arraySet::calcSamples
+(
+    DynamicList<point>& samplingPts,
+    DynamicList<label>& samplingCells,
+    DynamicList<label>& samplingFaces,
+    DynamicList<label>& samplingSegments,
+    DynamicList<scalar>& samplingCurveDist
+) const
+{
+    const meshSearch& queryMesh = searchEngine();
+
+    label nTotalSamples
+    (
+        pointsDensity_.x()
+       *pointsDensity_.y()
+       *pointsDensity_.z()
+    );
+
+    List<point> sampleCoords(nTotalSamples);
+
+    const scalar deltax = spanBox_.x()/(pointsDensity_.x() + 1);
+    const scalar deltay = spanBox_.y()/(pointsDensity_.y() + 1);
+    const scalar deltaz = spanBox_.z()/(pointsDensity_.z() + 1);
+
+    label p(0);
+    for (label k=1; k<=pointsDensity_.z(); k++)
+    {
+        for (label j=1; j<=pointsDensity_.y(); j++)
+        {
+            for (label i=1; i<=pointsDensity_.x(); i++)
+            {
+                vector t(deltax*i , deltay*j, deltaz*k);
+                sampleCoords[p] = coordSys_.origin() + t;
+                p++;
+            }
+        }
+    }
+
+    forAll(sampleCoords, i)
+    {
+        sampleCoords[i] = transform(coordSys_.R(), sampleCoords[i]);
+    }
+
+    forAll(sampleCoords, sampleI)
+    {
+        label cellI = queryMesh.findCell(sampleCoords[sampleI]);
+
+        if (cellI != -1)
+        {
+            samplingPts.append(sampleCoords[sampleI]);
+            samplingCells.append(cellI);
+            samplingFaces.append(-1);
+            samplingSegments.append(0);
+            samplingCurveDist.append(1.0 * sampleI);
+        }
+    }
+}
+
+
+void Foam::arraySet::genSamples()
+{
+    // Storage for sample points
+    DynamicList<point> samplingPts;
+    DynamicList<label> samplingCells;
+    DynamicList<label> samplingFaces;
+    DynamicList<label> samplingSegments;
+    DynamicList<scalar> samplingCurveDist;
+
+    calcSamples
+    (
+        samplingPts,
+        samplingCells,
+        samplingFaces,
+        samplingSegments,
+        samplingCurveDist
+    );
+
+    samplingPts.shrink();
+    samplingCells.shrink();
+    samplingFaces.shrink();
+    samplingSegments.shrink();
+    samplingCurveDist.shrink();
+
+    setSamples
+    (
+        samplingPts,
+        samplingCells,
+        samplingFaces,
+        samplingSegments,
+        samplingCurveDist
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::arraySet::arraySet
+(
+    const word& name,
+    const polyMesh& mesh,
+    const meshSearch& searchEngine,
+    const word& axis,
+    const coordinateSystem& origin,
+    const Vector<label>& pointsDensity,
+    const Vector<scalar>& spanBox
+)
+:
+    sampledSet(name, mesh, searchEngine, axis),
+    coordSys_(origin),
+    pointsDensity_(pointsDensity),
+    spanBox_(spanBox)
+{
+    genSamples();
+
+    if (debug)
+    {
+        write(Info);
+    }
+}
+
+
+Foam::arraySet::arraySet
+(
+    const word& name,
+    const polyMesh& mesh,
+    const meshSearch& searchEngine,
+    const dictionary& dict
+)
+:
+    sampledSet(name, mesh, searchEngine, dict),
+    coordSys_(dict),
+    pointsDensity_(dict.lookup("pointsDensity")),
+    spanBox_(dict.lookup("spanBox"))
+{
+    genSamples();
+
+    if (debug)
+    {
+        write(Info);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::arraySet::~arraySet()
+{}
+
+
+// ************************************************************************* //

src/sampling/sampledSet/array/arraySet.H

+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::arraySet
+
+Description
+
+SourceFiles
+    arraySet.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef arraySet_H
+#define arraySet_H
+
+#include "sampledSet.H"
+#include "DynamicList.H"
+#include "coordinateSystem.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class passiveParticle;
+template<class Type> class particle;
+
+/*---------------------------------------------------------------------------*\
+                           Class arraySet Declaration
+\*---------------------------------------------------------------------------*/
+
+class arraySet
+:
+    public sampledSet
+{
+    // Private data
+
+        //- Coordinate syste
+        coordinateSystem coordSys_;
+
+        //- Point density vector
+        Vector<label> pointsDensity_;
+
+        //- Span box
+        Vector<scalar> spanBox_;
+
+
+    // Private Member Functions
+
+        //- Samples all points in sampleCoords.
+        void calcSamples
+        (
+            DynamicList<point>& samplingPts,
+            DynamicList<label>& samplingCells,
+            DynamicList<label>& samplingFaces,
+            DynamicList<label>& samplingSegments,
+            DynamicList<scalar>& samplingCurveDist
+        ) const;
+
+        //- Uses calcSamples to obtain samples. Copies them into *this.
+        void genSamples();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("array");
+
+
+    // Constructors
+
+        //- Construct from components
+        arraySet
+        (
+            const word& name,
+            const polyMesh& mesh,
+            const meshSearch& searchEngine,
+            const word& axis,
+            const coordinateSystem& coordSys,
+            const Vector<label>& pointsDensity,
+            const Vector<scalar>& spanBox
+        );
+
+        //- Construct from dictionary
+        arraySet
+        (
+            const word& name,
+            const polyMesh& mesh,
+            const meshSearch& searchEngine,
+            const dictionary& dict
+        );
+
+
+    //- Destructor
+    virtual ~arraySet();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C

@@ -204,7 +204,7 @@ void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& allObjects)
             {
                 sampleAndWrite
                 (
-                    mesh.thisDb().lookupObject<GeoField>(field)
+                    mesh_.thisDb().lookupObject<GeoField>(field)
                 );
             }
         }