Merge Degas2 Simulation Code

.git-blame-ignore-revs

@@ -1,2 +1,3 @@
 c765e51344ad4a458d042ceefdf19fd61edf79ab  # clang-format
 59fe44fd6d08218b8aeae7612bdd5a71d0289ce5  # format /test/test_hostwrite_initialization.cpp
+570b3252bcb6e080bde4113cc9d7ed2aa5796fd6  # format degas2 physics files

.github/workflows/format-check.yml

@@ -2,8 +2,9 @@ name: Format Check
 
 on:
   push:
+    branches: [main]
   pull_request:
-  pull_request_target:
+    branches: [main]
   workflow_dispatch:
 
 jobs:
@@ -31,6 +32,11 @@ jobs:
             exit 0
           fi
 
+          echo "Files to be checked:"
+          for file in "${files[@]}"; do
+            echo "  $file"
+          done
+
           clang-format-20 --version
           clang-format-20 -style=file --dry-run -Werror "${files[@]}"
 

.github/workflows/static-analysis.yml

@@ -1,8 +1,10 @@
 name: Static Analysis
 
 on:
-  push:
-  pull_request:
+  workflow_run:
+    workflows: ["Test"]
+    types:
+      - completed
   workflow_dispatch:
 
 env:
@@ -11,9 +13,14 @@ env:
 jobs:
   clang-tidy:
     runs-on: ubuntu-latest
+    if: >
+      github.event_name == 'workflow_dispatch' ||
+      (github.event.workflow_run.conclusion == 'success')
 
     steps:
       - uses: actions/checkout@v6
+        with:
+          ref: ${{ github.event.workflow_run.head_sha || github.ref }}
 
       - name: Install dependencies
         uses: ./.github/actions/install-deps
@@ -35,6 +42,7 @@ jobs:
             -DCMAKE_CXX_COMPILER=mpicxx \
             -DCMAKE_C_COMPILER=mpicc \
             -DBUILD_SHARED_LIBS=ON \
+            -DPUMITALLY_ENABLE_DEGAS2=ON \
             -DCMAKE_CXX_CLANG_TIDY=${TIDY_CMD}
 
       - name: Build with clang-tidy

.github/workflows/test.yml

@@ -2,11 +2,14 @@ name: Test
 
 on:
   push:
+    branches: [main]
   pull_request:
+    branches: [main]
   workflow_dispatch:
 
 env:
   DEPS_DIR: ${{ github.workspace }}/deps
+  LD_LIBRARY_PATH: ${{ github.workspace }}/deps/lib
 
 jobs:
   ctest:
@@ -26,12 +29,17 @@ jobs:
             -DCMAKE_PREFIX_PATH=$DEPS_DIR \
             -DCMAKE_CXX_COMPILER=mpicxx \
             -DCMAKE_C_COMPILER=mpicc \
-            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_BUILD_TYPE=Debug \
             -DBUILD_SHARED_LIBS=ON \
-            -DPUMITALLYOPENMC_ENABLE_TESTS=ON
+            -DPUMITALLY_ENABLE_DEGAS2=ON \
+            -DPUMITALLY_ENABLE_TESTS=ON
 
       - name: Build
         run: cmake --build build -j$(nproc)
 
       - name: Run tests
-        run: ctest --test-dir build --output-on-failure
+        run: |
+          export OMP_PROC_BIND=spread
+          export OMP_PLACES=threads
+          export OMP_NUM_THREADS=$(nproc)
+          ctest --test-dir build --output-on-failure

.gitignore

@@ -4,3 +4,4 @@ build-*
 .idea/
 config.sh
 Testing/
+*.vtk

CMakeLists.txt

@@ -8,6 +8,7 @@ option(BUILD_SHARED_LIBS                    "Build shared libraries"        ON)
 option(PUMITALLY_ENABLE_TESTS               "Enable tests"                  OFF)
 option(PUMITALLY_USE_KOKKOS_CUDA            "Use CUDA"                      OFF)
 option(PUMITALLY_MEASURE_TIME               "Measure time"                  OFF)
+option(PUMITALLY_ENABLE_DEGAS2              "Enable Degas2"                 OFF)
 ###################################################################
 
 ################################## PUMIPIC ########################
@@ -30,6 +31,18 @@ set(PUMITALLY_SOURCES
         src/pumitally/PumiTallyImpl.cpp
 )
 
+if(PUMITALLY_ENABLE_DEGAS2)
+    set(PUMITALLY_DEGAS2_HEADERS
+            src/physics/degas2/DG2Physics.h
+            src/physics/degas2/DG2CrossSection.h
+    )
+    set(PUMITALLY_DEGAS2_SOURCES
+            src/physics/degas2/DG2Physics.cpp
+            src/physics/degas2/DG2CrossSection.cpp
+    )
+endif()
+
+
 
 ################################## Testing ########################
 if(PUMITALLY_ENABLE_TESTS)
@@ -73,6 +86,21 @@ if(PUMITALLY_MEASURE_TIME)
 
     target_compile_definitions(pumitally PRIVATE -DPUMITALLY_MEASURE_TIME)
 endif()
+
+if(PUMITALLY_ENABLE_DEGAS2)
+    add_library(pumitally_degas2)
+    target_sources(pumitally_degas2 PRIVATE ${PUMITALLY_DEGAS2_SOURCES})
+    target_link_libraries(pumitally_degas2 PRIVATE pumipic::pumipic)
+
+    add_executable(degas2 src/physics/degas2/degas2-main.cpp)
+    target_link_libraries(degas2 PRIVATE pumitally_degas2 pumitally pumipic::pumipic)
+    target_include_directories(degas2
+            PRIVATE
+            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+            ${CMAKE_SOURCE_DIR}/src/pumitally
+    )
+endif()
 ###################################################################
 
 
@@ -137,5 +165,25 @@ install(FILES
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pumitally
 )
 
+if(PUMITALLY_ENABLE_DEGAS2)
+    install(TARGETS pumitally_degas2
+      EXPORT pumitallyTargets
+      LIBRARY DESTINATION   ${CMAKE_INSTALL_LIBDIR}
+      ARCHIVE DESTINATION   ${CMAKE_INSTALL_LIBDIR}
+      RUNTIME DESTINATION   ${CMAKE_INSTALL_BINDIR}
+      INCLUDES DESTINATION  ${CMAKE_INSTALL_INCLUDEDIR}
+            PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pumitally
+    )
+    install(EXPORT pumitallyTargets
+      FILE pumitally_degas2Targets.cmake
+      NAMESPACE pumitally::
+      DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/pumitally
+    )
+    install(FILES
+            ${CMAKE_CURRENT_SOURCE_DIR}/src/physics/degas2/DG2Physics.h
+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/pumitally/physics/degas2
+    )
+endif()
+
 ###################################################################
 

src/physics/degas2/DG2CrossSection.cpp

@@ -0,0 +1,9 @@
+//
+// Created by Fuad Hasans on 6/20/25.
+//
+
+#include "DG2CrossSection.h"
+
+DG2CrossSection::DG2CrossSection(std::string filename) {
+  // fill in the arrays
+}

src/physics/degas2/DG2CrossSection.h

@@ -0,0 +1,38 @@
+//
+// Created by Fuad Hasan on 6/20/25.
+//
+
+#ifndef PUMITALLY_DG2CROSSSECTION_H
+#define PUMITALLY_DG2CROSSSECTION_H
+
+#include <Omega_h_array.hpp>
+
+class DG2CrossSection {
+public:
+  // fills the cross-section arrays from the given file
+  explicit DG2CrossSection(std::string filename);
+
+  // explicitly given cross-section arrays constructor
+  DG2CrossSection(Kokkos::View<Omega_h::Real ***> sigma_t,
+                  Kokkos::View<Omega_h::Real ***> sigma_a,
+                  Kokkos::View<Omega_h::Real ****> scattering_matrix,
+                  Kokkos::View<Omega_h::Real ***> sigma_s)
+      : nEnergyGroups(sigma_t.extent(2)), nMaterials(sigma_t.extent(0)),
+        nTemperatures(sigma_t.extent(1)), sigma_t(sigma_t), sigma_a(sigma_a),
+        scattering_matrix(scattering_matrix), sigma_s(sigma_s) {}
+
+  DG2CrossSection(const DG2CrossSection &other) = default;
+
+  // no need to define readers of the cross-section arrays
+
+  int nEnergyGroups;
+  int nMaterials;
+  int nTemperatures;
+
+  Kokkos::View<Omega_h::Real ***> sigma_t;            // mat, T, g
+  Kokkos::View<Omega_h::Real ***> sigma_a;            // mat, T, g
+  Kokkos::View<Omega_h::Real ****> scattering_matrix; // mat, T, g, g
+  Kokkos::View<Omega_h::Real ***> sigma_s;            // mat, T, g
+};
+
+#endif // PUMITALLY_DG2CROSSSECTION_H

src/physics/degas2/DG2Physics.cpp

@@ -0,0 +1,4 @@
+//
+// Created by Fuad Hasan on 6/20/25.
+//
+#include "DG2Physics.h"