Skip to content

Commit

Permalink
Merge branch 'main' of github.com:gridap/GridapP4est.jl into facet_in…
Browse files Browse the repository at this point in the history
…tegration_non_conforming_meshes

Conflicts:
src/FESpaces.jl
src/GridapP4est.jl
src/OctreeDistributedDiscreteModels.jl
test/PoissonNonConformingOctreeModelsTests.jl
  • Loading branch information
amartinhuertas committed Apr 20, 2024
2 parents 9054afc + 75efb3e commit 6e73860
Show file tree
Hide file tree
Showing 16 changed files with 4,564 additions and 1,892 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
env:
P4EST_ROOT_DIR: "/opt/p4est/2.2/"
P4EST_ROOT_DIR: "/opt/p4est/2.3.6/"
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -43,10 +43,10 @@ jobs:
- name: Install p4est
if: steps.cache-p4est.outputs.cache-hit != 'true'
run: |
# Install p4est 2.2 from sources
# Install p4est 2.3.6 from sources
CURR_DIR=$(pwd)
PACKAGE=p4est
VERSION=2.2
VERSION=2.3.6
INSTALL_ROOT=/opt
P4EST_INSTALL=$INSTALL_ROOT/$PACKAGE/$VERSION
TAR_FILE=$PACKAGE-$VERSION.tar.gz
Expand Down
Loading

0 comments on commit 6e73860

Please sign in to comment.