updated ExampleA09 (still no allocations even if EG is determined at runtime, thanks j-fu), trybrute parameter of gFindLocal! is now used

Author: chmerdon

examples/ExampleA09_PoissonLowLevel.jl

@@ -141,8 +141,7 @@ function assemble_rhs!(b::AbstractVector, FES::FESpace; f = nothing)
     end
 
     xgrid = FES.xgrid
-    # EG = xgrid[UniqueCellGeometries][1]
-    EG = Triangle2D
+    EG = xgrid[UniqueCellGeometries][1]
     FEType = eltype(FES)
 
     ## quadrature formula
@@ -161,34 +160,37 @@ function assemble_rhs!(b::AbstractVector, FES::FESpace; f = nothing)
     L2G::L2GTransformer{Float64, Int32, EG} = L2GTransformer(EG, xgrid, ON_CELLS)
 
     ## ASSEMBLY LOOP
-    bloc = zeros(Float64, ndofs4cell)
-    ncells::Int = num_cells(xgrid)
-    dof_j::Int = 0
-    x::Vector{Float64} = zeros(Float64, 2)
-    cellvolumes = xgrid[CellVolumes]
-
-    @time for cell = 1 : ncells
-        for j = 1 : ndofs4cell
-            ## right-hand side
-            temp = 0
-            for qp = 1 : nweights
-                ## get global x for quadrature point
-                update_trafo!(L2G, cell)
-                eval_trafo!(x, L2G, xref[qp])
-
-                ## (f, v_j)
-                temp += weights[qp] * idvals[1, j, qp] * fdata(x)[1]
+    function barrier(L2G::L2GTransformer{Tv,Ti,Tg,Tc}) where {Tv,Ti,Tg,Tc}
+        
+        bloc = zeros(Float64, ndofs4cell)
+        ncells::Int = num_cells(xgrid)
+        dof_j::Int = 0
+        x::Vector{Float64} = zeros(Float64, 2)
+        cellvolumes = xgrid[CellVolumes]
+        
+        @time for cell = 1 : ncells
+            for j = 1 : ndofs4cell
+                ## right-hand side
+                temp = 0
+                for qp = 1 : nweights
+                    ## get global x for quadrature point
+                    update_trafo!(L2G, cell)
+                    eval_trafo!(x, L2G, xref[qp])
+                    ## (f, v_j)
+                    temp += weights[qp] * idvals[1, j, qp] * fdata(x)[1]
             end
-            bloc[j] = temp
-        end
-
-        for j = 1 : ndofs4cell
-            dof_j = CellDofs[j, cell]
-            b[dof_j] += bloc[j] * cellvolumes[cell]
+                bloc[j] = temp
+            end
+            
+            for j = 1 : ndofs4cell
+                dof_j = CellDofs[j, cell]
+                b[dof_j] += bloc[j] * cellvolumes[cell]
+            end
+            
+            fill!(bloc, 0)
         end
-
-        fill!(bloc, 0)
     end
+    barrier(L2G)
 end
 
 function solve_poisson_lowlevel!(Solution; μ = 1)

src/interpolations.jl

@@ -483,7 +483,8 @@ function ExtendableGrids.interpolate!(
     source::FEVectorBlock{T2,Tv,Ti};
     operator = Identity,
     postprocess = NoAction(),
-    xtrafo = nothing, items = [],
+    xtrafo = nothing, 
+    items = [],
     not_in_domain_value = 1e30,
     start_cell = 1,
     only_localsearch = false,
@@ -530,9 +531,9 @@ function ExtendableGrids.interpolate!(
             end
             if xtrafo !== nothing
                 xtrafo(x_source, x)
-                cell = gFindLocal!(xref, CF, x_source; icellstart = lastnonzerocell, eps = eps)
+                cell = gFindLocal!(xref, CF, x_source; icellstart = lastnonzerocell, eps = eps, trybrute = !only_localsearch)
             else
-                cell = gFindLocal!(xref, CF, x; icellstart = lastnonzerocell, eps = eps)
+                cell = gFindLocal!(xref, CF, x; icellstart = lastnonzerocell, eps = eps, trybrute = !only_localsearch)
             end
                 evaluate!(result,PE,xref,cell)
             return nothing
@@ -542,15 +543,9 @@ function ExtendableGrids.interpolate!(
         function point_evaluation_arbitrarygrids!(result, x)
             if xtrafo !== nothing
                 xtrafo(x_source, x)
-                cell = gFindLocal!(xref, CF, x_source; icellstart = lastnonzerocell, eps = eps)
-                if cell == 0 && !only_localsearch
-                    cell = gFindBruteForce!(xref, CF, x_source)
-                end
+                cell = gFindLocal!(xref, CF, x_source; icellstart = lastnonzerocell, eps = eps, trybrute = !only_localsearch)
             else
-                cell = gFindLocal!(xref, CF, x; icellstart = lastnonzerocell, eps = eps)
-                if cell == 0 && !only_localsearch
-                    cell = gFindBruteForce!(xref, CF, x)
-                end
+                cell = gFindLocal!(xref, CF, x; icellstart = lastnonzerocell, eps = eps, trybrute = !only_localsearch)
             end
             if cell == 0
                 fill!(result, not_in_domain_value)

src/userdata.jl

@@ -156,12 +156,10 @@ function nodevalues(xgrid::ExtendableGrid{Tv,Ti}, UD::AbstractUserDataType; T =
         UD.x = zeros(T,size(xCoordinates,1))
     end
     nodevals = zeros(T,UD.argsizes[1],nnodes)
+    if is_itemdependent(UD)
+        @warn "item dependence ignored in nodevalues for DataFunction"
+    end
     for j = 1 : nnodes
-        if is_itemdependent(UD)
-            UD.citem[1] = cell
-            UD.citem[2] = cell
-            UD.citem[3] = xCellRegions[cell]
-        end
         if is_xdependent(UD)
             UD.x .= view(xCoordinates,:,j)
         end