wip add vector field interpolation

exasim-project · Feb 8, 2025 · 3d577ff · 3d577ff
1 parent 3984dd2
commit 3d577ff
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 6 deletions.
diff --git a/include/NeoFOAM/finiteVolume/cellCentred/interpolation/linear.hpp b/include/NeoFOAM/finiteVolume/cellCentred/interpolation/linear.hpp
@@ -42,6 +42,16 @@ class Linear : public SurfaceInterpolationFactory::Register<Linear>
         SurfaceField<scalar>& surfaceField
     ) const override;
 
+    void interpolate(const VolumeField<Vector>& volField, SurfaceField<Vector>& surfaceField)
+        const override;
+
+    void interpolate(
+        const SurfaceField<scalar>& faceFlux,
+        const VolumeField<Vector>& volField,
+        SurfaceField<Vector>& surfaceField
+    ) const override;
+
+
     std::unique_ptr<SurfaceInterpolationFactory> clone() const override;
 
 private:

diff --git a/include/NeoFOAM/finiteVolume/cellCentred/interpolation/surfaceInterpolation.hpp b/include/NeoFOAM/finiteVolume/cellCentred/interpolation/surfaceInterpolation.hpp
@@ -18,8 +18,11 @@
 namespace NeoFOAM::finiteVolume::cellCentred
 {
 
+/* @class SurfaceInterpolationFactor
+**
+*/
 class SurfaceInterpolationFactory :
-    public NeoFOAM::RuntimeSelectionFactory<
+    public RuntimeSelectionFactory<
         SurfaceInterpolationFactory,
         Parameters<const Executor&, const UnstructuredMesh&, Input>>
 {
@@ -48,12 +51,21 @@ class SurfaceInterpolationFactory :
     virtual ~SurfaceInterpolationFactory() {} // Virtual destructor
 
     virtual void
-    interpolate(const VolumeField<scalar>& volField, ScalarSurfaceField& surfaceField) const = 0;
+    interpolate(const VolumeField<scalar>& volField, SurfaceField<scalar>& surfaceField) const = 0;
 
     virtual void interpolate(
         const ScalarSurfaceField& faceFlux,
         const VolumeField<scalar>& volField,
-        ScalarSurfaceField& surfaceField
+        SurfaceField<scalar>& surfaceField
+    ) const = 0;
+
+    virtual void
+    interpolate(const VolumeField<Vector>& volField, SurfaceField<Vector>& surfaceField) const = 0;
+
+    virtual void interpolate(
+        const ScalarSurfaceField& faceFlux,
+        const VolumeField<Vector>& volField,
+        SurfaceField<Vector>& surfaceField
     ) const = 0;
 
     // Pure virtual function for cloning

diff --git a/include/NeoFOAM/finiteVolume/cellCentred/interpolation/upwind.hpp b/include/NeoFOAM/finiteVolume/cellCentred/interpolation/upwind.hpp
@@ -38,6 +38,15 @@ class Upwind : public SurfaceInterpolationFactory::Register<Upwind>
         SurfaceField<scalar>& surfaceField
     ) const override;
 
+    void interpolate(const VolumeField<Vector>& volField, SurfaceField<Vector>& surfaceField)
+        const override;
+
+    void interpolate(
+        const SurfaceField<scalar>& faceFlux,
+        const VolumeField<Vector>& volField,
+        SurfaceField<Vector>& surfaceField
+    ) const override;
+
     std::unique_ptr<SurfaceInterpolationFactory> clone() const override;
 
 private:

diff --git a/src/finiteVolume/cellCentred/interpolation/linear.cpp b/src/finiteVolume/cellCentred/interpolation/linear.cpp
@@ -58,7 +58,8 @@ Linear::Linear(const Executor& exec, const UnstructuredMesh& mesh)
 void Linear::interpolate(const VolumeField<scalar>& volField, SurfaceField<scalar>& surfaceField)
     const
 {
-    computeLinearInterpolation(volField, geometryScheme_, surfaceField);
+    // FIXME:
+    // computeLinearInterpolation(volField, geometryScheme_, surfaceField);
 }
 
 void Linear::interpolate(
@@ -70,6 +71,23 @@ void Linear::interpolate(
     interpolate(volField, surfaceField);
 }
 
+void Linear::interpolate(const VolumeField<Vector>& volField, SurfaceField<Vector>& surfaceField)
+    const
+{
+    // FIXME:
+    // computeLinearInterpolation(volField, geometryScheme_, surfaceField);
+}
+
+void Linear::interpolate(
+    [[maybe_unused]] const SurfaceField<scalar>& faceFlux,
+    const VolumeField<Vector>& volField,
+    SurfaceField<Vector>& surfaceField
+) const
+{
+    interpolate(volField, surfaceField);
+}
+
+
 std::unique_ptr<SurfaceInterpolationFactory> Linear::clone() const
 {
     return std::make_unique<Linear>(*this);

diff --git a/src/finiteVolume/cellCentred/interpolation/upwind.cpp b/src/finiteVolume/cellCentred/interpolation/upwind.cpp
@@ -73,7 +73,26 @@ void Upwind::interpolate(
     SurfaceField<scalar>& surfaceField
 ) const
 {
-    computeUpwindInterpolation(faceFlux, volField, geometryScheme_, surfaceField);
+    // FIXME:
+    // computeUpwindInterpolation(faceFlux, volField, geometryScheme_, surfaceField);
+}
+
+void Upwind::interpolate(
+    [[maybe_unused]] const VolumeField<Vector>& volField,
+    [[maybe_unused]] SurfaceField<Vector>& surfaceField
+) const
+{
+    NF_ERROR_EXIT("limited scheme require a faceFlux");
+}
+
+void Upwind::interpolate(
+    const SurfaceField<scalar>& faceFlux,
+    const VolumeField<Vector>& volField,
+    SurfaceField<Vector>& surfaceField
+) const
+{
+    // FIXME:
+    // computeUpwindInterpolation(faceFlux, volField, geometryScheme_, surfaceField);
 }
 
 std::unique_ptr<SurfaceInterpolationFactory> Upwind::clone() const

diff --git a/test/finiteVolume/cellCentred/interpolation/linear.cpp b/test/finiteVolume/cellCentred/interpolation/linear.cpp
@@ -22,10 +22,12 @@ TEST_CASE("linear")
     );
 
     std::string execName = std::visit([](auto e) { return e.name(); }, exec);
-    auto mesh = NeoFOAM::createSingleCellMesh(exec);
+    auto mesh = NeoFOAM::create1DUniformMesh(exec, 10);
     NeoFOAM::Input input = NeoFOAM::TokenList({std::string("linear")});
     auto linear = SurfaceInterpolation(exec, mesh, input);
 
     auto in = VolumeField<NeoFOAM::scalar>(exec, "in", mesh, {});
     auto out = SurfaceField<NeoFOAM::scalar>(exec, "out", mesh, {});
+
+    linear.interpolate(in, out);
 }