fixed merge

Author: Kloepfer

.github/workflows/cmake.yml

@@ -129,4 +129,3 @@ jobs:
       # only need to scan with a single build config if the installed cmake config files work
       if: matrix.compiler == 'g++' && matrix.build_type == 'Release'
       uses: github/codeql-action/analyze@v3
-

.github/workflows/doxygen-gh-pages.yml

@@ -0,0 +1,91 @@
+name: Doxygen GitHub Pages Deploy Action
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-22.04
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+      
+      - name: Install dependencies
+        run: |
+              sudo apt update
+              sudo apt install g++ cmake doxygen
+
+      - name: Kokkos Checkout repo
+        uses: actions/checkout@v4
+        with:
+            repository: kokkos/kokkos
+            path: kokkos
+
+      - name: Kokkos Configure CMake
+        shell: bash
+        run: cmake -S $GITHUB_WORKSPACE/kokkos -B ${{runner.workspace}}/build-kokkos
+            -DCMAKE_CXX_COMPILER=g++
+            -DKokkos_ENABLE_SERIAL=ON 
+            -DKokkos_ENABLE_OPENMP=OFF
+            -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/build-kokkos/install
+
+      - name: Kokkos Build
+        shell: bash
+        run: cmake --build ${{runner.workspace}}/build-kokkos --parallel 2 --target install
+
+        ## Omegah
+      - name: Omega_h Checkout repo
+        uses: actions/checkout@v4
+        with:
+            repository: sandialabs/omega_h
+            path: omegah
+
+      - name: Omega_h Configure CMake
+        shell: bash
+        run: cmake -S $GITHUB_WORKSPACE/omegah -B ${{runner.workspace}}/build-omegah
+            -DCMAKE_BUILD_TYPE=Release
+            -DCMAKE_CXX_COMPILER=g++
+            -DBUILD_SHARED_LIBS=OFF
+            -DOmega_h_USE_Kokkos=ON
+            -DKokkos_PREFIX=${{runner.workspace}}/build-kokkos/install/lib/cmake
+            -DOmega_h_USE_MPI=OFF
+            -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/build-omegah/install
+
+      - name: Omega_h Build
+        shell: bash
+        run: cmake --build ${{runner.workspace}}/build-omegah --parallel 2 --target install
+    
+      ## MeshFields
+      - name: MeshFields Checkout repo
+        uses: actions/checkout@v4
+        with:
+            repository: SCOREC/meshFields
+            path: meshFields
+
+      - name: MeshFields Configure CMake
+        shell: bash
+        run: cmake -S $GITHUB_WORKSPACE/meshFields -B ${{runner.workspace}}/build-meshFields
+            -DCMAKE_CXX_COMPILER=g++
+            -DKokkos_ROOT=${{runner.workspace}}/build-kokkos/install
+            -DMeshFields_USE_Cabana=OFF
+            -DOmega_h_ROOT=${{runner.workspace}}/build-omegah/install
+            -DCMAKE_INSTALL_PREFIX=${{runner.workspace}}/build-meshFields/install
+      
+      - name: Generate Doc
+        run: doxygen ${{runner.workspace}}/build-meshFields/Doxyfile
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: ./docs/html
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/pr_comment_trigger_self_hosted.yml

@@ -13,7 +13,7 @@ jobs:
     permissions:
       contents: read
     # The type of runner that the job will run on
-    runs-on: self-hosted
+    runs-on: [self-hosted, linux, x64, gpu]
 
     if: |
       github.event.issue.pull_request &&

CMakeLists.txt

@@ -1,12 +1,13 @@
 cmake_minimum_required(VERSION 3.13.0)
 
-project(meshFields VERSION 0.1.0 LANGUAGES CXX)
+project(meshfields VERSION 0.1.0 LANGUAGES CXX)
 
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
 option(MeshFields_USE_Cabana "Build with the Cabana storage backend" OFF)
 
+find_package(Kokkos REQUIRED)
 find_package(Omega_h REQUIRED)
 #Clear the omegah compilation flags that it passes to cuda.  Using the
 # kokkos target, and nvcc_wrapper, provide sufficient flags.
@@ -17,11 +18,14 @@ if(MeshFields_USE_Cabana)
 endif()
 
 set(MESHFIELD_HEADERS
+  src/MeshField_Defines.hpp
   src/MeshField_Utility.hpp
   src/MeshField_Macros.hpp
   src/KokkosController.hpp
   src/MeshField_Element.hpp
+  src/MeshField_Integrate.hpp
   src/MeshField_Shape.hpp
+  src/MeshField_ShapeField.hpp
   src/MeshField_Fail.hpp
   src/MeshField_For.hpp
   src/MeshField_Reduce.hpp
@@ -40,17 +44,18 @@ set(MESHFIELD_SOURCES
   src/MeshField_Fail.cpp
 )
 
-add_library(meshFields ${MESHFIELD_SOURCES})
+add_library(meshfields ${MESHFIELD_SOURCES})
 
-target_compile_features(meshFields INTERFACE cxx_std_17)
-target_include_directories(meshFields
+target_compile_features(meshfields INTERFACE cxx_std_20)
+target_include_directories(meshfields
   PUBLIC
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>" # for MeshField_Config.hpp
   "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
   "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
-target_link_libraries(meshFields INTERFACE Omega_h::omega_h)
+target_link_libraries(meshfields INTERFACE Kokkos::kokkos)
+target_link_libraries(meshfields INTERFACE Omega_h::omega_h)
 if(Kokkos_ENABLE_CUDA)
-  target_compile_options(meshFields INTERFACE "--expt-relaxed-constexpr")
+  target_compile_options(meshfields INTERFACE "--expt-relaxed-constexpr")
 endif()
 
 #enable/disable exceptions
@@ -63,8 +68,8 @@ configure_file(
   "${CMAKE_CURRENT_BINARY_DIR}/MeshField_Config.hpp")
 
 if(MeshFields_USE_Cabana)
-  target_link_libraries(meshFields INTERFACE Cabana::Core)
-  target_compile_definitions(meshFields INTERFACE MESHFIELDS_ENABLE_CABANA)
+  target_link_libraries(meshfields INTERFACE Cabana::Core)
+  target_compile_definitions(meshfields INTERFACE MESHFIELDS_ENABLE_CABANA)
 endif()
 
 #support ctags
@@ -77,7 +82,7 @@ if(MeshFields_USE_CTAGS)
             --exclude=docs --exclude=cmake --exclude=.git
             --exclude=.github .
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
-  add_dependencies(meshFields tags)
+  add_dependencies(meshfields tags)
 endif()
 
 # Set options for doxygen documentation
@@ -152,15 +157,17 @@ endfunction()
 
 function(meshfields_add_exe EXE_NAME EXE_SRC)
   add_executable(${EXE_NAME} ${EXE_SRC})
-  target_link_libraries(${EXE_NAME} PRIVATE meshFields)
+  target_link_libraries(${EXE_NAME} PRIVATE meshfields)
 endfunction()
 
 # Creating minimal reproduction of error
 meshfields_add_exe(KokkosTests test/testKokkos.cpp)
 meshfields_add_exe(SerializationTests test/testSerialize.cpp)
 meshfields_add_exe(ElementTests test/testElement.cpp)
+meshfields_add_exe(ElementJacobian1d test/testElementJacobian1d.cpp)
+meshfields_add_exe(ElementJacobian2d test/testElementJacobian2d.cpp)
+meshfields_add_exe(CountIntegrator test/testCountIntegrator.cpp)
 meshfields_add_exe(OmegahElementTests test/testOmegahElement.cpp)
-meshfields_add_exe(OmegahCoordFieldTest test/testOmegahCoordField.cpp)
 meshfields_add_exe(ExceptionTest test/testExceptions.cpp)
 
 if(MeshFields_USE_Cabana)
@@ -173,8 +180,10 @@ endif()
 test_func(KokkosTests ./KokkosTests)
 test_func(SerializationTests ./SerializationTests)
 test_func(ElementTests ./ElementTests)
+test_func(ElementJacobian1d ./ElementJacobian1d)
+test_func(ElementJacobian2d ./ElementJacobian2d)
+test_func(CountIntegrator ./CountIntegrator)
 test_func(OmegahElementTests ./OmegahElementTests)
-test_func(OmegahCoordFieldTest ./OmegahCoordFieldTest)
 if(MeshFields_USE_EXCEPTIONS)
   # exception caught - no error
   test_func(ExceptionTest ./ExceptionTest)
@@ -184,8 +193,8 @@ endif()
 
 #Code Coverage set up -------------------------------------------------------
 
-option(meshFields_ENABLE_COVERAGE_BUILD "Do a coverage build" OFF)
-if(meshFields_ENABLE_COVERAGE_BUILD)
+option(meshfields_ENABLE_COVERAGE_BUILD "Do a coverage build" OFF)
+if(meshfields_ENABLE_COVERAGE_BUILD)
 
   list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
   include(CodeCoverage)
@@ -228,10 +237,10 @@ endif()
 
 
 ## export the library
-set_target_properties(meshFields PROPERTIES PUBLIC_HEADER "${MESHFIELD_HEADERS}")
+set_target_properties(meshfields PROPERTIES PUBLIC_HEADER "${MESHFIELD_HEADERS}")
 install(
-  TARGETS meshFields
-  EXPORT meshFields-targets
+  TARGETS meshfields
+  EXPORT meshfields-targets
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -241,7 +250,7 @@ install(
 configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/meshfields-config.cmake"
-  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/meshFields
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/meshfields
 )
 write_basic_package_version_file(
   "${PROJECT_BINARY_DIR}/meshfields-config-version.cmake"
@@ -250,9 +259,9 @@ write_basic_package_version_file(
 install(FILES
   "${PROJECT_BINARY_DIR}/meshfields-config.cmake"
   "${PROJECT_BINARY_DIR}/meshfields-config-version.cmake"
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/meshFields)
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/meshfields)
 
 install(
-  EXPORT meshFields-targets
-  NAMESPACE meshFields::
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/meshFields)
+  EXPORT meshfields-targets
+  NAMESPACE meshfields::
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/meshfields)

config.cmake.in

@@ -1,11 +1,13 @@
 @PACKAGE_INIT@
 
-include("${CMAKE_CURRENT_LIST_DIR}/meshFields-targets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/meshfields-targets.cmake")
 
-check_required_components(meshFields)
+check_required_components(meshfields)
 
 include(CMakeFindDependencyMacro)
 
 find_dependency(Omega_h)
-find_dependency(Cabana)
+if (MeshFields_USE_Cabana)
+  find_dependency(Cabana)
+endif()
 

src/MeshField.hpp

@@ -38,7 +38,8 @@ template <typename ExecutionSpace,
           size_t dim>
 decltype(MeshField::CreateCoordinateField<ExecutionSpace, Controller, dim>(
     MeshField::MeshInfo()))
-createCoordinateField(MeshField::MeshInfo mesh_info, Omega_h::Reals coords) {
+createCoordinateField(const MeshField::MeshInfo &mesh_info,
+                      Omega_h::Reals coords) {
   const auto meshDim = mesh_info.dim;
   auto coordField =
       MeshField::CreateCoordinateField<ExecutionSpace, Controller, dim>(
@@ -52,6 +53,11 @@ createCoordinateField(MeshField::MeshInfo mesh_info, Omega_h::Reals coords) {
   return coordField;
 }
 
+} // anonymous namespace
+
+namespace MeshField {
+
+namespace Omegah {
 struct LinearTriangleToVertexField {
   Omega_h::LOs triVerts;
   LinearTriangleToVertexField(Omega_h::Mesh &mesh)
@@ -162,9 +168,7 @@ template <int ShapeOrder> auto getTriangleElement(Omega_h::Mesh &mesh) {
   }
 }
 
-} // namespace
-
-namespace MeshField {
+} // namespace Omegah
 
 template <typename ExecutionSpace,
           template <typename...> typename Controller =
@@ -216,9 +220,9 @@ class OmegahMeshField {
   }
 
   // evaluate a field at the specified local coordinate for each triangle
-  template <typename AnalyticFunction, typename ViewType, typename ShapeField>
+  template <typename ViewType, typename ShapeField>
   auto triangleLocalPointEval(ViewType localCoords, size_t NumPtsPerElem,
-                              AnalyticFunction func, ShapeField field) {
+                              ShapeField field) {
     const auto MeshDim = 2;
     if (mesh.dim() != MeshDim) {
       MeshField::fail("input mesh must be 2d\n");
@@ -228,7 +232,7 @@ class OmegahMeshField {
       MeshField::fail("input field order must be 1 or 2\n");
     }
 
-    const auto [shp, map] = getTriangleElement<ShapeOrder>(mesh);
+    const auto [shp, map] = Omegah::getTriangleElement<ShapeOrder>(mesh);
 
     MeshField::FieldElement f(meshInfo.numTri, field, shp, map);
     auto offsets = createOffsets(meshInfo.numTri, NumPtsPerElem);