Merge pull request #46 from Jmariambbu/feature/meshes_3

Project.toml

@@ -8,6 +8,7 @@ CollisionDetection = "2b5bf9a6-f3f8-5352-af9c-82bb4af718d8"
 Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
+Delaunay = "07eb4e4e-0c6d-46ef-bc4e-83d5e5d860a9"
 DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 FastGaussQuadrature = "442a2c76-b920-505d-bb47-c5924d526838"
 GmshTools = "82e2f556-b1bd-5f1a-9576-f93c0da5f0ee"

src/CompScienceMeshes.jl

@@ -22,8 +22,10 @@ export euclidianbasis, point
 
 # default mesh creation
 export mesh, readmesh, writemesh, meshgeo, setminus
-export meshsegment, meshrectangle, meshcircle, meshdisk, meshsphere, meshcuboid
-export tetmeshsphere, tetmeshcuboid
+export meshsegment, meshcircle
+export meshcuboid, meshcylinder, meshdisk, meshicosphere, meshmobius, meshrectangle, meshsphere
+export gmshcuboid, gmshrectangle, gmshsphere
+export tetmeshsphere, tetmeshcuboid, tetgmshcuboid, meshball
 export subdMesh
 # mesh interface
 export dimension, universedimension, vertextype, coordtype
@@ -135,7 +137,7 @@ include("fileio/readmesh.jl")
 include("fileio/gmsh.jl")
 include("fileio/gmsh3d.jl")
 include("fileio/gid.jl")
-include("primitives.jl")
+include("primitives/primitives.jl")
 #include("../examples/waveguide_with_post.jl")
 include("baryref.jl")
 include("subdivision.jl")
@@ -147,4 +149,4 @@ include("restrict.jl")
 include("plotlyjs_glue.jl")
 
 include("stripboundedge.jl")
-end # module
+end # module

src/meshes/quadrilateralmesh.jl

@@ -56,21 +56,21 @@ end
 end
 
 @testitem "QuadMesh: skeleton" begin
-    m = CompScienceMeshes.meshrectangle(2.0, 2.0, 1.0; structured=:quadrilateral)
+    m = CompScienceMeshes.meshrectangle(2.0, 2.0, 1.0; element=:quadrilateral)
     @test length(m) == 4
 
     e = CompScienceMeshes.skeleton_fast(m,Val{1})
     @test length(e) == 12
 end
 
 @testitem "QuadMesh: boundary" begin
-    m = CompScienceMeshes.meshrectangle(2.0, 2.0, 1.0; structured=:quadrilateral)
+    m = CompScienceMeshes.meshrectangle(2.0, 2.0, 1.0; element=:quadrilateral)
     b = CompScienceMeshes.boundary(m)
     @test length(b) == 8
 end
 
 @testitem "QuadMesh: connectivity" begin
-    m = CompScienceMeshes.meshrectangle(2.0, 2.0, 1.0; structured=:quadrilateral)
+    m = CompScienceMeshes.meshrectangle(2.0, 2.0, 1.0; element=:quadrilateral)
     e = CompScienceMeshes.skeleton(m, 1)
     c = CompScienceMeshes.connectivity(e, m, identity)
     @test size(c) == (4,12)