Merge pull request #21 from gridap/p4est-2.3+

Changes to constants
gridap · Mar 27, 2024 · ac20d26 · ac20d26 · amartinhuertas · Mar 27, 2024
2 parents 4309c67 + b9e1600
commit ac20d26
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ jobs:
     name: Tests ${{ 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:
@@ -37,10 +37,10 @@ jobs:
            sudo apt-get install -y wget gfortran g++ openmpi-bin openmpi-common libopenmpi-dev
       - name: Install p4est
         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

diff --git a/Project.toml b/Project.toml
@@ -1,12 +1,12 @@
 authors = ["Victor Sande <[email protected]>", "Alberto F. Martin <[email protected]>"]
 name = "P4est_wrapper"
 uuid = "3743d7c0-8adf-11ea-380b-7d33b0ecc1da"
-version = "0.2.1"
+version = "0.2.2"
 
 [compat]
 CEnum = "0.4"
 MPI = "0.20"
-P4est_jll = "2.2.0"
+P4est_jll = "2.3.0"
 julia = "1.0"
 
 [deps]

diff --git a/src/bindings/p8est_common.jl b/src/bindings/p8est_common.jl
@@ -1,8 +1,11 @@
 # Automatically generated using Clang.jl
 
 
-const P8EST_MAXLEVEL = 19
-const P8EST_QMAXLEVEL = 18
+const P8EST_OLD_MAXLEVEL = 19
+const P8EST_OLD_QMAXLEVEL = 18
+
+const P8EST_MAXLEVEL = 30
+const P8EST_QMAXLEVEL = 29
 
 # Skipping MacroDefinition: P8EST_ROOT_LEN ( ( p4est_qcoord_t ) 1 << P8EST_MAXLEVEL )
 # Skipping MacroDefinition: P8EST_QUADRANT_LEN ( l ) ( ( p4est_qcoord_t ) 1 << ( P8EST_MAXLEVEL - ( l ) ) )
@@ -26,7 +29,7 @@ struct p8est_tree
     first_desc::p8est_quadrant_t
     last_desc::p8est_quadrant_t
     quadrants_offset::p4est_locidx_t
-    quadrants_per_level::NTuple{20, p4est_locidx_t}
+    quadrants_per_level::NTuple{31, p4est_locidx_t}
     maxlevel::Int8
 end
 
@@ -106,7 +109,7 @@ const p8est_refine_t = Ptr{Cvoid}
 const p8est_coarsen_t = Ptr{Cvoid}
 const p8est_weight_t = Ptr{Cvoid}
 const P8EST_DIM = 3
-const P8EST_FACES = 2P8EST_DIM
+const P8EST_FACES = 2*P8EST_DIM
 const P8EST_CHILDREN = 8
 const P8EST_HALF = P8EST_CHILDREN / 2
 const P8EST_EDGES = 12

diff --git a/test/example_lnodes.jl → test/example_lnodes_2d.jl b/test/example_lnodes.jl → test/example_lnodes_2d.jl
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -45,4 +45,19 @@ if P4est_wrapper.P4EST_FOUND
         @show cmd
         run(cmd)
     end
+    @testset "Example lnodes 2D" begin
+        cmd = `$mpiexec -n $nprocs $(extra_args) $(julia) --project=$repodir $(joinpath(dir, "example_lnodes_2d.jl"))`
+        @show cmd
+        run(cmd)
+    end
+    @testset "Example lnodes 3D" begin
+        cmd = `$mpiexec -n 1 $(extra_args) $(julia) --project=$repodir $(joinpath(dir, "example_lnodes_3d.jl"))`
+        @show cmd
+        run(cmd)
+    end
+    @testset "Example lnodes 2D+1D" begin
+        cmd = `$mpiexec -n $nprocs $(extra_args) $(julia) --project=$repodir $(joinpath(dir, "example_lnodes_2d+1d.jl"))`
+        @show cmd
+        run(cmd)
+    end
 end