Many bugfixes

gridap · Jan 6, 2025 · f07fba1 · f07fba1
1 parent 186d26b
commit f07fba1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/FESpaces/Polytopal.jl b/src/FESpaces/Polytopal.jl
@@ -80,12 +80,12 @@ function centroid_map(poly::Polytope{D}) where D
   v = get_vertex_coordinates(poly)
   xc = mean(v)
   h = maximum(vk -> norm(vk-xc), v)
-  origin = xc/h
-  gradient = TensorValues.diagonal_tensor(VectorValue([h for i in 1:D]))
+  origin = -xc/h
+  gradient = TensorValues.diagonal_tensor(VectorValue([1/h for i in 1:D]))
   return affine_map(gradient,origin)
 end
 
-function Arrays.lazy_map(::typeof(evaluate),a::LazyArray{<:Fill{typeof(centroid_map)}},x::AbstractVector{<:Point})
+function Arrays.lazy_map(::typeof(evaluate),a::LazyArray{<:Fill{typeof(centroid_map)}},x::AbstractVector)
   polys = a.args[1]
   lazy_map(CentroidCoordinateChangeMap(),polys,x)
 end
@@ -97,12 +97,12 @@ function Arrays.evaluate!(cache,::CentroidCoordinateChangeMap,poly::Polytope{D},
   return (x - xc) / h
 end
 
-function Arrays.return_cache(::CentroidCoordinateChangeMap,poly::Polytope{D},x::AbstractVector{Point{D}}) where D
+function Arrays.return_cache(::CentroidCoordinateChangeMap,poly::Polytope{D},x::AbstractVector{<:Point{D}}) where D
   return CachedArray(similar(x))
 end
 
-function Arrays.evaluate!(cache,::CentroidCoordinateChangeMap,poly::Polytope{D},x::AbstractVector{Point{D}}) where D
-  setsize!(cache,length(x))
+function Arrays.evaluate!(cache,::CentroidCoordinateChangeMap,poly::Polytope{D},x::AbstractVector{<:Point{D}}) where D
+  setsize!(cache,size(x))
   y = cache.array
   v = get_vertex_coordinates(poly)
   xc = mean(v)

diff --git a/src/Fields/AffineMaps.jl b/src/Fields/AffineMaps.jl
@@ -132,6 +132,6 @@ end
 # Constructor from a simplex given by D1+1 points
 function affine_map(points::NTuple{D,Point{D2,T}}) where {D,D2,T}
   origin, pk = first_and_tail(points)
-  gradient = TensorValues.tensor_from_columns(map(p -> p-origin, pk))
+  gradient = TensorValues.tensor_from_rows(map(p -> p-origin, pk))
   AffineField(gradient,origin)
 end
diff --git a/src/ReferenceFEs/PolytopalQuadratures.jl b/src/ReferenceFEs/PolytopalQuadratures.jl
@@ -54,9 +54,8 @@ end
 
 function Arrays.evaluate!(cache,::PQuadCoordsMap, q::PolytopalQuadrature)
   y_cache, cmap_cache = cache
-
-  conn = q.conn
   coords = get_vertex_coordinates(q.poly)
+  conn = q.conn
 
   x = get_coordinates(q.quad)
   setsize!(y_cache,(length(x)*length(conn),))

diff --git a/test/GeometryTests/PolytopalGridsTests.jl b/test/GeometryTests/PolytopalGridsTests.jl
@@ -14,16 +14,20 @@ vmodel = Geometry.voronoi(simplexify(model))
 polys = get_polytopes(vmodel)
 # viz(vmodel;color=1:num_cells(vmodel),showpoints=true,showsegments=true)
 
+order = 8
 Ω = Triangulation(vmodel)
-dΩ = Measure(Ω,2)
+dΩ = Measure(Ω,2*order)
+sum(∫(1)dΩ)
 
-V = FESpaces.PolytopalFESpace(Ω,1)
+V = FESpaces.PolytopalFESpace(Ω,order)
 
-u_exact(x) = x[1] + x[2]
+u_exact(x) = x[1]^2 + x[2]^2
 a(u,v) = ∫(u⋅v)dΩ
 l(v) = ∫(v*u_exact)dΩ
 
 op = AffineFEOperator(a,l,V,V)
+A = get_matrix(op)
+Matrix(A)
 uh = solve(op)
 
 eh = uh - u_exact