Merge pull request #180 from joyal-mathew/simplified-fields

Simplified fields

Author: jacobmerson

.git-blame-ignore-revs

@@ -3,3 +3,5 @@
 c726b259409b93e0a6df12d199f87eab8caa10db
 # reformat w clang format
 88dc8509543b34140a6015e361888644c5f5e0fe
+# reformat simplified-fields
+d521b8ce2e0d510d7472d2ac011cfc84b670f918

.github/workflows/cmake-test.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   test-build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     timeout-minutes: 30
 
     defaults:
@@ -39,6 +39,9 @@ jobs:
     - name: Install mpi
       run: sudo apt-get install -yq mpich
 
+    - name: Install cmake
+      run: sudo apt-get install -yq cmake
+
     - uses: actions/checkout@v4
 
     - name: build Catch2
@@ -169,14 +172,14 @@ jobs:
         repo-path: 'SCOREC/pcms'
         repo-ref: ''
         cache: false
-        options: '-DCMAKE_BUILD_TYPE=Release
+        options: '-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
                   -DCMAKE_C_COMPILER=`which mpicc`
                   -DCMAKE_CXX_COMPILER=`which mpicxx`
                   -DCMAKE_Fortran_COMPILER=`which mpifort`
                   -DPCMS_TIMEOUT=5
                   -DCatch2_DIR=${{ runner.temp }}/build-Catch2/install/lib/cmake/Catch2
                   -DOmega_h_DIR=${{ runner.temp }}/build-omega_h/install/lib/cmake/Omega_h
-                  -DmeshFields_DIR=${{ runner.temp }}/build-meshFields/install/lib/cmake/meshFields
+                  -Dmeshfields_DIR=${{ runner.temp }}/build-meshFields/install/lib/cmake/meshfields
                   -Dredev_DIR=${{ runner.temp }}/build-redev/install/lib/cmake/redev
                   -Dflcl_DIR=${{ runner.temp }}/build-kokkos-fortran-interop/install/lib/cmake/flcl
                   -DMPIEXEC_EXECUTABLE=`which mpirun`
@@ -206,13 +209,14 @@ jobs:
       if: matrix.clang_tidy == 'ON'
       run : |
         mkdir ${{ runner.temp }}/build-pcms
-        cmake -S . -B ${{ runner.temp }}/build-pcms -DCMAKE_BUILD_TYPE=Release \
+        cmake -S . -B ${{ runner.temp }}/build-pcms -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
                   -DCMAKE_C_COMPILER=mpicc \
                   -DCMAKE_CXX_COMPILER=mpicxx \
                   -DCMAKE_Fortran_COMPILER=mpifort \
                   -DPCMS_TIMEOUT=5 \
                   -DCatch2_DIR=${{ runner.temp }}/build-Catch2/install/lib/cmake/Catch2 \
                   -DOmega_h_DIR=${{ runner.temp }}/build-omega_h/install/lib/cmake/Omega_h \
+                  -Dmeshfields_DIR=${{ runner.temp }}/build-meshFields/install/lib/cmake/meshfields \
                   -Dredev_DIR=${{ runner.temp }}/build-redev/install/lib/cmake/redev \
                   -Dflcl_DIR=${{ runner.temp }}/build-kokkos-fortran-interop/install/lib/cmake/flcl \
                   -DMPIEXEC_EXECUTABLE=mpirun \

CMakeLists.txt

@@ -61,6 +61,8 @@ endif()
 find_package(ADIOS2 CONFIG 2.5 REQUIRED)
 find_package(Kokkos CONFIG 4.5 REQUIRED)
 
+find_package(meshfields REQUIRED)
+
 add_subdirectory(src)
 
 include(CTest)

src/CMakeLists.txt

@@ -9,7 +9,9 @@ set(PCMS_HEADERS
     pcms/coordinate_systems.h
     pcms/coordinate_transform.h
     pcms/field.h
+    pcms/create_field.h
     pcms/field_communicator.h
+    pcms/field_communicator2.h
     pcms/field_evaluation_methods.h
     pcms/memory_spaces.h
     pcms/types.h
@@ -18,10 +20,25 @@ set(PCMS_HEADERS
     pcms/profile.h
     pcms/print.h
     pcms/partition.h
-    pcms/coupler.h)
+    pcms/coupler.h
+    pcms/coordinate_system.h
+    pcms/field_layout.h
+    pcms/adapter/point_cloud/point_cloud_layout.h
+    pcms/adapter/point_cloud/point_cloud.h
+    pcms/adapter/omega_h/omega_h_field_layout.h
+    pcms/adapter/omega_h/omega_h_field2.h)
 
-set(PCMS_SOURCES pcms.cpp pcms/assert.cpp pcms/print.cpp
-                 pcms/adapter/xgc/xgc_field_adapter.h)
+set(PCMS_SOURCES
+    pcms.cpp
+    pcms/assert.cpp
+    pcms/print.cpp
+    pcms/create_field.cpp
+    pcms/adapter/xgc/xgc_field_adapter.h
+    pcms/adapter/point_cloud/point_cloud_layout.cpp
+    pcms/adapter/point_cloud/point_cloud.cpp
+    pcms/adapter/omega_h/omega_h_field_layout.cpp
+    pcms/adapter/omega_h/omega_h_field2.cpp
+    pcms/adapter/xgc/xgc_field_adapter.h)
 
 configure_file(pcms/version.h.in pcms/version.h)
 
@@ -31,8 +48,14 @@ if(PCMS_ENABLE_XGC)
 endif()
 if(PCMS_ENABLE_OMEGA_H)
   list(APPEND PCMS_SOURCES pcms/point_search.cpp)
-  list(APPEND PCMS_HEADERS pcms/adapter/omega_h/omega_h_field.h
-       pcms/transfer_field.h pcms/uniform_grid.h pcms/point_search.h)
+  list(
+    APPEND
+    PCMS_HEADERS
+    pcms/adapter/omega_h/omega_h_field.h
+    pcms/transfer_field.h
+    pcms/transfer_field2.h
+    pcms/uniform_grid.h
+    pcms/point_search.h)
 endif()
 
 find_package(Kokkos REQUIRED)
@@ -43,8 +66,8 @@ set_target_properties(pcms_core PROPERTIES OUTPUT_NAME pcmscore EXPORT_NAME
                                                                 core)
 add_library(pcms::core ALIAS pcms_core)
 target_compile_features(pcms_core PUBLIC cxx_std_17)
-target_link_libraries(pcms_core PUBLIC redev::redev MPI::MPI_CXX Kokkos::kokkos
-                                       perfstubs)
+target_link_libraries(pcms_core PUBLIC meshfields::meshfields redev::redev
+                                       MPI::MPI_CXX Kokkos::kokkos perfstubs)
 if(PCMS_ENABLE_OMEGA_H)
   target_link_libraries(pcms_core PUBLIC Omega_h::omega_h)
   target_compile_definitions(pcms_core PUBLIC -DPCMS_HAS_OMEGA_H)

src/pcms/dummy_field_adapter.h src/pcms/adapter/dummy_field_adapter.hsrc/pcms/dummy_field_adapter.h renamed to src/pcms/adapter/dummy_field_adapter.h

@@ -97,7 +97,8 @@ class OmegaHField
   using value_type = T;
 
   OmegaHField(std::string name, Omega_h::Mesh& mesh,
-              std::string global_id_name = "",
+              std::string global_id_name = "", int search_nx = 10,
+              int search_ny = 10,
               mesh_entity_type entity_type = mesh_entity_type::VERTEX)
     : name_(std::move(name)),
       mesh_(mesh),