wip

exasim-project · Feb 4, 2025 · 3863273 · 3863273
1 parent 58c6946
commit 3863273
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/include/NeoFOAM/finiteVolume/cellCentred/operators/divOperator.hpp b/include/NeoFOAM/finiteVolume/cellCentred/operators/divOperator.hpp
@@ -77,7 +77,7 @@ class DivOperator : public dsl::OperatorMixin<VolumeField<scalar>>
     DivOperator(
         dsl::Operator::Type termType,
         const SurfaceField<scalar>& faceFlux,
-        VolumeField<scalar>& phi,
+        VolumeField<ValueType>& phi,
         Input input
     )
         : dsl::OperatorMixin<VolumeField<scalar>>(phi.exec(), phi, termType), faceFlux_(faceFlux),
@@ -86,7 +86,7 @@ class DivOperator : public dsl::OperatorMixin<VolumeField<scalar>>
     DivOperator(
         dsl::Operator::Type termType,
         const SurfaceField<scalar>& faceFlux,
-        VolumeField<scalar>& phi,
+        VolumeField<ValueType>& phi,
         std::unique_ptr<DivOperatorFactory> divOperatorStrategy
     )
         : dsl::OperatorMixin<VolumeField<scalar>>(phi.exec(), phi, termType), faceFlux_(faceFlux),

diff --git a/src/finiteVolume/cellCentred/operators/gaussGreenDiv.cpp b/src/finiteVolume/cellCentred/operators/gaussGreenDiv.cpp
@@ -84,7 +84,7 @@ void computeDiv(
     const SurfaceField<scalar>& faceFlux,
     const VolumeField<scalar>& phi,
     const SurfaceInterpolation& surfInterp,
-    VolumeField<ValueType>& divPhi
+    Field<ValueType>& divPhi
 )
 {
     const UnstructuredMesh& mesh = phi.mesh();
@@ -107,7 +107,7 @@ void computeDiv(
         faceFlux.internalField().span(),
         phif.internalField().span(),
         mesh.cellVolumes().span(),
-        divPhi.internalField().span()
+        divPhi.span()
     );
 }
 
@@ -120,6 +120,13 @@ GaussGreenDiv::GaussGreenDiv(
 void GaussGreenDiv::div(
     VolumeField<scalar>& divPhi, const SurfaceField<scalar>& faceFlux, VolumeField<scalar>& phi
 )
+{
+    computeDiv<scalar>(faceFlux, phi, surfaceInterpolation_, divPhi.internalField());
+};
+
+void GaussGreenDiv::div(
+    Field<scalar>& divPhi, const SurfaceField<scalar>& faceFlux, VolumeField<scalar>& phi
+)
 {
     computeDiv<scalar>(faceFlux, phi, surfaceInterpolation_, divPhi);
 };
@@ -131,7 +138,7 @@ GaussGreenDiv::div(const SurfaceField<scalar>& faceFlux, VolumeField<scalar>& ph
     VolumeField<scalar> divPhi(
         exec_, name, mesh_, createCalculatedBCs<VolumeBoundary<scalar>>(mesh_)
     );
-    computeDiv<scalar>(faceFlux, phi, surfaceInterpolation_, divPhi);
+    computeDiv<scalar>(faceFlux, phi, surfaceInterpolation_, divPhi.internalField());
     return divPhi;
 };