some bugfixes

WIAS-PDELib · Nov 22, 2023 · e33d61f · e33d61f
1 parent 634cc1f
commit e33d61f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/ExtendableFEMBase.jl b/src/ExtendableFEMBase.jl
@@ -125,7 +125,7 @@ include("segment_integrator.jl")
 export SegmentIntegrator, initialize!, integrate_segment!
 
 include("point_evaluator.jl")
-export PointEvaluator, evaluate!, evaluate_bary!, eval_func
+export PointEvaluator, evaluate!, evaluate_bary!, eval_func, eval_func_bary
 
 include("lazy_interpolate.jl")
 export lazy_interpolate!

diff --git a/src/dofmaps.jl b/src/dofmaps.jl
@@ -515,26 +515,26 @@ function init_broken_dofmap!(FES::FESpace{Tv, Ti, FEType, APT}, DM::Union{Type{B
 									local_dofs[nldofs] = xCellDofs[celldofoffset+(local_nodes[k]-1)*q+dof, cell]
 								end
 							end
-							celldofoffset += q * nfacenodes
+							celldofoffset += q * ncellnodes
 						elseif cpattern[s].type <: DofTypeInterior && cpattern[s].each_component
 							for dof ∈ 1:q
 								nldofs += 1
 								local_dofs[nldofs] = xCellDofs[celldofoffset+(local_face-1)*q+dof, cell]
 							end
-							celldofoffset += q
+							celldofoffset += q * ncellfaces
 						elseif cpattern[s].type <: DofTypeEdge && cpattern[s].each_component
 							for k ∈ 1:nfaceedges
 								for dof ∈ 1:q
 									nldofs += 1
 									local_dofs[nldofs] = xCellDofs[celldofoffset+(local_edges[k]-1)*q+dof, cell]
 								end
 							end
-							celldofoffset += q * nfaceedges
+							celldofoffset += q * ncelledges
 						end
 					end
 					# increase celldofoffset for interior component dofs in cell pattern
 					for s ∈ 1:length(ccellpattern)
-						if ccellpattern[s].type <: DofTypeInterior && cpattern[s].each_component
+						if ccellpattern[s].type <: DofTypeInterior && ccellpattern[s].each_component
 							celldofoffset += ccellpattern[s].ndofs
 						end
 					end
@@ -562,7 +562,7 @@ function init_broken_dofmap!(FES::FESpace{Tv, Ti, FEType, APT}, DM::Union{Type{B
 								local_dofs[nldofs] = xCellDofs[celldofoffset+(local_nodes[k]-1)*q+dof, cell]
 							end
 						end
-						celldofoffset += q * nfacenodes
+						celldofoffset += q * ncellnodes
 					elseif cpattern[s].type <: DofTypeInterior && !cpattern[s].each_component
 						for dof ∈ 1:q
 							nldofs += 1
@@ -576,7 +576,7 @@ function init_broken_dofmap!(FES::FESpace{Tv, Ti, FEType, APT}, DM::Union{Type{B
 								local_dofs[nldofs] = xCellDofs[celldofoffset+(local_edges[k]-1)*q+dof, cell]
 							end
 						end
-						celldofoffset += q * nfaceedges
+						celldofoffset += q * ncelledges
 					end
 				end
 			end

diff --git a/src/lazy_interpolate.jl b/src/lazy_interpolate.jl
@@ -83,7 +83,7 @@ function lazy_interpolate!(
 			if cell == 0
 				fill!(result, not_in_domain_value)
 			else
-				evaluate!(result, PE, xref, cell)
+				evaluate_bary!(result, PE, xref, cell)
 				lastnonzerocell = cell
 			end
 			return nothing