Skip to content

Commit

Permalink
Remove the refdim parameter from AbstractCell. (#712)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fredrikekre
fredrikekre authored May 17, 2023
1 parent 02312c8 commit 9b3b827
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 33 deletions.
60 changes: 30 additions & 30 deletions src/Grid/grid.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ get_coordinate_eltype(::Node{dim,T}) where {dim,T} = T
# AbstractCell interface #
##########################

abstract type AbstractCell{refdim, refshape <: AbstractRefShape{refdim}} end
abstract type AbstractCell{refshape <: AbstractRefShape} end

nvertices(c::AbstractCell) = length(vertices(c))
nedges( c::AbstractCell) = length(edges(c))
Expand Down Expand Up @@ -84,52 +84,52 @@ get_node_ids(c::AbstractCell) = c.nodes
# correctly implemented for the cell.

# RefLine (refdim = 1): vertices for vertexdofs, faces for BC
function vertices(c::AbstractCell{1, RefLine})
function vertices(c::AbstractCell{RefLine})
ns = get_node_ids(c)
return (ns[1], ns[2]) # v1, v2
end
function faces(c::AbstractCell{1, RefLine})
function faces(c::AbstractCell{RefLine})
ns = get_node_ids(c)
return ((ns[1],), (ns[2],)) # f1, f2
end

# RefTriangle (refdim = 2): vertices for vertexdofs, faces for facedofs (edgedofs) and BC
function vertices(c::AbstractCell{2, RefTriangle})
function vertices(c::AbstractCell{RefTriangle})
ns = get_node_ids(c)
return (ns[1], ns[2], ns[3]) # v1, v2, v3
end
function faces(c::AbstractCell{2, RefTriangle})
function faces(c::AbstractCell{RefTriangle})
ns = get_node_ids(c)
return (
(ns[1], ns[2]), (ns[2], ns[3]), (ns[3], ns[1]), # f1, f2, f3
)
end

# RefQuadrilateral (refdim = 2): vertices for vertexdofs, faces for facedofs (edgedofs) and BC
function vertices(c::AbstractCell{2, RefQuadrilateral})
function vertices(c::AbstractCell{RefQuadrilateral})
ns = get_node_ids(c)
return (ns[1], ns[2], ns[3], ns[4]) # v1, v2, v3, v4
end
function faces(c::AbstractCell{2, RefQuadrilateral})
function faces(c::AbstractCell{RefQuadrilateral})
ns = get_node_ids(c)
return (
(ns[1], ns[2]), (ns[2], ns[3]), (ns[3], ns[4]), (ns[4], ns[1]), # f1, f2, f3, f4
)
end

# RefTetrahedron (refdim = 3): vertices for vertexdofs, edges for edgedofs, faces for facedofs and BC
function vertices(c::AbstractCell{3, RefTetrahedron})
function vertices(c::AbstractCell{RefTetrahedron})
ns = get_node_ids(c)
return (ns[1], ns[2], ns[3], ns[4]) # v1, v2, v3, v4
end
function edges(c::AbstractCell{3, RefTetrahedron})
function edges(c::AbstractCell{RefTetrahedron})
ns = get_node_ids(c)
return (
(ns[1], ns[2]), (ns[2], ns[3]), (ns[3], ns[1]), # e1, e2, e3
(ns[1], ns[4]), (ns[2], ns[4]), (ns[3], ns[4]), # e4, e5, e6
)
end
function faces(c::AbstractCell{3, RefTetrahedron})
function faces(c::AbstractCell{RefTetrahedron})
ns = get_node_ids(c)
return (
(ns[1], ns[3], ns[2]), (ns[1], ns[2], ns[4]), # f1, f2
Expand All @@ -138,21 +138,21 @@ function faces(c::AbstractCell{3, RefTetrahedron})
end

# RefHexahedron (refdim = 3): vertices for vertexdofs, edges for edgedofs, faces for facedofs and BC
function vertices(c::AbstractCell{3, RefHexahedron})
function vertices(c::AbstractCell{RefHexahedron})
ns = get_node_ids(c)
return (
ns[1], ns[2], ns[3], ns[4], ns[5], ns[6], ns[7], ns[8], # v1, ..., v8
)
end
function edges(c::AbstractCell{3, RefHexahedron})
function edges(c::AbstractCell{RefHexahedron})
ns = get_node_ids(c)
return (
(ns[1], ns[2]), (ns[2], ns[3]), (ns[3], ns[4]), (ns[4], ns[1]), # e1, e2, e3, e4
(ns[5], ns[6]), (ns[6], ns[7]), (ns[7], ns[8]), (ns[8], ns[5]), # e5, e6, e7, e8
(ns[1], ns[5]), (ns[2], ns[6]), (ns[3], ns[7]), (ns[4], ns[8]), # e9, e10, e11, e12
)
end
function faces(c::AbstractCell{3, RefHexahedron})
function faces(c::AbstractCell{RefHexahedron})
ns = get_node_ids(c)
return (
(ns[1], ns[4], ns[3], ns[2]), (ns[1], ns[2], ns[6], ns[5]), # f1, f2
Expand All @@ -162,19 +162,19 @@ function faces(c::AbstractCell{3, RefHexahedron})
end

# RefPrism (refdim = 3): vertices for vertexdofs, edges for edgedofs, faces for facedofs and BC
function vertices(c::AbstractCell{3, RefPrism})
function vertices(c::AbstractCell{RefPrism})
ns = get_node_ids(c)
return (ns[1], ns[2], ns[3], ns[4], ns[5], ns[6]) # v1, ..., v6
end
function edges(c::AbstractCell{3, RefPrism})
function edges(c::AbstractCell{RefPrism})
ns = get_node_ids(c)
return (
(ns[2], ns[1]), (ns[1], ns[3]), (ns[1], ns[4]), (ns[3], ns[2]), # e1, e2, e3, e4
(ns[2], ns[5]), (ns[3], ns[6]), (ns[4], ns[5]), (ns[4], ns[6]), # e5, e6, e7, e8
(ns[6], ns[5]), # e9
)
end
function faces(c::AbstractCell{3, RefPrism})
function faces(c::AbstractCell{RefPrism})
ns = get_node_ids(c)
return (
(ns[1], ns[3], ns[2]), (ns[1], ns[2], ns[5], ns[4]), # f1, f2
Expand All @@ -189,17 +189,17 @@ end
######################################################

# Lagrange interpolation based cells
struct Line <: AbstractCell{1, RefLine} nodes::NTuple{ 2, Int} end
struct QuadraticLine <: AbstractCell{1, RefLine} nodes::NTuple{ 3, Int} end
struct Triangle <: AbstractCell{2, RefTriangle} nodes::NTuple{ 3, Int} end
struct QuadraticTriangle <: AbstractCell{2, RefTriangle} nodes::NTuple{ 6, Int} end
struct Quadrilateral <: AbstractCell{2, RefQuadrilateral} nodes::NTuple{ 4, Int} end
struct QuadraticQuadrilateral <: AbstractCell{2, RefQuadrilateral} nodes::NTuple{ 9, Int} end
struct Tetrahedron <: AbstractCell{3, RefTetrahedron} nodes::NTuple{ 4, Int} end
struct QuadraticTetrahedron <: AbstractCell{3, RefTetrahedron} nodes::NTuple{10, Int} end
struct Hexahedron <: AbstractCell{3, RefHexahedron} nodes::NTuple{ 8, Int} end
struct QuadraticHexahedron <: AbstractCell{3, RefHexahedron} nodes::NTuple{27, Int} end
struct Wedge <: AbstractCell{3, RefPrism} nodes::NTuple{ 6, Int} end
struct Line <: AbstractCell{RefLine} nodes::NTuple{ 2, Int} end
struct QuadraticLine <: AbstractCell{RefLine} nodes::NTuple{ 3, Int} end
struct Triangle <: AbstractCell{RefTriangle} nodes::NTuple{ 3, Int} end
struct QuadraticTriangle <: AbstractCell{RefTriangle} nodes::NTuple{ 6, Int} end
struct Quadrilateral <: AbstractCell{RefQuadrilateral} nodes::NTuple{ 4, Int} end
struct QuadraticQuadrilateral <: AbstractCell{RefQuadrilateral} nodes::NTuple{ 9, Int} end
struct Tetrahedron <: AbstractCell{RefTetrahedron} nodes::NTuple{ 4, Int} end
struct QuadraticTetrahedron <: AbstractCell{RefTetrahedron} nodes::NTuple{10, Int} end
struct Hexahedron <: AbstractCell{RefHexahedron} nodes::NTuple{ 8, Int} end
struct QuadraticHexahedron <: AbstractCell{RefHexahedron} nodes::NTuple{27, Int} end
struct Wedge <: AbstractCell{RefPrism} nodes::NTuple{ 6, Int} end

default_interpolation(::Type{Line}) = Lagrange{RefLine, 1}()
default_interpolation(::Type{QuadraticLine}) = Lagrange{RefLine, 2}()
Expand All @@ -217,8 +217,8 @@ default_interpolation(::Type{Wedge}) = Lagrange{RefPrism,
edges(c::Quadrilateral#=3D=#) = faces(c)

# Serendipity interpolation based cells
struct SerendipityQuadraticQuadrilateral <: AbstractCell{2, RefQuadrilateral} nodes::NTuple{ 8, Int} end
struct SerendipityQuadraticHexahedron <: AbstractCell{3, RefHexahedron} nodes::NTuple{20, Int} end
struct SerendipityQuadraticQuadrilateral <: AbstractCell{RefQuadrilateral} nodes::NTuple{ 8, Int} end
struct SerendipityQuadraticHexahedron <: AbstractCell{RefHexahedron} nodes::NTuple{20, Int} end

default_interpolation(::Type{SerendipityQuadraticQuadrilateral}) = Serendipity{RefQuadrilateral, 2}()
default_interpolation(::Type{SerendipityQuadraticHexahedron}) = Serendipity{RefHexahedron, 2}()
Expand Down Expand Up @@ -269,7 +269,7 @@ Specifies for each subtype of AbstractCell how many nodes form an edge.
"""
nvertices_on_edge(cell::AbstractCell, local_edge_index::Int) = length(edges(cell)[local_edge_index])

getdim(::Union{AbstractCell{refdim},Type{<:AbstractCell{refdim}}}) where {refdim} = refdim
getdim(::Union{AbstractCell{refshape},Type{<:AbstractCell{refshape}}}) where {refdim, refshape <: AbstractRefShape{refdim}} = refdim

abstract type AbstractTopology end

Expand Down
4 changes: 2 additions & 2 deletions src/Grid/grid_generators.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ function _generate_2d_nodes!(nodes, nx, ny, LL, LR, UR, UL)
end
end

function generate_grid(C::Type{<:AbstractCell{2}}, nel::NTuple{2,Int}, X::Vector{Vec{2,T}}) where {T}
function generate_grid(C::Type{<:AbstractCell{<:AbstractRefShape{2}}}, nel::NTuple{2,Int}, X::Vector{Vec{2,T}}) where {T}
@assert length(X) == 4
generate_grid(C, nel, X[1], X[2], X[3], X[4])
end

function generate_grid(C::Type{<:AbstractCell{2}}, nel::NTuple{2,Int}, left::Vec{2,T}=Vec{2}((-1.0,-1.0)), right::Vec{2,T}=Vec{2}((1.0,1.0))) where {T}
function generate_grid(C::Type{<:AbstractCell{<:AbstractRefShape{2}}}, nel::NTuple{2,Int}, left::Vec{2,T}=Vec{2}((-1.0,-1.0)), right::Vec{2,T}=Vec{2}((1.0,1.0))) where {T}
LL = left
UR = right
LR = Vec{2}((UR[1], LL[2]))
Expand Down
2 changes: 1 addition & 1 deletion test/test_apply_analytical.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
return B{RefShape,order}()
end
getcellorder(CT) = Ferrite.getorder(Ferrite.default_interpolation(CT))
getcelltypedim(::Type{<:Ferrite.AbstractCell{dim}}) where dim = dim
getcelltypedim(::Type{<:Ferrite.AbstractCell{shape}}) where {dim, shape <: Ferrite.AbstractRefShape{dim}} = dim

# Functions to create dof handlers for testing
function testdh(CT, ip_order_u, ip_order_p)
Expand Down

0 comments on commit 9b3b827

Please sign in to comment.