diff --git a/src/Geometry/SkeletonGrids.jl b/src/Geometry/SkeletonGrids.jl index 2bc3e8354..b730a4e75 100644 --- a/src/Geometry/SkeletonGrids.jl +++ b/src/Geometry/SkeletonGrids.jl @@ -36,7 +36,7 @@ function Triangulation(grid::SkeletonGrid) SkeletonTriangulation(trian,grid.descriptor1,grid.descriptor2) end -function SkeletonGrid(model::DiscreteModel, tags::Vector{Int}) +function SkeletonGrid(model::DiscreteModel, tags) cell1 = 1 cell2 = 2 bgrid1 = BoundaryGrid(model,tags,cell1) @@ -47,7 +47,7 @@ function SkeletonGrid(model::DiscreteModel, tags::Vector{Int}) SkeletonGrid(grid,descriptor1,descriptor2) end -function SkeletonTriangulation(model::DiscreteModel,tags::Vector{Int}) +function SkeletonTriangulation(model::DiscreteModel,tags) grid = SkeletonGrid(model,tags) Triangulation(grid) end diff --git a/src/Integration/NormalVectors.jl b/src/Integration/NormalVectors.jl index 97e49c02b..e1193d74d 100644 --- a/src/Integration/NormalVectors.jl +++ b/src/Integration/NormalVectors.jl @@ -19,6 +19,11 @@ function NormalVector(trian::BoundaryTriangulation) NormalVector(desc) end +function NormalVector(trian::SkeletonTriangulation) + desc = trian.descriptor1 + NormalVector(desc) +end + function NormalVector(desc::BoundaryDescriptor) phi = desc.cell_phi jac = gradient(phi) diff --git a/src/Integration/files.jl b/src/Integration/files.jl index 35c7e5071..fadc9c1fe 100644 --- a/src/Integration/files.jl +++ b/src/Integration/files.jl @@ -23,12 +23,12 @@ include("BoundaryDescriptors.jl") include("BoundaryTriangulations.jl") @reexport using Gridap.BoundaryTriangulations -include("NormalVectors.jl") -@reexport using Gridap.NormalVectors - include("SkeletonTriangulations.jl") @reexport using Gridap.SkeletonTriangulations +include("NormalVectors.jl") +@reexport using Gridap.NormalVectors + include("BoundaryCellFields.jl") @reexport using Gridap.BoundaryCellFields diff --git a/test/IntegrationTests/NormalVectorsTests.jl b/test/IntegrationTests/NormalVectorsTests.jl index 31bba21fd..80f4cac32 100644 --- a/test/IntegrationTests/NormalVectorsTests.jl +++ b/test/IntegrationTests/NormalVectorsTests.jl @@ -26,4 +26,19 @@ x = evaluate(bphi,q) #writevtk(btrian,"btrian") #writevtk(x,"x",pointdata=["n"=>n_q]) +strian = SkeletonTriangulation(model,"interior") +squad = CellQuadrature(strian,order=2) +qs = coordinates(squad) + +sphi = CellGeomap(strian) + +n = NormalVector(strian) +x = evaluate(sphi,qs) +n_q = evaluate(n,qs) + +#writevtk(strian,"strian") +#writevtk(x,"x",pointdata=["n"=>n_q]) + + + end # module