Skip to content

Commit

Permalink
Merge pull request #37 from gridap/p4est-migration-exploring-non-conf…
Browse files Browse the repository at this point in the history
…ormity

P4est migration exploring non conformity
  • Loading branch information
JordiManyer authored Aug 21, 2023
2 parents 6247707 + f41383f commit cb002b5
Show file tree
Hide file tree
Showing 17 changed files with 3,472 additions and 381 deletions.
18 changes: 15 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ jobs:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
env:
JULIA_MPI_BINARY: "system"
P4EST_ROOT_DIR: "/opt/p4est/2.2/"
strategy:
fail-fast: false
matrix:
version:
- '1.7'
- '1.9'
os:
- ubuntu-latest
arch:
Expand Down Expand Up @@ -63,8 +62,21 @@ jobs:
make --quiet
make --quiet install
rm -rf $ROOT_DIR/$TAR_FILE $SOURCES_DIR
cd $CURR_DIR
cd $CURR_DIR
- uses: julia-actions/julia-buildpkg@latest

- name: add MPIPreferences
shell: julia --color=yes --project=. {0}
run: |
using Pkg
Pkg.add("MPIPreferences")
- name: use MPI system binary
shell: julia --color=yes --project=. {0}
run: |
using MPIPreferences
MPIPreferences.use_system_binary()
# - uses: julia-actions/julia-runtest@v1
# - uses: julia-actions/julia-processcoverage@v1
- run: echo $PWD
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ docs/build/
tmp/
.vscode
Manifest.toml
LocalPreferences.toml
13 changes: 7 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
[compat]
ArgParse = "1"
FillArrays = "0.8.4, 0.9, 0.10, 0.11, 0.12"
Gridap = "0.17.17"
GridapDistributed = "0.2.7"
MPI = "0.16, 0.17, 0.18, 0.19, 0.20"
P4est_wrapper = "0.1.3"
PartitionedArrays = "0.2.14"
julia = "1.5,1.6,1.7,1.8"
Gridap = "0.17.18"
GridapDistributed = "0.3"
MPI = "0.20"
P4est_wrapper = "0.2.0"
PartitionedArrays = "0.3.3"
julia = "1.5,1.6,1.7,1.8,1.9"

[extras]
MPIPreferences = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
Expand Down
6 changes: 3 additions & 3 deletions src/Environment.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const _INITIALIZED = Ref(false)
See P4est_wrapper.jl/src/bindings/sc_common.jl for possible/valid
argument values for the p4est_verbosity_level parameter
"""
function Init(parts::MPIData;p4est_verbosity_level=P4est_wrapper.SC_LP_DEFAULT)
function Init(parts::MPIArray;p4est_verbosity_level=P4est_wrapper.SC_LP_DEFAULT)
if !MPI.Initialized()
@error "MPI not Initialized!"
end
Expand Down Expand Up @@ -36,9 +36,9 @@ function Finalize()
return nothing
end

function with(f,parts::MPIData;kwargs...)
function with(f,parts::MPIArray;kwargs...)
Init(parts;kwargs...)
out = f()
Finalize()
return out
end
end
Loading

0 comments on commit cb002b5

Please sign in to comment.