diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be6d4c6b..e7ea76f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -109,7 +109,34 @@ jobs: - name: Brew install MFEM dependencies # if: steps.cache-brew.outputs.cache-hit != 'true' - run: brew install open-mpi metis hypre + run: brew install open-mpi metis + + - name: Download Hypre + uses: actions/checkout@v2 + with: + repository: 'hypre-space/hypre' + ref: 'master' + path: .deps/hypre + + - name: Create Hypre Build Environment + run: cmake -E make_directory ${{runner.workspace}}/.deps/hypre/build + + - name: Configure Hypre + shell: bash + working-directory: ${{runner.workspace}}/.deps/hypre/build + run: | + cmake ${GITHUB_WORKSPACE}/.deps/hypre/src \ + -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ + -DCMAKE_POSITION_INDEPENDENT_CODE=YES \ + -DCMAKE_INSTALL_PREFIX="${{runner.workspace}}/.deps/hypre" + + - name: Build Hypre + working-directory: ${{runner.workspace}}/.deps/hypre/build + run: cmake --build . --parallel 2 --config $BUILD_TYPE + + - name: Install Hypre + working-directory: ${{runner.workspace}}/.deps/hypre/build + run: cmake --build . --config $BUILD_TYPE --target install - name: Download MFEM uses: actions/checkout@v2 @@ -129,7 +156,7 @@ jobs: -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ -DMFEM_USE_MPI=YES \ -DMFEM_USE_METIS_5=YES \ - -DHYPRE_DIR="$(brew --prefix hypre)" \ + -DHYPRE_DIR="${{runner.workspace}}/.deps/hypre" \ -DMETIS_DIR="$(brew --prefix metis)" \ -DMFEM_ENABLE_EXAMPLES=NO \ -DMFEM_ENABLE_MINIAPPS=NO diff --git a/README.md b/README.md index 1b6bfbcf..4fcfcf44 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -![.github/workflows/build.yml](https://github.com/OptimalDesignLab/mach/workflows/.github/workflows/build.yml/badge.svg?branch=dev) - +![master](https://github.com/OptimalDesignLab/mach/actions/workflows/build.yml/badge.svg?branch=master) # ODL Mach # Mach is a C++ library for multi-physics finite-element simulations based on LLNL's [MFEM](https://github.com/mfem/mfem). diff --git a/test/regression/egads/data/cyl.egadslite b/test/regression/egads/data/cyl.egadslite new file mode 100644 index 00000000..f08ae31e Binary files /dev/null and b/test/regression/egads/data/cyl.egadslite differ diff --git a/test/regression/egads/data/cyl.egadslite.sup b/test/regression/egads/data/cyl.egadslite.sup new file mode 100644 index 00000000..227d43be Binary files /dev/null and b/test/regression/egads/data/cyl.egadslite.sup differ diff --git a/test/regression/egads/data/cyl2.egadslite b/test/regression/egads/data/cyl2.egadslite new file mode 100644 index 00000000..524a0211 Binary files /dev/null and b/test/regression/egads/data/cyl2.egadslite differ