ENH: finiteArea - faMesh now derived from faSolution, faSchemes and data classes

src/finiteArea/interpolation/edgeInterpolation/edgeInterpolate.C

@@ -56,7 +56,7 @@ Foam::tmp<Foam::edgeInterpolationScheme<Type>> Foam::fac::scheme
     (
         faceFlux.mesh(),
         faceFlux,
-        faceFlux.mesh().schemesDict().interpolationScheme(name)
+        faceFlux.mesh().interpolationScheme(name)
     );
 }
 
@@ -86,7 +86,7 @@ Foam::tmp<Foam::edgeInterpolationScheme<Type>> Foam::fac::scheme
     return edgeInterpolationScheme<Type>::New
     (
         mesh,
-        mesh.schemesDict().interpolationScheme(name)
+        mesh.interpolationScheme(name)
     );
 }
 

src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.C

@@ -57,8 +57,6 @@ void Foam::edgeInterpolation::clearOut()
 Foam::edgeInterpolation::edgeInterpolation(const faMesh& fam)
 :
     faMesh_(fam),
-    schemesDict_(fam()),
-    solutionDict_(fam()),
     lPN_(nullptr),
     weightingFactors_(nullptr),
     differenceFactors_(nullptr),
@@ -219,7 +217,7 @@ void Foam::edgeInterpolation::makeLPN() const
         (
             "lPN",
             faMesh_.time().constant(),
-            faMesh_.db(),
+            faMesh_(),
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false

src/finiteArea/interpolation/edgeInterpolation/edgeInterpolation.H

@@ -43,8 +43,6 @@ SourceFiles
 
 #include "tmp.H"
 #include "scalar.H"
-#include "faSchemes.H"
-#include "faSolution.H"
 #include "areaFieldsFwd.H"
 #include "edgeFieldsFwd.H"
 #include "className.H"
@@ -67,12 +65,6 @@ class edgeInterpolation
         // Reference to faMesh
         const faMesh& faMesh_;
 
-        //- Discretisation schemes
-        faSchemes schemesDict_;
-
-        //- Solver settings
-        faSolution solutionDict_;
-
 
         // Demand-driven data
 
@@ -153,30 +145,6 @@ public:
             return faMesh_;
         }
 
-        //- Return schemes
-        const faSchemes& schemesDict() const
-        {
-            return schemesDict_;
-        }
-
-        //- Return access to schemes
-        faSchemes& schemesDict()
-        {
-            return schemesDict_;
-        }
-
-        //- Return solver settings
-        const faSolution& solutionDict() const
-        {
-            return solutionDict_;
-        }
-
-        //- Return access to solver settings
-        faSolution& solutionDict()
-        {
-            return solutionDict_;
-        }
-
         //- Return reference to PN geodesic distance
         const edgeScalarField& lPN() const;