Merge pull request #160 from Cthonios/bump/ref-fes

bumping reference finite elements interface.

Author: cmhamel

Project.toml

@@ -28,8 +28,8 @@ FiniteElementContainersCUDAExt = ["Adapt", "CUDA"]
 FiniteElementContainersExodusExt = "Exodus"
 
 [compat]
-AMDGPU = "1"
-Adapt = "3, 4"
+AMDGPU = "2"
+Adapt = "4"
 Aqua = "0.8"
 Atomix = "1"
 CUDA = "5"
@@ -39,7 +39,7 @@ ForwardDiff = "1"
 KernelAbstractions = "0.9"
 Krylov = "0.9"
 LinearAlgebra = "1"
-ReferenceFiniteElements = "0.12"
+ReferenceFiniteElements = "0.13"
 SparseArrays = "1"
 StaticArrays = "1"
 Tensors = "1"

src/assemblers/Assemblers.jl

@@ -90,7 +90,7 @@ end
 $(TYPEDSIGNATURES)
 """
 @inline function _cell_interpolants(ref_fe::R, q::Int) where R <: ReferenceFE
-  return @inbounds ref_fe.cell_interps.vals[q]
+  return @inbounds ref_fe.cell_interps[q]
 end
 
 """

src/assemblers/NeumannBC.jl

@@ -54,14 +54,14 @@ function _assemble_block_vector_neumann_bc!(
   ref_fe = bc.ref_fe
 
   ND = size(U, 1)
-  NNPE = ReferenceFiniteElements.num_vertices(ref_fe.surface_element)
+  NNPE = ReferenceFiniteElements.num_vertices(surface_element(ref_fe.element))
   NxNDof = NNPE * ND
 
   for e in axes(conns, 2)
     x_el = _element_level_fields(X, ref_fe, conns, e)
     R_el = zeros(SVector{NxNDof, eltype(field)})
     side = bc.bookkeeping.sides[e]
-    for q in 1:num_quadrature_points(ref_fe.surface_element)
+    for q in 1:num_quadrature_points(surface_element(ref_fe.element))
       interps = MappedSurfaceInterpolants(ref_fe, x_el, q, side)
       Nvec = interps.N_reduced
       JxW = interps.JxW
@@ -103,14 +103,14 @@ KA.@kernel function _assemble_block_vector_neumann_bc_kernel!(
   ref_fe = bc.ref_fe
 
   ND = size(U, 1)
-  NNPE = ReferenceFiniteElements.num_vertices(ref_fe.surface_element)
+  NNPE = ReferenceFiniteElements.num_vertices(surface_element(ref_fe.element))
   NxNDof = NNPE * ND
 
   x_el = _element_level_fields(X, ref_fe, conns, E)
   R_el = zeros(SVector{NxNDof, eltype(field)})
   side = bc.bookkeeping.sides[E]
 
-  for q in 1:num_quadrature_points(ref_fe.surface_element)
+  for q in 1:num_quadrature_points(surface_element(ref_fe.element))
     interps = MappedSurfaceInterpolants(ref_fe, x_el, q, side)
     Nvec = interps.N_reduced
     JxW = interps.JxW

src/bcs/NeumannBCs.jl

@@ -46,13 +46,13 @@ end
 function _update_bc_values!(bc::NeumannBCContainer, func, X, t, ::KA.CPU)
   ND = size(X, 1)
   NN = num_vertices(bc.ref_fe)
-  NNPS = num_vertices(bc.ref_fe.surface_element)
+  NNPS = num_vertices(surface_element(bc.ref_fe.element))
   for (n, e) in enumerate(bc.bookkeeping.elements)
     conn = @views bc.element_conns[:, n]
     X_el = SVector{ND * NN, eltype(X)}(@views X[:, conn])
     X_el = SMatrix{length(X_el) ÷ ND, ND, eltype(X_el), length(X_el)}(X_el...)
 
-    for q in 1:num_quadrature_points(bc.ref_fe.surface_element)
+    for q in 1:num_quadrature_points(surface_element(bc.ref_fe.element))
       side = bc.bookkeeping.sides[n]
       interps = MappedSurfaceInterpolants(bc.ref_fe, X_el, q, side)
       X_q = interps.X_q
@@ -64,7 +64,7 @@ end
 KA.@kernel function _update_bc_values_kernel!(bc::NeumannBCContainer, func, X, t)
   ND = size(X, 1)
   NN = num_vertices(bc.ref_fe)
-  NNPS = num_vertices(bc.ref_fe.surface_element)
+  NNPS = num_vertices(surface_element(bc.ref_fe.element))
 
   Q, E = KA.@index(Global, NTuple)
   # E = KA.@index(Global)
@@ -124,10 +124,10 @@ function create_neumann_bcs(dof::DofManager, neumann_bcs::Vector{NeumannBC})
       # push!(new_bks, BCBookKeeping(new_blocks, bk.dofs, new_elements, bk.nodes, new_sides))
       new_bk = BCBookKeeping(new_blocks, bk.dofs, new_elements, bk.nodes, new_sides, new_side_nodes)
       ref_fe = values(fspace.ref_fes)[block]
-      NQ = num_quadrature_points(ref_fe.surface_element)
+      NQ = num_quadrature_points(surface_element(ref_fe.element))
       ND = length(getfield(dof.H1_vars, var))
       NN = num_vertices(ref_fe)
-      NNPS = num_vertices(ref_fe.surface_element)
+      NNPS = num_vertices(surface_element(ref_fe.element))
 
       # conns = values(fspace.elem_conns)[block][:, new_elements]
 

src/physics/Physics.jl

@@ -43,7 +43,7 @@ end
 
 @inline function map_interpolants(
   interps::I, x_el::SVector{NxD, T}
-) where {I <: ReferenceFiniteElements.Interpolants, NxD, T <: Number}
+) where {I <: ReferenceFiniteElements.AbstractInterpolants, NxD, T <: Number}
   x_el = reshape_element_level_coordinates(interps, x_el)
   interps = MappedInterpolants(interps, x_el)
   return interps
@@ -54,7 +54,7 @@ $(TYPEDSIGNATURES)
 """
 @inline function reshape_element_level_coordinates(
   interps::I, x_el::SVector{NxD, T}
-) where {I <: ReferenceFiniteElements.Interpolants, NxD, T <: Number}
+) where {I <: ReferenceFiniteElements.AbstractInterpolants, NxD, T <: Number}
   # ND = ReferenceFiniteElements.num_dimensions(interps)
   ND = size(interps.∇N_ξ, 2)
   N = NxD ÷ ND