Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generalize topology construction #670

Merged
merged 11 commits into from
May 9, 2023
Merged

Generalize topology construction #670

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
271091e
Update topology construction to allows Wedges.
termi-official Apr 3, 2023
3184424
Revert accidental test hotfix.
termi-official Apr 4, 2023
dd05d2c
Remove splatting.
termi-official Apr 13, 2023
a660239
Apply suggestions from code review
termi-official May 5, 2023
0a92bb9
Revert variable rename.
termi-official May 5, 2023
da9a370
Merge branch 'master' into do/update-topology-interface
termi-official May 5, 2023
9551a86
Fix 1D topology construction.
termi-official May 5, 2023
83a6449
Fix 1D topology face skeleton construction.
termi-official May 5, 2023
4da9151
Remove splatting.
termi-official May 5, 2023
08cd31f
Add regression test for 1D topology
termi-official May 5, 2023
88da6b2
Merge branch 'master' into do/update-topology-interface
termi-official May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/Grid/grid.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function vertices(c::AbstractCell{1, RefLine})
end
function faces(c::AbstractCell{1, RefLine})
ns = get_node_ids(c)
return (ns[1], ns[2]) # f1, f2
return ((ns[1],), (ns[2],)) # f1, f2
end

# RefTriangle (refdim = 2): vertices for vertexdofs, faces for facedofs (edgedofs) and BC
Expand Down Expand Up @@ -419,9 +419,11 @@ function ExclusiveTopology(cells::Vector{C}) where C <: AbstractCell
vertex_neighbors_local = VertexIndex[]
vertex_neighbors_global = Int[]
for cell in cellset
neighbor_boundary = getdim(cells[cell]) == 2 ? [faces(cells[cell])...] : [edges(cells[cell])...] #get lowest dimension boundary
neighbor_boundary = getdim(cells[cell]) > 2 ? [edges(cells[cell])...] : [faces(cells[cell])...] #get lowest dimension boundary
neighbor_connected_faces = neighbor_boundary[findall(x->global_vertexid in x, neighbor_boundary)]
neighbor_vertices_global = getindex.(neighbor_connected_faces, findfirst.(x->x!=global_vertexid,neighbor_connected_faces))
other_vertices = findfirst.(x->x!=global_vertexid,neighbor_connected_faces)
any(other_vertices .=== nothing) && continue
neighbor_vertices_global = getindex.(neighbor_connected_faces, other_vertices)
neighbor_vertices_local= [VertexIndex(cell,local_vertex) for local_vertex in findall(x->x in neighbor_vertices_global, vertices(cells[cell]))]
append!(vertex_neighbors_local, neighbor_vertices_local)
append!(vertex_neighbors_global, neighbor_vertices_global)
Expand All @@ -435,6 +437,7 @@ function ExclusiveTopology(cells::Vector{C}) where C <: AbstractCell
face_skeleton_local = Vector{FaceIndex}()
fs_length = length(face_skeleton_global)
for (cellid,cell) in enumerate(cells)
getdim(cell) == 1 && continue
termi-official marked this conversation as resolved.
Show resolved Hide resolved
for (local_face_id,face) in enumerate(faces(cell))
push!(face_skeleton_global, first(sortface(face)))
fs_length_new = length(face_skeleton_global)
Expand Down