all test run: update headers and class names

CMakeLists.txt

@@ -10,7 +10,7 @@ project(
   DESCRIPTION "An implementation of FOAM")
 
 set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 
 # Add the cmake folder so the find_package command finds custom packages
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
@@ -24,4 +24,4 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 add_subdirectory(NeoFOAM)
 add_subdirectory(src)
-
+add_subdirectory(test)

applications/test_treeAMR/CMakeLists.txt

@@ -5,18 +5,15 @@ add_executable(test_treeAMR "test_treeAMR.cpp")
 find_package(MPI REQUIRED)
 find_package(ZLIB REQUIRED)
 
-set_target_properties(test_treeAMR PROPERTIES CXX_STANDARD 17)
+set_target_properties(test_treeAMR PROPERTIES CXX_STANDARD 20)
 
-# target_compile_definitions(test_treeAMR PUBLIC WM_LABEL_SIZE=32 NoRepository WM_DP OPENFOAM=2306 OMPI_SKIP_MPICXX)
+# target_compile_definitions(test_treeAMR PUBLIC WM_LABEL_SIZE=32 NoRepository WM_DP OPENFOAM=2306
+# OMPI_SKIP_MPICXX)
 
 target_include_directories(
-test_treeAMR
- SYSTEM
-  PUBLIC ${CMAKE_SOURCE_DIR}/FoamAdapter/include
-         ${CMAKE_SOURCE_DIR}/NeoFOAM/include
-         ${MPI_INCLUDE_PATH}
-         ${ZLIB_INCLUDE_DIRS}
-         ${CMAKE_SOURCE_DIR}/include
+  test_treeAMR SYSTEM
+  PUBLIC ${CMAKE_SOURCE_DIR}/FoamAdapter/include ${CMAKE_SOURCE_DIR}/NeoFOAM/include
+         ${MPI_INCLUDE_PATH} ${ZLIB_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include
          ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(
@@ -29,6 +26,4 @@ target_link_libraries(
          Kokkos::kokkos
          ${ZLIB_LIBRARIES})
 
-
 install(TARGETS test_treeAMR DESTINATION bin)
-

benchmarks/explicitOperators/CMakeLists.txt

@@ -3,7 +3,7 @@
 
 add_executable(explicitOperators "explicitOperators.cpp")
 
-set_target_properties(explicitOperators PROPERTIES CXX_STANDARD 17)
+set_target_properties(explicitOperators PROPERTIES CXX_STANDARD 20)
 target_compile_definitions(explicitOperators PUBLIC WM_LABEL_SIZE=32 NoRepository WM_DP
                                                     OPENFOAM=2306 OMPI_SKIP_MPICXX)
 

benchmarks/gradOperator/CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-FileCopyrightText: 2023 NeoFOAM authors
 add_executable(gradOperator "gradOperator.cpp")
 
-set_target_properties(gradOperator PROPERTIES CXX_STANDARD 17)
+set_target_properties(gradOperator PROPERTIES CXX_STANDARD 20)
 
 target_compile_definitions(gradOperator PUBLIC WM_LABEL_SIZE=32 NoRepository WM_DP OPENFOAM=2306
                                                OMPI_SKIP_MPICXX)

benchmarks/gradOperator/gradOperator.cpp

@@ -46,7 +46,7 @@ template<typename T>
 void print_field(NeoFOAM::Field<T> a)
 {
     std::cout << "a has a size of: " << a.size() << std::endl;
-    auto tmp_view = a.copyToHost().field();
+    auto tmp_view = a.copyToHost().span();
     for (int i = 0; i < a.size(); i++)
     {
         std::cout << "tmp_view: " << tmp_view[i] << " at: " << i << std::endl;
@@ -56,7 +56,7 @@ template<>
 void print_field(NeoFOAM::Field<NeoFOAM::Vector> a)
 {
     std::cout << "a has a size of: " << a.size() << std::endl;
-    auto tmp_view = a.copyToHost().field();
+    auto tmp_view = a.copyToHost().span();
     for (int i = 0; i < a.size(); i++)
     {
         std::cout << "tmp_view: " << tmp_view[i](0) << " " << tmp_view[i](1) << " "
@@ -95,7 +95,7 @@ int main(int argc, char* argv[])
         {
             NeoFOAM::Executor exec = NeoFOAM::GPUExecutor();
             Foam::Info << "reading mesh" << Foam::endl;
-            NeoFOAM::unstructuredMesh uMesh = readOpenFOAMMesh(exec, mesh);
+            NeoFOAM::UnstructuredMesh uMesh = readOpenFOAMMesh(exec, mesh);
 
             NeoFOAM::scalarField Temperature(exec, T.internalField().size());
             Temperature.apply(KOKKOS_LAMBDA(int i) { return i; });
@@ -113,7 +113,7 @@ int main(int argc, char* argv[])
         {
             NeoFOAM::Executor exec = NeoFOAM::CPUExecutor();
             Foam::Info << "reading mesh" << Foam::endl;
-            NeoFOAM::unstructuredMesh uMesh = readOpenFOAMMesh(exec, mesh);
+            NeoFOAM::UnstructuredMesh uMesh = readOpenFOAMMesh(exec, mesh);
 
             NeoFOAM::scalarField Temperature(exec, T.internalField().size());
             Temperature.apply(KOKKOS_LAMBDA(int i) { return i; });
@@ -131,7 +131,7 @@ int main(int argc, char* argv[])
         {
             NeoFOAM::Executor exec = NeoFOAM::OMPExecutor();
             Foam::Info << "reading mesh" << Foam::endl;
-            NeoFOAM::unstructuredMesh uMesh = readOpenFOAMMesh(exec, mesh);
+            NeoFOAM::UnstructuredMesh uMesh = readOpenFOAMMesh(exec, mesh);
 
             NeoFOAM::scalarField Temperature(exec, T.internalField().size());
             Temperature.apply(KOKKOS_LAMBDA(int i) { return i; });

benchmarks/matrixAssembly/CMakeLists.txt

@@ -3,7 +3,7 @@
 
 add_executable(matrixAssembly "matrixAssembly.cpp")
 
-set_target_properties(matrixAssembly PROPERTIES CXX_STANDARD 17)
+set_target_properties(matrixAssembly PROPERTIES CXX_STANDARD 20)
 
 target_compile_definitions(matrixAssembly PUBLIC WM_LABEL_SIZE=32 NoRepository WM_DP OPENFOAM=2306
                                                  OMPI_SKIP_MPICXX)

benchmarks/scalarAdvection/NeoFoamScalarAdvection.cpp

@@ -6,7 +6,7 @@
 #include "NeoFOAM/mesh/unstructuredMesh/unstructuredMesh.hpp"
 #include "NeoFOAM/cellCentredFiniteVolume/grad/gaussGreenGrad.hpp"
 #include "NeoFOAM/cellCentredFiniteVolume/div/gaussGreenDiv.hpp"
-#include "NeoFOAM/cellCentredFiniteVolume/surfaceInterpolation/surfaceInterpolationSelector.hpp"
+#include "NeoFOAM/finiteVolume/interpolation/surfaceInterpolationSelector.hpp"
 
 #define namespaceFoam // Suppress <using namespace Foam;>
 #include "fvCFD.H"
@@ -52,8 +52,8 @@ int main(int argc, char* argv[])
         T.write();
         // creating neofoam fields
         Foam::Info << "creating neofoam mesh" << Foam::endl;
-        NeoFOAM::unstructuredMesh uMesh = Foam::readOpenFOAMMesh(exec, mesh);
-        NeoFOAM::fvccVolField<NeoFOAM::scalar> neoT = Foam::constructFrom(exec, uMesh, T);
+        NeoFOAM::UnstructuredMesh uMesh = Foam::readOpenFOAMMesh(exec, mesh);
+        fvcc::VolumeField<NeoFOAM::scalar> neoT = Foam::constructFrom(exec, uMesh, T);
         neoT.correctBoundaryConditions();
 
         NeoFOAM::fvccSurfaceField<NeoFOAM::scalar> neoPhi = constructSurfaceField(exec, uMesh, phi);
@@ -88,7 +88,7 @@ int main(int argc, char* argv[])
 
         Foam::volScalarField ofDivT("ofDivT", Foam::fvc::div(phi, T));
 
-        NeoFOAM::fvccVolField<NeoFOAM::scalar> neoDivT = constructFrom(exec, uMesh, ofDivT);
+        fvcc::VolumeField<NeoFOAM::scalar> neoDivT = constructFrom(exec, uMesh, ofDivT);
         NeoFOAM::fill(neoDivT.internalField(), 0.0);
         NeoFOAM::fill(neoDivT.boundaryField().value(), 0.0);
 
@@ -134,8 +134,8 @@ int main(int argc, char* argv[])
                 // neoT.internalField() = neoT.internalField() - neoDivT.internalField() *
                 // runTime.deltaT().value();
                 double dt = runTime.deltaT().value();
-                auto s_neoT = neoT.internalField().field();
-                auto s_neoDivT = neoDivT.internalField().field();
+                auto s_neoT = neoT.internalField().span();
+                auto s_neoDivT = neoDivT.internalField().span();
                 neoT.internalField().apply(KOKKOS_LAMBDA(const int celli) {
                     return s_neoT[celli] + dt * s_neoDivT[celli];
                 });

benchmarks/scalarAdvection/scalarAdvection.cpp

@@ -6,7 +6,7 @@
 #include "NeoFOAM/mesh/unstructuredMesh/unstructuredMesh.hpp"
 #include "NeoFOAM/cellCentredFiniteVolume/grad/gaussGreenGrad.hpp"
 #include "NeoFOAM/cellCentredFiniteVolume/div/gaussGreenDiv.hpp"
-#include "NeoFOAM/cellCentredFiniteVolume/surfaceInterpolation/surfaceInterpolationSelector.hpp"
+#include "NeoFOAM/finiteVolume/interpolation/surfaceInterpolationSelector.hpp"
 
 #define namespaceFoam // Suppress <using namespace Foam;>
 #include "fvCFD.H"
@@ -52,12 +52,12 @@ int main(int argc, char* argv[])
         T.write();
         // creating neofoam fields
         Foam::Info << "creating neofoam mesh" << Foam::endl;
-        NeoFOAM::unstructuredMesh uMesh = Foam::readOpenFOAMMesh(exec, mesh);
-        NeoFOAM::fvccVolField<NeoFOAM::scalar> neoT = Foam::constructFrom(exec, uMesh, T);
+        NeoFOAM::UnstructuredMesh uMesh = Foam::readOpenFOAMMesh(exec, mesh);
+        fvcc::VolumeField<NeoFOAM::scalar> neoT = Foam::constructFrom(exec, uMesh, T);
         neoT.correctBoundaryConditions();
-        // NeoFOAM::fvccVolField<NeoFOAM::Vector> neoU = constructFrom(exec, uMesh, U);
+        // fvcc::VolumeField<NeoFOAM::Vector> neoU = constructFrom(exec, uMesh, U);
 
-        // auto s_cc = uMesh.cellCentres().field();
+        // auto s_cc = uMesh.cellCentres().span();
         // neoT.internalField().apply(KOKKOS_LAMBDA(int celli)
         // {
         //     return std::exp(-0.5 * (std::pow((s_cc[celli][0] - 0.5) / spread, 2.0) +
@@ -100,7 +100,7 @@ int main(int argc, char* argv[])
 
         Foam::volScalarField ofDivT("ofDivT", Foam::fvc::div(phi, T));
 
-        NeoFOAM::fvccVolField<NeoFOAM::scalar> neoDivT = constructFrom(exec, uMesh, ofDivT);
+        fvcc::VolumeField<NeoFOAM::scalar> neoDivT = constructFrom(exec, uMesh, ofDivT);
         NeoFOAM::fill(neoDivT.internalField(), 0.0);
         NeoFOAM::fill(neoDivT.boundaryField().value(), 0.0);
 

include/FoamAdapter/comparison/fieldComparison.hpp

@@ -5,19 +5,21 @@
 #include "Field.H"
 #include "FoamAdapter/conversion/convert.hpp"
 #include "FoamAdapter/conversion/type_conversion.hpp"
-#include "NeoFOAM/fields/Field.hpp"
-#include "NeoFOAM/primitives/label.hpp"
+#include "NeoFOAM/fields/field.hpp"
+#include "NeoFOAM/core/primitives/label.hpp"
 #include "surfaceFields.H"
 #include "volFields.H"
 #include <span>
 
 namespace Foam
 {
 
+namespace fvcc = NeoFOAM::finiteVolume::cellCentred;
+
 #define FIELD_EQUALITY_OPERATOR(NFIELD_TYPE, FFIELD_TYPE)                                          \
     bool operator==(NeoFOAM::Field<NFIELD_TYPE>& nfield, const Foam::Field<FFIELD_TYPE>& ffield)   \
     {                                                                                              \
-        auto hostSpan = nfield.copyToHost().field();                                               \
+        auto hostSpan = nfield.copyToHost().span();                                                \
                                                                                                    \
         for (int i = 0; i < hostSpan.size(); i++)                                                  \
         {                                                                                          \
@@ -34,11 +36,11 @@ FIELD_EQUALITY_OPERATOR(NeoFOAM::Vector, Foam::vector)
 
 #define VOLGEOFIELD_EQUALITY_OPERATOR(NFIELD_TYPE, FFIELD_TYPE)                                    \
     bool operator==(                                                                               \
-        NeoFOAM::fvccVolField<NFIELD_TYPE>& nfield,                                                \
+        fvcc::VolumeField<NFIELD_TYPE>& nfield,                                                    \
         const Foam::GeometricField<FFIELD_TYPE, Foam::fvPatchField, Foam::volMesh>& ffield         \
     )                                                                                              \
     {                                                                                              \
-        auto hostSpan = nfield.internalField().copyToHost().field();                               \
+        auto hostSpan = nfield.internalField().copyToHost().span();                                \
         const auto& internalFField = ffield.internalField();                                       \
         /* compare internalField*/                                                                 \
         for (int i = 0; i < hostSpan.size(); i++)                                                  \
@@ -51,7 +53,7 @@ FIELD_EQUALITY_OPERATOR(NeoFOAM::Vector, Foam::vector)
         /* compare boundaryField */                                                                \
         /* NeoFOAM boundaries are stored in contiguous memory */                                   \
         /* whereas OpenFOAM boundaries are stored in a vector of patches */                        \
-        auto patchValueSpan = nfield.boundaryField().value().copyToHost().field();                 \
+        auto patchValueSpan = nfield.boundaryField().value().copyToHost().span();                  \
         NeoFOAM::label pFacei = 0;                                                                 \
         for (const auto& patch : ffield.boundaryField())                                           \
         {                                                                                          \
@@ -74,11 +76,11 @@ VOLGEOFIELD_EQUALITY_OPERATOR(NeoFOAM::Vector, Foam::vector)
 
 #define SURFGEOFIELD_EQUALITY_OPERATOR(NFIELD_TYPE, FFIELD_TYPE)                                   \
     bool operator==(                                                                               \
-        NeoFOAM::fvccSurfaceField<NFIELD_TYPE>& nfield,                                            \
+        fvcc::SurfaceField<NFIELD_TYPE>& nfield,                                                   \
         const Foam::GeometricField<FFIELD_TYPE, Foam::fvsPatchField, Foam::surfaceMesh>& ffield    \
     )                                                                                              \
     {                                                                                              \
-        auto hostSpan = nfield.internalField().copyToHost().field();                               \
+        auto hostSpan = nfield.internalField().copyToHost().span();                                \
         const auto& internalFField = ffield.internalField();                                       \
         /* compare internalField the fvccSurfaceField contains the boundaryValues                  \
          */                                                                                        \

include/FoamAdapter/fvcc/mesh/fvccNeoMesh.hpp

@@ -75,7 +75,7 @@ class fvccNeoMesh : public Foam::fvMesh
     virtual ~fvccNeoMesh() = default;
 
     NeoFOAM::UnstructuredMesh& uMesh() { return uMesh_; }
-    // const NeoFOAM::unstructuredMesh &uMesh() { return uMesh_; } const
+    // const NeoFOAM::UnstructuredMesh &uMesh() { return uMesh_; } const
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

include/FoamAdapter/readers/foamFields.hpp

@@ -70,7 +70,18 @@ auto readVolBoundaryConditions(const NeoFOAM::UnstructuredMesh& uMesh, const Foa
         Foam::word type = patchDict.get<Foam::word>("type");
         NeoFOAM::Dictionary neoPatchDict;
         neoPatchDict.insert("type", std::string(type));
-        bcs.push_back(VolumeBoundary<type_primitive_t>(uMesh, patchi, neoPatchDict));
+        if (type == "zeroGradient")
+        {
+            neoPatchDict.insert("type", std::string("fixedGradient"));
+            neoPatchDict.insert("fixedGradient", type_primitive_t {});
+        }
+        if (type == "extrapolatedCalculated")
+        {
+            neoPatchDict.insert("type", std::string("calculated"));
+        }
+        bcs.push_back(
+            std::make_unique<fvcc::VolumeBoundary<type_primitive_t>>(uMesh, neoPatchDict, patchi)
+        );
         patchi++;
     }
     return bcs;
@@ -117,9 +128,11 @@ auto readSurfaceBoundaryConditions(
         Foam::dictionary patchDict = bDict.subDict(bName);
         Foam::Info << "Boundary type: " << patchDict.get<Foam::word>("type") << Foam::endl;
         Foam::word type = patchDict.get<Foam::word>("type");
-        NeoFOAM::Dictionary npatchDict;
-        npatchDict.insert("type", std::string(type));
-        bcs.push_back(SurfaceBoundary<type_primitive_t>(uMesh, patchi, npatchDict));
+        NeoFOAM::Dictionary neoPatchDict;
+        neoPatchDict.insert("type", std::string(type));
+        bcs.push_back(
+            std::make_unique<fvcc::SurfaceBoundary<type_primitive_t>>(uMesh, neoPatchDict, patchi)
+        );
         patchi++;
     }
     return bcs;

include/FoamAdapter/writers/writers.hpp

@@ -3,7 +3,7 @@
 #pragma once
 
 #include "FoamAdapter/conversion/convert.hpp"
-#include "NeoFOAM/fields/FieldTypeDefs.hpp"
+#include "NeoFOAM/fields/field.hpp"
 #include "fvMesh.H"
 #include "volFields.H"
 
@@ -16,7 +16,7 @@ void write(NeoFOAM::scalarField& sf, const Foam::fvMesh& mesh, const std::string
     if (field)
     {
         // field is already present and needs to be updated
-        auto sf_host = sf.copyToHost().field();
+        auto sf_host = sf.copyToHost().span();
         Foam::scalarField& field_ref = field->ref();
         for (int i = 0; i < field_ref.size(); i++)
         {
@@ -37,7 +37,7 @@ void write(NeoFOAM::scalarField& sf, const Foam::fvMesh& mesh, const std::string
             mesh,
             Foam::dimensionedScalar(Foam::dimless, 0)
         );
-        auto sf_host = sf.copyToHost().field();
+        auto sf_host = sf.copyToHost().span();
         Foam::scalarField& field_ref = foamField.ref();
         for (int i = 0; i < field_ref.size(); i++)
         {
@@ -53,7 +53,7 @@ void write(NeoFOAM::vectorField& sf, const Foam::fvMesh& mesh, const std::string
     if (field)
     {
         // field is already present and needs to be updated
-        auto sf_host = sf.copyToHost().field();
+        auto sf_host = sf.copyToHost().span();
         Foam::vectorField& field_ref = field->ref();
         for (int i = 0; i < field_ref.size(); i++)
         {
@@ -74,7 +74,7 @@ void write(NeoFOAM::vectorField& sf, const Foam::fvMesh& mesh, const std::string
             mesh,
             Foam::dimensionedVector(Foam::dimless, Foam::Zero)
         );
-        auto sf_host = sf.copyToHost().field();
+        auto sf_host = sf.copyToHost().span();
         Foam::vectorField& field_ref = foamField.ref();
         for (int i = 0; i < field_ref.size(); i++)
         {

test/CMakeLists.txt

@@ -3,6 +3,13 @@
 
 list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
 
+FetchContent_Declare(
+  Catch2
+  GIT_REPOSITORY https://github.com/catchorg/Catch2.git
+  GIT_TAG v3.4.0 # or a later release
+)
+FetchContent_MakeAvailable(Catch2)
+
 add_executable(test_geometricFields "test_geometricFields.cpp")
 set_target_properties(test_geometricFields PROPERTIES CXX_STANDARD 20)