Merge pull request #11 from j-fu/extendablegrids16

Use simplexgrid(tetgenio) from ExtendableGrids 1.6, require Julia 1.9

Author: j-fu

Project.toml

@@ -1,7 +1,7 @@
 name = "SimplexGridFactory"
 uuid = "57bfcd06-606e-45d6-baf4-4ba06da0efd5"
 authors = ["Juergen Fuhrmann <juergen.fuhrmann@wias-berlin.de>"]
-version = "2.0.1"
+version = "2.1.0"
 
 [deps]
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
@@ -19,15 +19,12 @@ Triangulate = "f7e6ffb2-c36d-4f8f-a77e-16e897189344"
 [compat]
 DocStringExtensions = "0.8,0.9"
 ElasticArrays = "^1.2"
-ExtendableGrids = "1.4.1"
+ExtendableGrids = "1.6"
 FileIO = "1"
 LinearAlgebra = "1.6"
 MeshIO = "0.4"
 Printf = "1.6"
 TetGen = "1.5"
 Triangulate = "2.3.1"
-julia = "^1.6"
+julia = "1.9"
 
-[extras]
-TetGen = "c5d3f3f7-f850-59f6-8a2e-ffc6dc1317ea"
-Triangulate = "f7e6ffb2-c36d-4f8f-a77e-16e897189344"

src/tetgen.jl

@@ -21,21 +21,7 @@ function ExtendableGrids.simplexgrid(::Type{TetGenType}, TetGen, input; kwargs..
 
     tetout = TetGen.tetrahedralize(input, flags)
 
-    pointlist = tetout.pointlist
-
-    tetrahedronlist = tetout.tetrahedronlist
-
-    if size(tetout.tetrahedronattributelist, 2) == 0
-        cellregions = ones(Int32, size(tetrahedronlist, 2))
-    else
-        cellregions = Vector{Int32}(vec(tetout.tetrahedronattributelist))
-    end
-
-    segmentlist = tetout.trifacelist
-
-    segmentmarkerlist = tetout.trifacemarkerlist
-
-    ExtendableGrids.simplexgrid(pointlist, tetrahedronlist, cellregions, segmentlist, segmentmarkerlist)
+    ExtendableGrids.simplexgrid(tetout)
 end
 
 """

src/triangle.jl

@@ -18,31 +18,7 @@ function ExtendableGrids.simplexgrid(::Type{TriangulateType}, Triangulate, input
     end
 
     triout, vorout = Triangulate.triangulate(flags, input)
-
-    pointlist = triout.pointlist
-
-    trianglelist = triout.trianglelist
-
-    if size(triout.triangleattributelist, 2) == 0
-        # Add default for cellregions if that was not created
-        cellregions = ones(Int32, size(trianglelist, 2))
-    else
-        cellregions = Vector{Int32}(vec(triout.triangleattributelist))
-    end
-
-    segmentlist = triout.segmentlist
-
-    segmentmarkerlist = triout.segmentmarkerlist
-
-    if size(pointlist, 2) == 0
-        error("Emtpy list of generated points. May be the geometry description is not watertight ?") |> throw
-    end
-
-    if size(trianglelist, 2) == 0
-        error("Emtpy list of generated triangles. May be the geometry description is not watertight ?") |> throw
-    end
-
-    ExtendableGrids.simplexgrid(pointlist, trianglelist, cellregions, segmentlist, segmentmarkerlist)
+    ExtendableGrids.simplexgrid(triout)
 end
 
 """