Glassvision/JuliaFEM.jl
1
0
Fork 0
mirror of https://github.com/JuliaFEM/JuliaFEM.jl.git synced 2026-09-17 01:02:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(topology): Modernize hexahedron topology implementation

Browse Source 
- Apply Vec constructor broadcasting to all 3 hexahedron types (Hex8, Hex20, Hex27)
- Convert edges() to return SVector of typed Edge{T} entities (12 edges)
- Convert faces() to return SVector of typed Face{T} entities (6 quad faces)
- Add vertices() returning eight Vertex{T} instances
- Add cells() returning single Cell{T} instance
- Add entity count methods: nvertices(), nedges(), nfaces()
- Cleaner formatting with consistent indentation
This commit is contained in:
Jukka Aho
2025-11-23 18:20:26 +02:00
parent 2f8612ee8e
commit 0e4ffb96d0
1 changed files with 54 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/topology/hexahedra.jl
+54 -39
View File
@@ -21,68 +21,83 @@ nnodes(::Hexahedron{N}) where {N} = N
dim(::Hexahedron{N}) where {N} = 3
function reference_coordinates(::Hexahedron{8})
return SVector(
Vec{3,Float64}((-1.0, -1.0, -1.0)), Vec{3,Float64}((1.0, -1.0, -1.0)),
Vec{3,Float64}((1.0, 1.0, -1.0)), Vec{3,Float64}((-1.0, 1.0, -1.0)),
Vec{3,Float64}((-1.0, -1.0, 1.0)), Vec{3,Float64}((1.0, -1.0, 1.0)),
Vec{3,Float64}((1.0, 1.0, 1.0)), Vec{3,Float64}((-1.0, 1.0, 1.0))
)
return SVector(Vec{3,Float64}.((
(-1.0, -1.0, -1.0), (1.0, -1.0, -1.0),
(1.0, 1.0, -1.0), (-1.0, 1.0, -1.0),
(-1.0, -1.0, 1.0), (1.0, -1.0, 1.0),
(1.0, 1.0, 1.0), (-1.0, 1.0, 1.0)
)))
end
function reference_coordinates(::Hexahedron{20})
return SVector(
return SVector(Vec{3,Float64}.((
# 8 corner nodes
Vec{3,Float64}((-1.0, -1.0, -1.0)), Vec{3,Float64}((1.0, -1.0, -1.0)),
Vec{3,Float64}((1.0, 1.0, -1.0)), Vec{3,Float64}((-1.0, 1.0, -1.0)),
Vec{3,Float64}((-1.0, -1.0, 1.0)), Vec{3,Float64}((1.0, -1.0, 1.0)),
Vec{3,Float64}((1.0, 1.0, 1.0)), Vec{3,Float64}((-1.0, 1.0, 1.0)),
(-1.0, -1.0, -1.0), (1.0, -1.0, -1.0),
(1.0, 1.0, -1.0), (-1.0, 1.0, -1.0),
(-1.0, -1.0, 1.0), (1.0, -1.0, 1.0),
(1.0, 1.0, 1.0), (-1.0, 1.0, 1.0),
# 12 edge midpoint nodes
Vec{3,Float64}((0.0, -1.0, -1.0)), Vec{3,Float64}((1.0, 0.0, -1.0)),
Vec{3,Float64}((0.0, 1.0, -1.0)), Vec{3,Float64}((-1.0, 0.0, -1.0)),
Vec{3,Float64}((0.0, -1.0, 1.0)), Vec{3,Float64}((1.0, 0.0, 1.0)),
Vec{3,Float64}((0.0, 1.0, 1.0)), Vec{3,Float64}((-1.0, 0.0, 1.0)),
Vec{3,Float64}((-1.0, -1.0, 0.0)), Vec{3,Float64}((1.0, -1.0, 0.0)),
Vec{3,Float64}((1.0, 1.0, 0.0)), Vec{3,Float64}((-1.0, 1.0, 0.0))
)
(0.0, -1.0, -1.0), (1.0, 0.0, -1.0),
(0.0, 1.0, -1.0), (-1.0, 0.0, -1.0),
(0.0, -1.0, 1.0), (1.0, 0.0, 1.0),
(0.0, 1.0, 1.0), (-1.0, 0.0, 1.0),
(-1.0, -1.0, 0.0), (1.0, -1.0, 0.0),
(1.0, 1.0, 0.0), (-1.0, 1.0, 0.0)
)))
end
function reference_coordinates(::Hexahedron{27})
return SVector(
return SVector(Vec{3,Float64}.((
# 8 corner nodes
Vec{3,Float64}((-1.0, -1.0, -1.0)), Vec{3,Float64}((1.0, -1.0, -1.0)),
Vec{3,Float64}((1.0, 1.0, -1.0)), Vec{3,Float64}((-1.0, 1.0, -1.0)),
Vec{3,Float64}((-1.0, -1.0, 1.0)), Vec{3,Float64}((1.0, -1.0, 1.0)),
Vec{3,Float64}((1.0, 1.0, 1.0)), Vec{3,Float64}((-1.0, 1.0, 1.0)),
(-1.0, -1.0, -1.0), (1.0, -1.0, -1.0),
(1.0, 1.0, -1.0), (-1.0, 1.0, -1.0),
(-1.0, -1.0, 1.0), (1.0, -1.0, 1.0),
(1.0, 1.0, 1.0), (-1.0, 1.0, 1.0),
# 12 edge midpoint nodes
Vec{3,Float64}((0.0, -1.0, -1.0)), Vec{3,Float64}((1.0, 0.0, -1.0)),
Vec{3,Float64}((0.0, 1.0, -1.0)), Vec{3,Float64}((-1.0, 0.0, -1.0)),
Vec{3,Float64}((0.0, -1.0, 1.0)), Vec{3,Float64}((1.0, 0.0, 1.0)),
Vec{3,Float64}((0.0, 1.0, 1.0)), Vec{3,Float64}((-1.0, 0.0, 1.0)),
Vec{3,Float64}((-1.0, -1.0, 0.0)), Vec{3,Float64}((1.0, -1.0, 0.0)),
Vec{3,Float64}((1.0, 1.0, 0.0)), Vec{3,Float64}((-1.0, 1.0, 0.0)),
(0.0, -1.0, -1.0), (1.0, 0.0, -1.0),
(0.0, 1.0, -1.0), (-1.0, 0.0, -1.0),
(0.0, -1.0, 1.0), (1.0, 0.0, 1.0),
(0.0, 1.0, 1.0), (-1.0, 0.0, 1.0),
(-1.0, -1.0, 0.0), (1.0, -1.0, 0.0),
(1.0, 1.0, 0.0), (-1.0, 1.0, 0.0),
# 6 face center nodes
Vec{3,Float64}((0.0, 0.0, -1.0)), Vec{3,Float64}((0.0, 0.0, 1.0)),
Vec{3,Float64}((0.0, -1.0, 0.0)), Vec{3,Float64}((0.0, 1.0, 0.0)),
Vec{3,Float64}((-1.0, 0.0, 0.0)), Vec{3,Float64}((1.0, 0.0, 0.0)),
(0.0, 0.0, -1.0), (0.0, 0.0, 1.0),
(0.0, -1.0, 0.0), (0.0, 1.0, 0.0),
(-1.0, 0.0, 0.0), (1.0, 0.0, 0.0),
# 1 volume center node
Vec{3,Float64}((0.0, 0.0, 0.0))
)
(0.0, 0.0, 0.0)
)))
end
function edges(::Hexahedron{N}) where {N}
return (
function edges(::T) where {T<:Hexahedron}
return SVector(Edge{T}.((
(1, 2), (2, 3), (3, 4), (4, 1),
(5, 6), (6, 7), (7, 8), (8, 5),
(1, 5), (2, 6), (3, 7), (4, 8)
)
)))
end
function faces(::Hexahedron{N}) where {N}
return (
function faces(::T) where {T<:Hexahedron}
return SVector(Face{T}.((
(1, 4, 3, 2), (5, 6, 7, 8),
(1, 2, 6, 5), (2, 3, 7, 6),
(3, 4, 8, 7), (4, 1, 5, 8)
)))
end
function vertices(::T) where {T<:Hexahedron}
return SVector(
Vertex{T}(), Vertex{T}(), Vertex{T}(), Vertex{T}(),
Vertex{T}(), Vertex{T}(), Vertex{T}(), Vertex{T}()
)
end
function cells(::T) where {T<:Hexahedron}
return SVector(Cell{T}())
end
nvertices(::Hexahedron) = 8
nedges(::Hexahedron) = 12
nfaces(::Hexahedron) = 6
export Hex8, Hex20, Hex27