Skip to content

Obtain parent cells in marching* and pass cell regions to slice plots #93

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

Closed
pjaap wants to merge 1 commit into from
Closed

Obtain parent cells in marching* and pass cell regions to slice plots #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 8 additions & 7 deletions src/common.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,22 +60,23 @@ Extract isosurfaces and plane interpolation for function on 3D tetrahedral mesh.
See [`marching_tetrahedra(coord,cellnodes,func,planes,flevels;tol, primepoints, primevalues, Tv, Tp, Tf)`](@ref)
"""
function GridVisualizeTools.marching_tetrahedra(
grid::ExtendableGrid, func, planes, flevels; gridscale = 1.0,
grid::ExtendableGrid, func, planes, flevels; return_parent_cells = false, gridscale = 1.0,
kwargs...
)
coord = grid[Coordinates] * gridscale
cellnodes = grid[CellNodes]
return marching_tetrahedra(coord, cellnodes, func, planes, flevels; kwargs...)
return marching_tetrahedra(coord, cellnodes, func, planes, flevels; return_parent_cells, kwargs...)
end

function GridVisualizeTools.marching_tetrahedra(
grids::Vector{ExtendableGrid{Tv, Ti}}, funcs, planes, flevels;
return_parent_cells = false,
gridscale = 1.0,
kwargs...
) where {Tv, Ti}
coord = [grid[Coordinates] * gridscale for grid in grids]
cellnodes = [grid[CellNodes] for grid in grids]
return marching_tetrahedra(coord, cellnodes, funcs, planes, flevels; kwargs...)
return marching_tetrahedra(coord, cellnodes, funcs, planes, flevels; return_parent_cells, kwargs...)
end

########################################################################################
Expand All @@ -96,16 +97,16 @@ end

Collect isoline snippets and/or intersection points with lines and values ready for linesegments!
"""
function GridVisualizeTools.marching_triangles(grid::ExtendableGrid, func, lines, levels; gridscale = 1.0)
function GridVisualizeTools.marching_triangles(grid::ExtendableGrid, func, lines, levels; return_parent_cells = false, gridscale = 1.0)
coord::Matrix{Float64} = grid[Coordinates] * gridscale
cellnodes::Matrix{Int32} = grid[CellNodes]
return marching_triangles(coord, cellnodes, func, lines, levels)
return marching_triangles(coord, cellnodes, func, lines, levels; return_parent_cells)
end

function GridVisualizeTools.marching_triangles(grids::Vector{ExtendableGrid{Tv, Ti}}, funcs, lines, levels; gridscale = 1.0) where {Tv, Ti}
function GridVisualizeTools.marching_triangles(grids::Vector{ExtendableGrid{Tv, Ti}}, funcs, lines, levels; return_parent_cells = false, gridscale = 1.0) where {Tv, Ti}
coords = [grid[Coordinates] * gridscale for grid in grids]
cellnodes = [grid[CellNodes] for grid in grids]
return marching_triangles(coords, cellnodes, funcs, lines, levels)
return marching_triangles(coords, cellnodes, funcs, lines, levels; return_parent_cells)
end

##############################################
Expand Down
32 changes: 19 additions & 13 deletions src/slice_plots.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,11 @@ end
Else, for a generic plane, the new coordinate system has non-negative values and start at [0,0].

ctx: Plotting context
grid: 3D ExtendableGrid
grid_3d: 3D ExtendableGrid
values: value vector corresponding to the grid nodes
plane: Vector [a,b,c,d], s.t., ax + by + cz + d = 0 defines the plane that slices the 3D grid
"""
function slice_plot!(ctx, ::Type{Val{3}}, grid, values)
function slice_plot!(ctx, ::Type{Val{3}}, grid_3d::ExtendableGrid{Tc, Ti}, values) where {Tc, Ti}

plane = zeros(4)
eval_slice_expr!(plane, ctx[:slice])
Expand All @@ -212,12 +212,12 @@ function slice_plot!(ctx, ::Type{Val{3}}, grid, values)
ctx[:slice] = nothing

# get new data from marching_tetrahedra
new_coords, new_triangles, new_values = GridVisualize.marching_tetrahedra(grid, values, [plane], [])
new_coords, new_triangles, new_values, parents = GridVisualize.marching_tetrahedra(grid_3d, values, [plane], []; return_parent_cells = true)

# construct new 2D grid
grid_2d = ExtendableGrid{Float64, Int32}()
grid_2d = ExtendableGrid{Tc, Ti}()

a::Float64, b::Float64, c::Float64, _ = plane
a::Tc, b::Tc, c::Tc, _ = plane

# transformation matrix
if (a, b, c) == (1.0, 0.0, 0.0)
Expand All @@ -242,7 +242,7 @@ function slice_plot!(ctx, ::Type{Val{3}}, grid, values)
rotation_matrix = compute_3d_z_rotation_matrix([a, b, c])
end

grid_2d[Coordinates] = Matrix{Float64}(undef, 2, length(new_coords))
grid_2d[Coordinates] = Matrix{Tc}(undef, 2, length(new_coords))
for (ip, p) in enumerate(new_coords)
# to obtain the projected coordinates, we can simply use the transpose of the rotation matrix
@views grid_2d[Coordinates][:, ip] .= (rotation_matrix'p)[1:2]
Expand All @@ -254,11 +254,13 @@ function slice_plot!(ctx, ::Type{Val{3}}, grid, values)
@views grid_2d[Coordinates][2, :] .-= minimum(grid_2d[Coordinates][2, :])
end

grid_2d[CellNodes] = Matrix{Int32}(undef, 3, length(new_triangles))
grid_2d[CellNodes] = Matrix{Ti}(undef, 3, length(new_triangles))
for (it, t) in enumerate(new_triangles)
@views grid_2d[CellNodes][:, it] .= t
end

grid_2d[CellRegions] = grid_3d[CellRegions][parents]

return scalarplot!(ctx, grid_2d, new_values)
end

Expand All @@ -281,7 +283,7 @@ end
values: value vector corresponding to the grid nodes
line: Vector [a,b,c], s.t., ax + by + d = 0 defines the line that slices the 2D grid
"""
function slice_plot!(ctx, ::Type{Val{2}}, grid, values)
function slice_plot!(ctx, ::Type{Val{2}}, grid::ExtendableGrid{Tc, Ti}, values) where {Tc, Ti}

line = zeros(3)
eval_slice_expr!(line, ctx[:slice])
Expand All @@ -290,12 +292,12 @@ function slice_plot!(ctx, ::Type{Val{2}}, grid, values)
ctx[:slice] = nothing

# get new data from marching_triangles
new_coords, new_adjecencies, new_values = GridVisualize.marching_triangles(grid, values, [line], [])
new_coords, new_adjecencies, new_values, parents = GridVisualize.marching_triangles(grid, values, [line], []; return_parent_cells = true)

# construct new 1D grid
grid_1d = ExtendableGrid{Float64, Int32}()
grid_1d = ExtendableGrid{Tc, Ti}()

a::Float64, b::Float64, _ = line
a::Tc, b::Tc, _ = line

if (a, b) == (1.0, 0.0)
rotation_matrix = @SArray [
Expand All @@ -314,7 +316,7 @@ function slice_plot!(ctx, ::Type{Val{2}}, grid, values)
# rotated coordinates (drop second component)
rot_coords = [ (rotation_matrix'p)[1] for p in new_coords ]

grid_1d[Coordinates] = Matrix{Float64}(undef, 1, length(rot_coords))
grid_1d[Coordinates] = Matrix{Tc}(undef, 1, length(rot_coords))
for ip in eachindex(rot_coords)
# to obtain the projected coordinates, we can simply use the transpose of the rotation matrix
grid_1d[Coordinates][1, ip] = rot_coords[ip]
Expand All @@ -325,15 +327,19 @@ function slice_plot!(ctx, ::Type{Val{2}}, grid, values)
grid_1d[Coordinates] .-= minimum(grid_1d[Coordinates])
end

grid_1d[CellNodes] = Matrix{Int32}(undef, 2, length(new_adjecencies))
grid_1d[CellNodes] = Matrix{Ti}(undef, 2, length(new_adjecencies))
for (it, t) in enumerate(new_adjecencies)
@views grid_1d[CellNodes][:, it] .= t
end

grid_1d[CellRegions] = grid[CellRegions][parents]

# sort the coordinates: this is currently required by the Makie backend
p = @views sortperm(grid_1d[Coordinates][:])
grid_1d[Coordinates] = @views grid_1d[Coordinates][:, p]
new_values = new_values[p]
grid_1d[CellRegions] = grid_1d[CellRegions][p]


return scalarplot!(ctx, grid_1d, new_values)
end
Loading