update operators

exasim-project · Jul 17, 2024 · ed7284f · ed7284f
1 parent d6fcb17
commit ed7284f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 29 deletions.
diff --git a/NeoFOAM b/NeoFOAM
diff --git a/benchmarks/gradOperator/gradOperator.cpp b/benchmarks/gradOperator/gradOperator.cpp
@@ -34,7 +34,7 @@
 #include "NeoFOAM/core/executor/executor.hpp"
 #include "NeoFOAM/fields/field.hpp"
 #include "NeoFOAM/mesh/unstructured.hpp"
-#include "NeoFOAM/finiteVolume/operators/gaussGreenGrad.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/operators/gaussGreenGrad.hpp"
 
 #include "FoamAdapter/readers/foamMesh.hpp"
 #include "FoamAdapter/writers/writers.hpp"

diff --git a/benchmarks/scalarAdvection/scalarAdvection.cpp b/benchmarks/scalarAdvection/scalarAdvection.cpp
@@ -4,9 +4,9 @@
 #include "NeoFOAM/core/executor/executor.hpp"
 #include "NeoFOAM/fields/field.hpp"
 #include "NeoFOAM/mesh/unstructured.hpp"
-#include "NeoFOAM/finiteVolume/operators/gaussGreenDiv.hpp"
-#include "NeoFOAM/finiteVolume/operators/gaussGreenGrad.hpp"
-#include "NeoFOAM/finiteVolume/interpolation/surfaceInterpolation.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/operators/gaussGreenDiv.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/operators/gaussGreenGrad.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/interpolation/surfaceInterpolation.hpp"
 
 #define namespaceFoam // Suppress <using namespace Foam;>
 #include "fvCFD.H"
@@ -145,13 +145,13 @@ int main(int argc, char* argv[])
                 NeoFOAM::fill(neoDivT.internalField(), 0.0);
                 NeoFOAM::fill(neoDivT.boundaryField().value(), 0.0);
 
-                NeoFOAM::GaussGreenDiv(
+                fvcc::GaussGreenDiv(
                     exec,
                     uMesh,
-                    NeoFOAM::SurfaceInterpolation(
+                    fvcc::SurfaceInterpolation(
                         exec,
                         uMesh,
-                        NeoFOAM::SurfaceInterpolationFactory::create("upwind", exec, uMesh)
+                        fvcc::SurfaceInterpolationFactory::create("upwind", exec, uMesh)
                     )
                 )
                     .div(neoDivT, neoPhi, neoT);

diff --git a/test/test_geometricFields.cpp b/test/test_geometricFields.cpp
@@ -13,10 +13,10 @@
 #include "NeoFOAM/fields/domainField.hpp"
 #include "NeoFOAM/finiteVolume/cellCentred.hpp"
 
-#include "NeoFOAM/finiteVolume/operators/gaussGreenGrad.hpp"
-#include "NeoFOAM/finiteVolume/interpolation/linear.hpp"
-#include "NeoFOAM/finiteVolume/interpolation/upwind.hpp"
-#include "NeoFOAM/finiteVolume/interpolation/surfaceInterpolation.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/operators/gaussGreenGrad.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/interpolation/linear.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/interpolation/upwind.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/interpolation/surfaceInterpolation.hpp"
 
 #include "FoamAdapter/readers/foamMesh.hpp"
 #include "FoamAdapter/writers/writers.hpp"

diff --git a/test/test_operators.cpp b/test/test_operators.cpp
@@ -15,13 +15,11 @@
 #include "NeoFOAM/fields/domainField.hpp"
 #include "NeoFOAM/finiteVolume/cellCentred.hpp"
 
-#include "NeoFOAM/finiteVolume/operators/gaussGreenGrad.hpp"
-
-#include "NeoFOAM/finiteVolume/interpolation/linear.hpp"
-#include "NeoFOAM/finiteVolume/interpolation/upwind.hpp"
-#include "NeoFOAM/finiteVolume/interpolation/surfaceInterpolation.hpp"
-
-#include "NeoFOAM/finiteVolume/operators/gaussGreenDiv.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/interpolation/linear.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/interpolation/upwind.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/interpolation/surfaceInterpolation.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/operators/gaussGreenGrad.hpp"
+#include "NeoFOAM/finiteVolume/cellCentred/operators/gaussGreenDiv.hpp"
 
 #include "FoamAdapter/readers/foamMesh.hpp"
 #include "FoamAdapter/writers/writers.hpp"
@@ -139,9 +137,9 @@ TEST_CASE("Interpolation")
 
         SECTION("linear")
         {
-            auto linearKernel = NeoFOAM::SurfaceInterpolationFactory::create("linear", exec, uMesh);
+            auto linearKernel = fvcc::SurfaceInterpolationFactory::create("linear", exec, uMesh);
 
-            NeoFOAM::SurfaceInterpolation interp(exec, uMesh, std::move(linearKernel));
+            fvcc::SurfaceInterpolation interp(exec, uMesh, std::move(linearKernel));
             interp.interpolate(neoSurfT, neoT);
             auto s_neoSurfT = neoSurfT.internalField().copyToHost().span();
             std::span<Foam::scalar> surfT_span(surfT.primitiveFieldRef().data(), surfT.size());
@@ -213,7 +211,7 @@ TEST_CASE("GradOperator")
         fvcc::VolumeField<NeoFOAM::Vector> neoGradT = constructFrom(exec, uMesh, ofGradT);
         NeoFOAM::fill(neoGradT.internalField(), NeoFOAM::Vector(0.0, 0.0, 0.0));
         NeoFOAM::fill(neoGradT.boundaryField().value(), NeoFOAM::Vector(0.0, 0.0, 0.0));
-        NeoFOAM::gaussGreenGrad(exec, uMesh).grad(neoGradT, neoT);
+        fvcc::gaussGreenGrad(exec, uMesh).grad(neoGradT, neoT);
         Foam::Info << "writing gradT field for exector: " << exec_name << Foam::endl;
         write(neoGradT.internalField(), mesh, "gradT_" + exec_name);
 
@@ -307,12 +305,10 @@ TEST_CASE("DivOperator")
         fvcc::VolumeField<NeoFOAM::scalar> neoDivT = constructFrom(exec, uMesh, ofDivT);
         NeoFOAM::fill(neoDivT.internalField(), 0.0);
         NeoFOAM::fill(neoDivT.boundaryField().value(), 0.0);
-        NeoFOAM::GaussGreenDiv(
+        fvcc::GaussGreenDiv(
             exec,
             uMesh,
-            NeoFOAM::SurfaceInterpolation(
-                exec, uMesh, std::make_unique<NeoFOAM::Linear>(exec, uMesh)
-            )
+            fvcc::SurfaceInterpolation(exec, uMesh, std::make_unique<fvcc::Linear>(exec, uMesh))
         )
             .div(neoDivT, neoPhi, neoT);
         Foam::Info << "writing divT field for exector: " << exec_name << Foam::endl;

diff --git a/test/test_unstructuredMesh.cpp b/test/test_unstructuredMesh.cpp
@@ -373,8 +373,8 @@ TEST_CASE("fvccGeometryScheme")
     SECTION("BasicFvccGeometryScheme" + exec_name)
     {
         // update on construction
-        NeoFOAM::FvccGeometryScheme scheme(
-            exec, uMesh, std::make_unique<NeoFOAM::BasicFvccGeometryScheme>(uMesh)
+        NeoFOAM::GeometryScheme scheme(
+            exec, uMesh, std::make_unique<NeoFOAM::BasicGeometryScheme>(uMesh)
         );
         scheme.update(); // make sure it uptodate
         auto foam_weights = mesh.weights();
@@ -392,7 +392,7 @@ TEST_CASE("fvccGeometryScheme")
     SECTION("DefaultBasicFvccGeometryScheme" + exec_name)
     {
         // update on construction
-        NeoFOAM::FvccGeometryScheme scheme(uMesh);
+        NeoFOAM::GeometryScheme scheme(uMesh);
         scheme.update(); // make sure it uptodate
         auto foam_weights = mesh.weights();
+16 −1		include/NeoFOAM/finiteVolume/cellCentred/boundary/surfaceBoundaryFactory.hpp
+3 −16		include/NeoFOAM/finiteVolume/cellCentred/interpolation/linear.hpp
+11 −14		include/NeoFOAM/finiteVolume/cellCentred/interpolation/surfaceInterpolation.hpp
+3 −15		include/NeoFOAM/finiteVolume/cellCentred/interpolation/upwind.hpp
+36 −0		include/NeoFOAM/finiteVolume/cellCentred/operators/gaussGreenDiv.hpp
+34 −0		include/NeoFOAM/finiteVolume/cellCentred/operators/gaussGreenGrad.hpp
+0 −53		include/NeoFOAM/finiteVolume/operators/gaussGreenDiv.hpp
+0 −47		include/NeoFOAM/finiteVolume/operators/gaussGreenGrad.hpp
+3 −4		include/NeoFOAM/mesh/stencil/basicFvccGeometryScheme.hpp
+12 −29		include/NeoFOAM/mesh/stencil/fvccGeometryScheme.hpp
+7 −6		src/finiteVolume/cellCentred/interpolation/linear.cpp
+8 −7		src/finiteVolume/cellCentred/interpolation/upwind.cpp
+40 −44		src/finiteVolume/cellCentred/operators/gaussGreenDiv.cpp
+37 −42		src/finiteVolume/cellCentred/operators/gaussGreenGrad.cpp
+35 −35		src/mesh/stencil/basicFvccGeometryScheme.cpp
+31 −34		src/mesh/stencil/fvccGeometryScheme.cpp