Merge commit '3a1f30ff09bae7811950d879e9c4a1eef0822716'

Author: drjfloyd

.github/workflows/cmake.yml

@@ -33,7 +33,7 @@ permissions:
 jobs:
   cmake-linux:
     name: ${{ matrix.container }} ${{ matrix.compiler_mpi }} openmp=${{ matrix.openmp }} ${{ matrix.build_type }}
-    runs-on: [ubuntu-latest]
+    runs-on: [ubuntu-24.04]
     container: ${{ matrix.container }}
     strategy:
       matrix:
@@ -167,7 +167,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: install openmpi
         run: brew install open-mpi
@@ -271,7 +271,7 @@ jobs:
     - name: build fds
       run: |
         call Build\Scripts\setup_intel_compilers.bat
-        cmake -B builddir -S . -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DUSE_SUNDIALS=OFF -DUSE_HYPRE=ON -DHYPRE_FMANGLE=4 -DUSE_OPENMP=${{matrix.openmp}}
+        cmake -B builddir -S . -G Ninja -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DUSE_SUNDIALS=OFF -DUSE_HYPRE=ON -DUSE_OPENMP=${{matrix.openmp}}
         cmake --build builddir -j --target fds
 
     - name: Test

.gitignore

@@ -99,3 +99,8 @@ Validation/*/FDS_Output_Files/*.csv
 
 # Verification script generated fds files
 Verification/Timing_Benchmarks/t*.fds
+
+# Local cmake configuration
+CMakeUserPresets.json
+Build/cmakeb/
+.vscode/

CMakeLists.txt

@@ -151,16 +151,17 @@ if(USE_HYPRE)
         set(HYPRE_GIT_VERSION "2.32.0" )
         FetchContent_Declare(
             HYPRE
-            # GIT_REPOSITORY https://github.com/hypre-space/hypre.git
-            # GIT_TAG        b6d8c3085af64988f8f8bc21b7aef12ab49c5430 # v${HYPRE_GIT_VERSION}
-
+            GIT_REPOSITORY https://github.com/hypre-space/hypre.git
             # Currently we need to refer directly to a commit which contains a
             # patch to handle HYPRE_FMANGLE
-            GIT_REPOSITORY https://github.com/JakeOShannessy/hypre.git
-            GIT_TAG        b6d8c3085af64988f8f8bc21b7aef12ab49c5430 # v2.32.0
+            GIT_TAG        6d01417697aa84d118eb1e1eb91315df42575be5 # v${HYPRE_GIT_VERSION}
             SOURCE_SUBDIR  src
             OVERRIDE_FIND_PACKAGE
         )
+        # Set some options for building hypre
+        if (WIN32)
+            set(HYPRE_ENABLE_FMANGLE CAPS)
+        endif()
         FetchContent_MakeAvailable(HYPRE)
     endif()