some bugfixes for unionizing update, version bump

WIAS-PDELib · Feb 21, 2022 · 78761c2 · 78761c2 · chmerdon · Feb 21, 2022
1 parent 25bb46e
commit 78761c2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "ExtendableGrids"
 uuid = "cfc395e8-590f-11e8-1f13-43a2532b2fa8"
 authors = ["Juergen Fuhrmann <[email protected]>, Christian Merdon  <[email protected]>"]
-version = "0.9.0"
+version = "0.9.1"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

diff --git a/src/adaptive_meshrefinements.jl b/src/adaptive_meshrefinements.jl
@@ -206,7 +206,7 @@ function RGB_refine(source_grid::ExtendableGrid{T,K}, facemarkers::Array{Bool,1}
     else
         xgrid[CellRegions] = xCellRegions
     end
-    xgrid[CellGeometries] = VectorOfConstants{ElementGeometries}(Triangle2D,ncells)
+    xgrid[CellGeometries] = VectorOfConstants{ElementGeometries,Int}(Triangle2D,ncells)
 
 
     # determine new boundary faces

diff --git a/src/derived.jl b/src/derived.jl
@@ -910,22 +910,17 @@ end
 function collectVolumes4Geometries(T::Type{<:Real}, xgrid::ExtendableGrid{Tc,Ti}, ItemType) where {Tc,Ti}
     # get links to other stuff
     xCoordinates = xgrid[Coordinates]
-    xCoordinateSystem::Type{<:AbstractCoordinateSystem} = xgrid[CoordinateSystem]
-    xItemNodes::Adjacency{Ti} = xgrid[GridComponent4TypeProperty(ItemType,PROPERTY_NODES) ]
+    xCoordinateSystem = xgrid[CoordinateSystem]
+    xItemNodes = xgrid[GridComponent4TypeProperty(ItemType,PROPERTY_NODES) ]
     xGeometries = xgrid[GridComponent4TypeProperty(ItemType,PROPERTY_GEOMETRY) ]
-    EG = xgrid[GridComponent4TypeProperty(ItemType,PROPERTY_UNIQUEGEOMETRY) ]
-    nitems::Ti = num_sources(xItemNodes)
+    nitems = num_sources(xItemNodes)
 
     # init Volumes
     xVolumes = zeros(T,nitems)
 
     # loop over items and call handlers
-    itemEG::ElementGeometries = EG[1]
     for item = 1 : nitems
-        if length(EG) > 1
-            itemEG = xGeometries[item]
-        end
-        xVolumes[item] = volume(xCoordinates, xItemNodes, item, itemEG, xCoordinateSystem)::T
+        xVolumes[item] = volume(xCoordinates, xItemNodes, item, xGeometries[item], xCoordinateSystem)
     end
 
     xVolumes

diff --git a/src/shape_specs.jl b/src/shape_specs.jl
@@ -403,7 +403,7 @@ local_celledgenodes(::Type{<:Hexahedron3D}) = _local_celledgenodes_Hexahedron3D
 ### VOLUMES ###
 ###############
 
-function volume(Coords, Nodes, item ::Type{<:Vertex0D}, ::Type{<:ExtendableGrids.AbstractCoordinateSystem})
+function volume(Coords, Nodes, item, ::Type{<:Vertex0D}, ::Type{<:ExtendableGrids.AbstractCoordinateSystem})
     return 1
 end