Update the method definition of centroid of grids (#1078)

* Update the method definition of 'centroid' of grids

* Add more tests

* Update src/utils.jl

---------

Co-authored-by: Júlio Hoffimann <[email protected]>

Author: eliascarv

src/centroid.jl

@@ -65,12 +65,12 @@ centroid(d::Domain, ind::Int) = centroid(d[ind])
 
 centroid(d::SubDomain, ind::Int) = centroid(parent(d), parentindices(d)[ind])
 
-function centroid(g::CartesianGrid, ind::Int)
+function centroid(g::RegularGrid{<:𝔼,<:CartesianOrProjected}, ind::Int)
   ijk = elem2cart(topology(g), ind)
   vertex(g, ijk) + Vec(spacing(g) ./ 2)
 end
 
-function centroid(g::RectilinearGrid, ind::Int)
+function centroid(g::RectilinearGrid{<:𝔼,<:CartesianOrProjected}, ind::Int)
   ijk = elem2cart(topology(g), ind)
   p1 = vertex(g, ijk)
   p2 = vertex(g, ijk .+ 1)

src/utils.jl

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

test/meshes.jl

@@ -13,6 +13,7 @@
   @test eltype(grid) <: Quadrangle
   @test vertex(grid, 1) == vertex(grid, (1, 1))
   @test vertex(grid, nvertices(grid)) == vertex(grid, (11, 21))
+  @test centroid(grid, 1) == centroid(grid[1])
   @test grid[1, 1] == grid[1]
   @test grid[10, 20] == grid[200]
 
@@ -30,6 +31,7 @@
   @test eltype(grid) <: Quadrangle
   @test vertex(grid, 1) == vertex(grid, (1, 1))
   @test vertex(grid, nvertices(grid)) == vertex(grid, (11, 21))
+  @test centroid(grid, 1) == centroid(grid[1])
   @test grid[1, 1] == grid[1]
   @test grid[10, 20] == grid[200]
 
@@ -47,6 +49,7 @@
   @test eltype(grid) <: Quadrangle
   @test vertex(grid, 1) == vertex(grid, (1, 1))
   @test vertex(grid, nvertices(grid)) == vertex(grid, (11, 21))
+  @test centroid(grid, 1) == centroid(grid[1])
   @test grid[1, 1] == grid[1]
   @test grid[10, 20] == grid[200]
 
@@ -64,6 +67,7 @@
   @test eltype(grid) <: Hexahedron
   @test vertex(grid, 1) == vertex(grid, (1, 1, 1))
   @test vertex(grid, nvertices(grid)) == vertex(grid, (11, 21, 31))
+  @test centroid(grid, 1) == centroid(grid[1])
   @test grid[1, 1, 1] == grid[1]
   @test grid[10, 20, 30] == grid[6000]