Merge pull request #101 from WIAS-PDELib/fix/commongrids_ringsector

Fix dangling nodes in ringsector

Author: j-fu

CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+## [1.14.1] - 2025-11-14
+- fix dangling nodes in full ringsector
+- add `isconsistent` checks to CI tests
+- somewhat extend `isconsistent` checks
+
 ## [1.14.0] - 2025-07-01
 
 - add `trim!`/`trim` function to remove precomputed grid components for lightweight storage

Project.toml

@@ -1,7 +1,7 @@
 name = "ExtendableGrids"
 uuid = "cfc395e8-590f-11e8-1f13-43a2532b2fa8"
 authors = ["Juergen Fuhrmann <juergen.fuhrmann@wias-berlin.de>", "Christian Merdon  <christian.merdon@wias-berlin.de>", "Johannes Taraz  <johannes.taraz@gmail.com>", "Patrick Jaap <patrick.jaap@wias-berlin.de>"]
-version = "1.14.0"
+version = "1.14.1"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

examples/examples1d.jl

@@ -49,6 +49,11 @@ end
 using Test
 
 function runtests()
+    @test isconsistent(interval_from_vector())
+    @test isconsistent(interval_localref())
+    @test isconsistent(interval_multiregion())
+    @test isconsistent(interval_subgrid())
+
     @test numbers_match(interval_from_vector(), 21, 20, 2)
     @test numbers_match(interval_localref(), 27, 26, 2)
     @test numbers_match(interval_multiregion(), 21, 20, 3)

examples/examples2d.jl

@@ -98,13 +98,22 @@ end
 # Unit tests
 using Test
 function runtests()
+
+    @test isconsistent(rectangle())
+    @test isconsistent(rectangle_localref())
+    @test isconsistent(rectangle_multiregion())
+    @test isconsistent(rectangle_subgrid())
+    @test isconsistent(rect2d_bregion_function())
+
     @test numbers_match(rectangle(), 441, 800, 80)
     @test numbers_match(rectangle_localref(), 729, 1352, 104)
     @test numbers_match(rectangle_multiregion(), 441, 800, 100)
     @test numbers_match(rectangle_subgrid(), 360, 600, 120)
     @test numbers_match(rect2d_bregion_function(), 79, 112, 44)
 
     g, sg, sf = sorted_subgrid()
+    @test isconsistent(g)
+    @test isconsistent(sg)
     @test numbers_match(g, 187, 306, 66)
     @test numbers_match(sg, 17, 16, 0)
     @test issorted(view(sg[Coordinates], 1, :))

examples/examples3d.jl

@@ -44,6 +44,10 @@ end
 using Test
 
 function runtests()
+    @test isconsistent(quadrilateral())
+    @test isconsistent(cross3d())
+
+
     @test numbers_match(quadrilateral(), 330, 1200, 440)
     @test mask_bedges()
     @test numbers_match(cross3d(), 189, 480, 344)

src/adjacency.jl

@@ -130,6 +130,20 @@ function Base.append!(adj::VariableTargetAdjacency, column)
     return push!(adj.colstart, length(adj.colentries) + 1)
 end
 
+"""
+$(TYPEDSIGNATURES)
+
+Maximum for VariableTargetAdjacency
+"""
+Base.maximum(adj::VariableTargetAdjacency) = Base.maximum(adj.colentries)
+
+"""
+$(TYPEDSIGNATURES)
+
+Minimum for VariableTargetAdjacency
+"""
+Base.minimum(adj::VariableTargetAdjacency) = Base.minimum(adj.colentries)
+
 """
 $(TYPEDEF)
 

src/commongrids.jl

@@ -174,12 +174,12 @@ end
 
 
 """
-    ringsector(rad,ang; eltype=Triangle2D)
+    ringsector(rad,ang)
 
 Sector of ring or full ring (if  `ang[begin]-ang[end]≈2π`)
 """
-function ringsector(rad, ang; eltype = Triangle2D)
-    Tv = Float32
+function ringsector(rad, ang)
+    Tv = promote_type(eltype(rad), eltype(ang))
     Ti = Int32
 
     coord = ElasticArray{Tv, 2}(undef, 2, 0)
@@ -201,7 +201,9 @@ function ringsector(rad, ang; eltype = Triangle2D)
         x = cos(ϕ)
         y = sin(ϕ)
         for irad in 1:nrad
-            append!(coord, (rad[irad] * x, rad[irad] * y))
+            if iarc < narc || !fullcircle
+                append!(coord, (rad[irad] * x, rad[irad] * y))
+            end
             icoord = size(coord, 2)
             if irad < nrad
                 if iarc < narc

src/extendablegrid.jl

@@ -459,6 +459,30 @@ or, if `warnoly==true`, return false.
 """
 function isconsistent(grid; warnonly = false)
     consistent = true
+    nnodes = num_nodes(grid)
+
+    if maximum(grid[CellNodes]) != nnodes
+        @warn "maximum(grid[CellNodes])!=nnodes"
+        consistent = false
+    end
+
+    if minimum(grid[CellNodes]) != 1
+        @warn "minimum(grid[CellNodes])!=1"
+        consistent = false
+    end
+
+    if length(grid[BFaceNodes]) > 0
+        if maximum(grid[BFaceNodes]) > nnodes
+            @warn "maximum(grid[BFaceNodes])>nnodes"
+            consistent = false
+        end
+
+        if minimum(grid[BFaceNodes]) < 1
+            @warn "minimum(grid[BFaceNodes])<1"
+            consistent = false
+        end
+    end
+
     dnodes = dangling_nodes(grid)
     if !isnothing(dnodes)
         @warn "Found dangling nodes: $(dnodes)"

test/gmsh.jl

@@ -51,41 +51,51 @@ end
     ExtendableGrids.simplexgrid_to_gmsh(grid1; filename = joinpath(path, "testfile.msh"))
 
     grid2 = ExtendableGrids.simplexgrid_from_gmsh(joinpath(path, "testfile.msh"); Tc = Float32, Ti = Int64)
+    @test isconsistent(grid2)
 
     @test seemingly_equal(grid2, grid1; sort = true, confidence = :low)
     @test seemingly_equal(grid2, grid1; sort = true, confidence = :full)
 
     grid1 = ExtendableGrids.simplexgrid_from_gmsh(joinpath(path, "sto_2d.msh"); Tc = Float64, Ti = Int64)
+    @test isconsistent(grid1)
 
     ExtendableGrids.simplexgrid_to_gmsh(grid1; filename = joinpath(path, "testfile.msh"))
     grid2 = ExtendableGrids.simplexgrid_from_gmsh(joinpath(path, "testfile.msh"); Tc = Float64, Ti = Int64)
+    @test isconsistent(grid2)
 
     @test seemingly_equal(grid1, grid2; sort = true, confidence = :low)
     @test seemingly_equal(grid1, grid2; sort = true, confidence = :full)
 
     grid1 = ExtendableGrids.simplexgrid_from_gmsh(joinpath(path, "sto_3d.msh"); Tc = Float32, Ti = Int64)
+    @test isconsistent(grid1)
 
     ExtendableGrids.simplexgrid_to_gmsh(grid1; filename = joinpath(path, "testfile.msh"))
     grid2 = ExtendableGrids.simplexgrid_from_gmsh(joinpath(path, "testfile.msh"); Tc = Float64, Ti = Int32)
+    @test isconsistent(grid2)
 
     @test seemingly_equal(grid1, grid2; sort = true, confidence = :low)
     @test seemingly_equal(grid1, grid2; sort = true, confidence = :full)
 
     grid1 = ExtendableGrids.simplexgrid_from_gmsh(joinpath(path, "sto_2d.msh"))
+    @test isconsistent(grid1)
 
     grid2 = ExtendableGrids.simplexgrid_from_gmsh(joinpath(path, "sto_3d.msh"); Tc = Float32, Ti = Int32)
+    @test isconsistent(grid2)
 
     @test !seemingly_equal(grid1, grid2; sort = true, confidence = :low)
     @test !seemingly_equal(grid1, grid2; sort = true, confidence = :full)
 
     grid1 = ExtendableGrids.simplexgrid_from_gmsh(joinpath(path, "testmesh.gmsh"); incomplete = true)
     ExtendableGrids.seal!(grid1; encode = false)
+    @test isconsistent(grid1)
 
     ExtendableGrids.simplexgrid_to_gmsh(grid1; filename = joinpath(path, "completed_testfile.msh"))
     grid2 = ExtendableGrids.simplexgrid_from_gmsh(joinpath(path, "completed_testfile.msh"))
+    @test isconsistent(grid2)
 
     grid3 = ExtendableGrids.simplexgrid_from_gmsh(joinpath(path, "testmesh.gmsh"); incomplete = true)
     ExtendableGrids.seal!(grid3; encode = true)
+    @test isconsistent(grid3)
 
     @test seemingly_equal(grid1, grid2; sort = true, confidence = :low)
     @test seemingly_equal(grid1, grid2; sort = true, confidence = :full)
@@ -98,7 +108,9 @@ end
     grid2 = simplexgrid(x, x)
     grid3 = simplexgrid(x, x)
     ExtendableGrids.seal!(grid2)
+    @test isconsistent(grid2)
     ExtendableGrids.seal!(grid3; encode = false)
+    @test isconsistent(grid3)
 
     @test seemingly_equal(grid2, grid1; sort = true, confidence = :low)
     @test seemingly_equal(grid2, grid1; sort = true, confidence = :full)
@@ -109,9 +121,11 @@ end
 @testset "Read/write mixed gmsh 2d" begin
     path = joinpath(pkgdir(ExtendableGrids), "test")
     grid1 = ExtendableGrids.mixedgrid_from_gmsh(joinpath(path, "mixedgrid_2d.msh"); Tc = Float64, Ti = Int64)
+    @test_broken isconsistent(grid1)
 
     ExtendableGrids.mixedgrid_to_gmsh(grid1; filename = joinpath(path, "testfile.msh"))
     grid2 = ExtendableGrids.mixedgrid_from_gmsh(joinpath(path, "testfile.msh"); Tc = Float32, Ti = UInt64)
+    @test_broken isconsistent(grid2)
 
     @test seemingly_equal(grid1, grid2; sort = true, confidence = :low)
     @test seemingly_equal(grid1, grid2; sort = true, confidence = :full)
@@ -121,6 +135,9 @@ end
     path = joinpath(pkgdir(ExtendableGrids), "test")
     grid = simplexgrid(joinpath(path, "disk1hole.geo"))
     @test num_cells(grid) > 0
+    @test_broken isconsistent(grid)
+
     grid = simplexgrid(joinpath(path, "cube6.geo"))
     @test num_cells(grid) > 0
+    @test isconsistent(grid)
 end

test/partitioning.jl

@@ -17,6 +17,7 @@ import Metis
 
 
             for grid in (grid1, grid2, grid3)
+                @test isconsistent(grid)
                 @test num_pcolors(grid) == 1
                 @test num_partitions(grid) == 1
                 @test pcolors(grid) == 1:1
@@ -28,6 +29,7 @@ import Metis
 
             for npart in [10, 15, 20]
                 grid4 = partition(grid1, PlainMetisPartitioning(npart = npart); nodes = true, keep_nodepermutation = true)
+                @test isconsistent(grid4)
                 @test num_pcolors(grid4) > 1
                 @test num_partitions(grid4) == npart
                 @test pcolors(grid4) |> length > 0
@@ -39,6 +41,7 @@ import Metis
 
             for npart in [3, 4, 5, 6]
                 grid4 = partition(grid1, RecursiveMetisPartitioning(npart = npart); nodes = true, keep_nodepermutation = true)
+                @test isconsistent(grid4)
                 @test num_pcolors(grid4) > 1
                 @test num_partitions(grid4) > npart
                 @test pcolors(grid4) |> length > 0