WIP selection of lengthscales

timofeymukha · Oct 12, 2021 · eca1c1b · eca1c1b
1 parent 9645bec
commit eca1c1b
Show file tree

Hide file tree

Showing 9 changed files with 119 additions and 15 deletions.
diff --git a/samplers/MultiCellSampler/MultiCellSampler.C b/samplers/MultiCellSampler/MultiCellSampler.C
@@ -150,7 +150,7 @@ void Foam::MultiCellSampler::createIndexList()
     }
 }
 
-void Foam::MultiCellSampler::createLengthList()
+void Foam::MultiCellSampler::createLengthList(const word lengthScaleType)
 {
     // Cell volumes
     const scalarField & V = mesh_.V();
@@ -176,11 +176,13 @@ Foam::MultiCellSampler::MultiCellSampler
     scalar averagingTime,
     const word interpolationType,
     const word cellFinderType,
+    const word lengthScaleType,
     bool hIsIndex,
     bool excludeWallAdjacent
 )
 :
-    Sampler(p, averagingTime, interpolationType, cellFinderType, hIsIndex),
+    Sampler(p, averagingTime, interpolationType, cellFinderType,
+            lengthScaleType, hIsIndex),
     indexList_(p.size()),
     h_(p.size()),
     lengthList_(p.size()),
@@ -198,7 +200,7 @@ Foam::MultiCellSampler::MultiCellSampler
     }
 
     createIndexList();
-    createLengthList();
+    createLengthList(lengthScaleType);
 
     addField
     (
@@ -219,6 +221,7 @@ Foam::MultiCellSampler::MultiCellSampler
     scalar averagingTime,
     const word interpolationType,
     const word cellFinderType,
+    const word lengthScaleType,
     bool hIsIndex,
     bool excludeWallAdjacent
 )
@@ -229,6 +232,7 @@ Foam::MultiCellSampler::MultiCellSampler
         averagingTime,
         interpolationType,
         cellFinderType,
+        lengthScaleType,
         hIsIndex,
         excludeWallAdjacent
     )

diff --git a/samplers/MultiCellSampler/MultiCellSampler.H b/samplers/MultiCellSampler/MultiCellSampler.H
@@ -70,10 +70,10 @@ protected:
     // Protected Member Functions
 
         //- Create list of cell-indices from where data is sampled
-        virtual void createIndexList();
+        void createIndexList() override;
 
         //- Compute the length-scales
-        virtual void createLengthList();
+        void createLengthList(const word lengthScaleType) override;
 
 public:
 
@@ -91,6 +91,7 @@ public:
             scalar averagingTime,
             const word interpolationType="cell",
             const word cellFinderType="Tree",
+            const word lengthScaleType="CubeRootVol",
             bool hIsIndex=false,
             bool excludeWallAdjacent=false
         );
@@ -103,6 +104,7 @@ public:
             scalar averagingTime,
             const word interpolationType="cell",
             const word cellFinderType="Tree",
+            const word lengthScaleType="CubeRootVol",
             bool hIsIndex=false,
             bool excludeWallAdjacent=false
         );

diff --git a/samplers/Sampler/Sampler.C b/samplers/Sampler/Sampler.C
@@ -49,6 +49,7 @@ Foam::autoPtr<Foam::Sampler> Foam::Sampler::New
     scalar averagingTime,
     const word interpolationType,
     const word cellFinderType,
+    const word lengthScaleType,
     bool hIsIndex
 )
 {
@@ -75,6 +76,7 @@ Foam::autoPtr<Foam::Sampler> Foam::Sampler::New
         averagingTime,
         interpolationType,
         cellFinderType,
+        lengthScaleType,
         hIsIndex
     );
 }  
@@ -91,6 +93,8 @@ Foam::autoPtr<Foam::Sampler> Foam::Sampler::New
         dict.lookupOrDefault<word>("interpolationType", "cell");
     word cellFinderType =
         dict.lookupOrDefault<word>("sampler", "Tree");
+    word lengthScaleType =
+        dict.lookupOrDefault<word>("lengthScale", "CubeRootVol");
     bool hIsIndex =
         dict.lookupOrDefault<bool>("hIsIndex", false);
 
@@ -101,6 +105,7 @@ Foam::autoPtr<Foam::Sampler> Foam::Sampler::New
         averagingTime,
         interpolationType,
         cellFinderType,
+        lengthScaleType,
         hIsIndex
     );
 }  
@@ -149,6 +154,7 @@ Foam::Sampler::Sampler
     scalar averagingTime,
     const word interpolationType,
     const word cellFinderType,
+    const word lengthScaleType,
     bool hIsIndex
 )
 :
@@ -158,6 +164,7 @@ Foam::Sampler::Sampler
     sampledFields_(0),
     interpolationType_(interpolationType),
     cellFinderType_(cellFinderType),
+    lengthScaleType_(lengthScaleType),
     hIsIndex_(hIsIndex)
 {
     if (debug)
@@ -213,10 +220,19 @@ Foam::Sampler::Sampler
     scalar averagingTime,
     const word interpolationType,
     const word cellFinderType,
+    const word lengthScaleType,
     bool hIsIndex
 )
 :
-    Sampler(p, averagingTime, interpolationType, cellFinderType, hIsIndex)
+    Sampler
+    (
+        p,
+        averagingTime,
+        interpolationType,
+        cellFinderType,
+        lengthScaleType,
+        hIsIndex
+    )
 {
 }
 
@@ -228,6 +244,7 @@ Foam::Sampler::Sampler(const Sampler & copy)
     sampledFields_(copy.sampledFields_),
     interpolationType_(copy.interpolationType_),
     cellFinderType_(copy.cellFinderType_),
+    lengthScaleType_(copy.lengthScaleType_),
     hIsIndex_(copy.hIsIndex_)
 {
     if (debug)

diff --git a/samplers/Sampler/Sampler.H b/samplers/Sampler/Sampler.H
@@ -76,6 +76,9 @@ protected:
         //- Type of cellFinder to use for finding sampling cells.
         word cellFinderType_;
 
+        //- Way to compute the length-scale for the cells
+        word lengthScaleType_;
+
         //- Whether the h field is the consecutive index of the samping cell
         bool hIsIndex_;
 
@@ -85,7 +88,7 @@ protected:
         virtual void createIndexList() = 0;
 
         //- Compute the length-scales
-        virtual void createLengthList(){}
+        virtual void createLengthList(const word lengthScaleType){}
 
         //- Create fields
         virtual void createFields();
@@ -106,6 +109,7 @@ public:
             scalar averagingTime,
             const word interpolationType,
             const word cellFinderType,
+            const word lengthScaleType,
             bool hIsIndex
         );
 
@@ -117,6 +121,7 @@ public:
             scalar averagingTime,
             const word interpolationType,
             const word cellFinderType,
+            const word lengthScaleType,
             bool hIsIndex
         );
 
@@ -135,6 +140,7 @@ public:
             scalar averagingTime,
             const word interpolationType,
             const word cellFinderType,
+            const word lengthScaleType,
             bool hIsIndex
         );
 
@@ -184,6 +190,11 @@ public:
         {
             return cellFinderType_;
         }
+
+        word lengthScaleType() const
+        {
+            return lengthScaleType_;
+        }
 
         bool hIsIndex() const
         {
@@ -217,6 +228,7 @@ public:
                 scalar averagingTime,
                 const word interpolationType,
                 const word cellFinderType,
+                const word lengthScaleType,
                 bool hIsIndex
             ),
             (
@@ -225,6 +237,7 @@ public:
                 averagingTime,
                 interpolationType,
                 cellFinderType,
+                lengthScaleType,
                 hIsIndex
             )
         );

diff --git a/samplers/SingleCellSampler/SingleCellSampler.C b/samplers/SingleCellSampler/SingleCellSampler.C
@@ -32,6 +32,7 @@ License
 #include "scalarListIOList.H"
 #include "CrawlingCellFinder.H"
 #include "TreeCellFinder.H"
+#include "surfaceMesh.H"
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -160,7 +161,21 @@ void Foam::SingleCellSampler::createIndexList()
 }
 
 
-void Foam::SingleCellSampler::createLengthList()
+void Foam::SingleCellSampler::createLengthList(const word lengthScaleType)
+{
+    if (lengthScaleType == "CubeRootVol")
+    {
+        createLengthListCubeRootVol();
+    }
+    else if (lengthScaleType == "WallNormalDistance")
+    {
+
+    }
+
+}
+
+
+void Foam::SingleCellSampler::createLengthListCubeRootVol()
 {
     // Cell volumes
     const scalarField & V = mesh_.V();
@@ -169,7 +184,47 @@ void Foam::SingleCellSampler::createLengthList()
     {
         lengthList_[i] = pow(V[indexList_[i]], 1.0/3.0);
     }
-
+}
+
+
+void Foam::SingleCellSampler::createLengthListWallNormalDistance()
+{
+
+    const vectorField & faceCentres = mesh().Cf().primitiveField();
+    const List<cell> & cells = mesh().cells();
+    const vectorField & patchFaceCentres = patch().Cf();
+    const List<face> & faces = mesh().faces();
+
+    forAll(lengthList_, i)
+    {
+        const label index = indexList_[i];
+        const cell cellI = cells[index];
+
+        const vector patchFaceI = patchFaceCentres[i];
+
+        // Find face with min distance from the wall face
+        scalar minDist = GREAT;
+        label minDistFace = 0;
+        for (int j=0; j<cellI.nFaces(); j++)
+        {
+            const vector faceJ = faceCentres[cellI[j]];
+
+            const scalar dist = mag(faceJ - patchFaceI);
+            if (dist < minDist)
+            {
+                minDist = dist;
+                minDistFace = cellI[j];
+            }
+        }
+
+        label opposingFace = 
+            cellI.opposingFaceLabel(minDistFace, faces);
+        vector opposingFaceCentre = faceCentres[opposingFace];
+        vector minDistFaceCentre = faceCentres[minDistFace];
+
+        lengthList_[i] = mag(opposingFaceCentre - minDistFaceCentre); 
+
+    }
 }
 
 
@@ -181,16 +236,18 @@ Foam::SingleCellSampler::SingleCellSampler
     scalar averagingTime,
     const word interpolationType,
     const word cellFinderType,
+    const word lengthScaleType,
     bool hIsIndex
 )
 :
-    Sampler(p, averagingTime, interpolationType, cellFinderType, hIsIndex),
+    Sampler(p, averagingTime, interpolationType, cellFinderType,
+            lengthScaleType, hIsIndex),
     indexList_(p.size()),
     lengthList_(p.size()),
     h_(p.size(), 0)
 {
     createIndexList();
-    createLengthList();
+    createLengthList(lengthScaleType);
 
     addField
     (
@@ -211,6 +268,7 @@ Foam::SingleCellSampler::SingleCellSampler
     scalar averagingTime,
     const word interpolationType,
     const word cellFinderType,
+    const word lengthScaleType,
     bool hIsIndex
 )
 :
@@ -220,6 +278,7 @@ Foam::SingleCellSampler::SingleCellSampler
         averagingTime,
         interpolationType,
         cellFinderType,
+        lengthScaleType,
         hIsIndex
     )
 {

diff --git a/samplers/SingleCellSampler/SingleCellSampler.H b/samplers/SingleCellSampler/SingleCellSampler.H
@@ -66,9 +66,15 @@ protected:
 
         //- Create list of cell-indices from where data is sampled
         void createIndexList() override;
-        
+
         //- Compute the length-scales
-        void createLengthList() override;
+        void createLengthList(const word lengthScaleType) override;
+
+        //- Compute length-scales as cubic root of the volume
+        void createLengthListCubeRootVol();
+
+        //- Compute length-scales as distance across wall-normal direction
+        void createLengthListWallNormalDistance();
 
 public:
 
@@ -79,24 +85,24 @@ public:
 
     // Constructors
 
-        //- Construct from patch and averaging time
         SingleCellSampler
         (
             const fvPatch&,
             scalar averagingTime,
             const word interpolationType="cell",
             const word cellFinderType="Tree",
+            const word lengthScaleType="CubeRootVol",
             bool hIsIndex=false
         );
 
-        //- Construct from type, patch and averaging time
         SingleCellSampler
         (
             const word & samplerName,
             const fvPatch & p,
             scalar averagingTime,
             const word interpolationType="cell",
             const word cellFinderType="Tree",
+            const word lengthScaleType="CubeRootVol",
             bool hIsIndex=false
         );
 

diff --git a/wallModels/LOTWWallModelFvPatchScalarField.C b/wallModels/LOTWWallModelFvPatchScalarField.C
@@ -211,6 +211,7 @@ LOTWWallModelFvPatchScalarField
             averagingTime(),
             dict.lookupOrDefault<word>("interpolationType", "cell"),
             dict.lookupOrDefault<word>("sampler", "Tree"),
+            dict.lookupOrDefault<word>("lengthScale", "CubeRootVol"),
             dict.lookupOrDefault<bool>("hIsIndex", false)
         )
     )