Generalize dispatch to OrthoRectilinearGrid and OrthoStructuredGrid (#1080)

Author: eliascarv

src/boundingboxes.jl

@@ -71,11 +71,12 @@ boundingbox(t::Torus) = _pboxes(pointify(t))
 
 boundingbox(g::OrthoRegularGrid) = Box(extrema(g)...)
 
-boundingbox(g::RectilinearGrid) = Box(extrema(g)...)
+boundingbox(g::OrthoRectilinearGrid) = Box(extrema(g)...)
 
-boundingbox(g::TransformedGrid{<:Any,<:Any,<:CartesianGrid}) = boundingbox(parent(g)) |> transform(g) |> boundingbox
+boundingbox(g::TransformedGrid{<:Any,<:Any,<:OrthoRegularGrid}) = boundingbox(parent(g)) |> transform(g) |> boundingbox
 
-boundingbox(g::TransformedGrid{<:Any,<:Any,<:RectilinearGrid}) = boundingbox(parent(g)) |> transform(g) |> boundingbox
+boundingbox(g::TransformedGrid{<:Any,<:Any,<:OrthoRectilinearGrid}) =
+  boundingbox(parent(g)) |> transform(g) |> boundingbox
 
 boundingbox(m::Mesh) = _pboxes(vertices(m))
 

src/centroid.jl

@@ -70,7 +70,7 @@ function centroid(g::OrthoRegularGrid, ind::Int)
   vertex(g, ijk) + Vec(spacing(g) ./ 2)
 end
 
-function centroid(g::RectilinearGrid{<:𝔼,<:CartesianOrProjected}, ind::Int)
+function centroid(g::OrthoRectilinearGrid, ind::Int)
   ijk = elem2cart(topology(g), ind)
   p1 = vertex(g, ijk)
   p2 = vertex(g, ijk .+ 1)

src/domains/meshes.jl

@@ -247,5 +247,7 @@ include("meshes/structuredgrid.jl")
 include("meshes/simplemesh.jl")
 include("meshes/transformedmesh.jl")
 
-# alias for dispatch purposes
+# aliases for dispatch purposes
 const OrthoRegularGrid{M<:𝔼,C<:Union{Cartesian,Projected}} = RegularGrid{M,C}
+const OrthoRectilinearGrid{M<:𝔼,C<:Union{Cartesian,Projected}} = RectilinearGrid{M,C}
+const OrthoStructuredGrid{M<:𝔼,C<:Union{Cartesian,Projected}} = StructuredGrid{M,C}

src/indices.jl

@@ -66,7 +66,7 @@ end
 
 indices(grid::OrthoRegularGrid, multi::Multi) = mapreduce(geom -> indices(grid, geom), vcat, parent(multi)) |> unique
 
-function indices(grid::RectilinearGrid, box::Box)
+function indices(grid::OrthoRectilinearGrid, box::Box)
   # cartesian range
   range = cartesianrange(grid, box)
 
@@ -106,7 +106,7 @@ function _euclideanrange(grid::OrthoRegularGrid, box::Box)
   CartesianIndex(Tuple(ijkₛ)):CartesianIndex(Tuple(ijkₑ))
 end
 
-function _euclideanrange(grid::RectilinearGrid, box::Box)
+function _euclideanrange(grid::OrthoRectilinearGrid, box::Box)
   # grid properties
   nd = paramdim(grid)
 

src/refinement/regular.jl

@@ -32,7 +32,7 @@ function refine(grid::RectilinearGrid, method::RegularRefinement)
   RectilinearGrid{manifold(grid),crs(grid)}(xyzₜ)
 end
 
-function refine(grid::StructuredGrid, method::RegularRefinement)
+function refine(grid::OrthoStructuredGrid, method::RegularRefinement)
   factors = fitdims(method.factors, paramdim(grid))
   XYZ′ = _XYZ(grid, factors)
   StructuredGrid{manifold(grid),crs(grid)}(XYZ′)
@@ -49,9 +49,9 @@ function _refinedims(x, f)
   x′
 end
 
-_XYZ(grid::StructuredGrid, factors::Dims) = _XYZ(grid, Val(paramdim(grid)), factors)
+_XYZ(grid::OrthoStructuredGrid, factors::Dims) = _XYZ(grid, Val(paramdim(grid)), factors)
 
-function _XYZ(grid::StructuredGrid, ::Val{2}, factors::Dims{2})
+function _XYZ(grid::OrthoStructuredGrid, ::Val{2}, factors::Dims{2})
   T = numtype(lentype(grid))
   fᵢ, fⱼ = factors
   sᵢ, sⱼ = size(grid)
@@ -77,7 +77,7 @@ function _XYZ(grid::StructuredGrid, ::Val{2}, factors::Dims{2})
   (X, Y)
 end
 
-function _XYZ(grid::StructuredGrid, ::Val{3}, factors::Dims{3})
+function _XYZ(grid::OrthoStructuredGrid, ::Val{3}, factors::Dims{3})
   T = numtype(lentype(grid))
   fᵢ, fⱼ, fₖ = factors
   sᵢ, sⱼ, sₖ = size(grid)

src/utils.jl

@@ -2,9 +2,8 @@
 # Licensed under the MIT License. See LICENSE in the project root.
 # ------------------------------------------------------------------
 
-# auxiliary types for dispatch purposes
+# auxiliary type for dispatch purposes
 const GeometryOrDomain = Union{Geometry,Domain}
-const CartesianOrProjected = Union{Cartesian,Projected}
 
 include("utils/basic.jl")
 include("utils/assert.jl")