Merge branch 'master' of github.com:gridap/P4est_wrapper.jl into p4es…

…t-2.3+
gridap · Mar 27, 2024 · 9c118f6 · 9c118f6
2 parents cbd21fe + 4309c67
commit 9c118f6
Show file tree

Hide file tree

Showing 8 changed files with 587 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 authors = ["Victor Sande <[email protected]>", "Alberto F. Martin <[email protected]>"]
 name = "P4est_wrapper"
 uuid = "3743d7c0-8adf-11ea-380b-7d33b0ecc1da"
-version = "0.2.0"
+version = "0.2.1"
 
 [compat]
 CEnum = "0.4"

diff --git a/gen/Project.toml b/gen/Project.toml
@@ -2,6 +2,5 @@
 Clang = "40e3b903-d033-50b4-a0cc-940c62c95e31"
 
 [compat]
-Clang = "0.10.1"
+Clang = "=0.10.1"
 julia = "1.0"
-
diff --git a/gen/headers.jl b/gen/headers.jl
@@ -19,7 +19,9 @@ const P4EST_HEADER_FILES = [
 const P6EST_HEADER_FILES = [
     "p6est.h", 
     "p6est_extended.h", 
-    "p6est_ghost.h"]
+    "p6est_ghost.h",
+    "p6est_lnodes.h",
+    "p6est_vtk.h"]
 
 const P8EST_HEADER_FILES = [
     "p8est.h", 

diff --git a/src/P4est_wrapper.jl b/src/P4est_wrapper.jl
@@ -56,7 +56,7 @@ include(joinpath(@__DIR__, "api_fixes.jl"))
 # Export everything starting with ...
 ################################################################
 foreach(names(@__MODULE__, all=true)) do s
-    if startswith(string(s), "sc") || startswith(string(s), "p4est") || startswith(string(s), "p6est") || startswith(string(s), "p8est")
+    if startswith(string(s), "sc") || startswith(string(s), "p2est") ||  startswith(string(s), "p4est") || startswith(string(s), "p6est") || startswith(string(s), "p8est")
         @eval export $s
     end
 end

diff --git a/src/api_fixes.jl b/src/api_fixes.jl
@@ -83,7 +83,7 @@ PXEST_NAMED_STRUCTS = Union{p4est_quadrant, p4est_tree, p4est_inspect, p4est_con
                             p4est_ghost_t, p4est_ghost_exchange, p4est_iter_volume_info, p4est_iter_face_side,
                             p4est_iter_face_info, p4est_iter_corner_side, p4est_iter_corner_info, p4est_lnodes,
                             p4est_lnodes_rank, p4est_lnodes_buffer, p4est_search_local_t, p4est_vtk_context,
-                            p6est_connectivity, p2est_quadrant, p6est_ghost, p8est_quadrant, p8est_tree, sc_array,
+                            p6est, p6est_connectivity, p2est_quadrant, p6est_ghost, p8est_quadrant, p8est_tree, sc_array,
                             p8est_inspect, p8est_connectivity, p8est, p8est_geometry, p8est_ghost_t,
                             p8est_ghost_exchange, p8est_iter_volume_info, p8est_iter_face_side, p8est_iter_face_info,
                             p8est_iter_edge_side, p8est_iter_edge_info, p8est_iter_corner_side, p8est_iter_corner_info,

diff --git a/src/bindings/p6est_api.jl b/src/bindings/p6est_api.jl
@@ -183,3 +183,37 @@ end
 function p6est_ghost_checksum(p6est, ghost)
     ccall((:p6est_ghost_checksum, p4est_lib), UInt32, (Ptr{p6est_t}, Ptr{p6est_ghost_t}), p6est, ghost)
 end
+# Julia wrapper for header: p6est_lnodes.h
+# Automatically generated using Clang.jl
+
+
+function p6est_lnodes_new(p6est, ghost_layer, degree)
+    ccall((:p6est_lnodes_new, p4est_lib), Ptr{p6est_lnodes_t}, (Ptr{p6est_t}, Ptr{p6est_ghost_t}, Cint), p6est, ghost_layer, degree)
+end
+
+function p6est_lnodes_get_column_labels(p6est, lnodes)
+    ccall((:p6est_lnodes_get_column_labels, p4est_lib), Ptr{p4est_gloidx_t}, (Ptr{p6est_t}, Ptr{p8est_lnodes_t}), p6est, lnodes)
+end
+# Julia wrapper for header: p6est_vtk.h
+# Automatically generated using Clang.jl
+
+
+function p6est_vtk_write_file(p6est, filename)
+    ccall((:p6est_vtk_write_file, p4est_lib), Cvoid, (Ptr{p6est_t}, Cstring), p6est, filename)
+end
+
+function p6est_vtk_write_header(p6est, scale, write_tree, write_rank, wrap_rank, point_scalars, point_vectors, filename)
+    ccall((:p6est_vtk_write_header, p4est_lib), Cint, (Ptr{p6est_t}, Cdouble, Cint, Cint, Cint, Cstring, Cstring, Cstring), p6est, scale, write_tree, write_rank, wrap_rank, point_scalars, point_vectors, filename)
+end
+
+function p6est_vtk_write_point_scalar(p6est, filename, scalar_name, values)
+    ccall((:p6est_vtk_write_point_scalar, p4est_lib), Cint, (Ptr{p6est_t}, Cstring, Cstring, Ptr{Cdouble}), p6est, filename, scalar_name, values)
+end
+
+function p6est_vtk_write_point_vector(p6est, filename, vector_name, values)
+    ccall((:p6est_vtk_write_point_vector, p4est_lib), Cint, (Ptr{p6est_t}, Cstring, Cstring, Ptr{Cdouble}), p6est, filename, vector_name, values)
+end
+
+function p6est_vtk_write_footer(p6est, filename)
+    ccall((:p6est_vtk_write_footer, p4est_lib), Cint, (Ptr{p6est_t}, Cstring), p6est, filename)
+end
diff --git a/src/bindings/p6est_common.jl b/src/bindings/p6est_common.jl
@@ -73,3 +73,7 @@ struct p6est_ghost
 end
 
 const p6est_ghost_t = p6est_ghost
+const p6est_lnodes_t = p8est_lnodes_t
+const p6est_lnodes_code_t = p8est_lnodes_code_t
+const p6est_lnodes_rank_t = p8est_lnodes_rank_t
+const p6est_lnodes_buffer_t = p8est_lnodes_buffer_t