Cleanup and minor optimization

Author: KnutAM

benchmark/Project.toml

@@ -1,4 +1,6 @@
 [deps]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
+DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 Ferrite = "c061ca5d-56c9-439f-9c0e-210fe06d3992"
 PkgBenchmark = "32113eaa-f34f-5b0d-bd6c-c81e245fc73d"
+SparseMatricesCSR = "a0a7dd2c-ebf4-11e9-1f05-cf50bc540ca1"

benchmark/benchmark-sparsitypattern.jl

@@ -79,4 +79,4 @@ function make_df(timings)
 end
 
 display(make_df(make_timings(SparseMatrixCSC{Float64, Int})))
-display(make_df(make_timings(SparseMatrixCSR)))
+# display(make_df(make_timings(SparseMatrixCSR)))

src/Dofs/sparsity_pattern.jl

@@ -739,17 +739,23 @@ end
 getncols(sp::FastSparsityPattern) = length(sp.marker)
 getnrows(sp::FastSparsityPattern) = length(sp.rowlen)
 
-function create_celldofs(dh)
+function create_celldofs(dh::DofHandler)
+    isclosed(dh) || throw(ArgumentError("DofHandler must be closed"))
     ncells = getncells(dh.grid)
     indices = similar(dh.cell_dofs_offset, ncells + 1)
     cell_dofs = similar(dh.cell_dofs)
     n = 1
-    for cell_idx in 1:getncells(dh.grid)
+    for cell_idx in 1:ncells
         indices[cell_idx] = n
-        r = n:(n + ndofs_per_cell(dh, cell_idx) - 1)
-        celldofs!(view(cell_dofs, r), dh, cell_idx)
+        num = ndofs_per_cell(dh, cell_idx)
+        num == 0 && continue
+        r = n:(n + num - 1)
+        #celldofs!(view(cell_dofs, r), dh, cell_idx), but faster without view:
+        soffs = dh.cell_dofs_offset[cell_idx]
+        copyto!(cell_dofs, n, dh.cell_dofs, soffs, num)
         n = last(r) + 1
     end
+    indices[end] = n
     return ArrayOfVectorViews(indices, cell_dofs, LinearIndices((ncells,)))
 end
 
@@ -764,7 +770,6 @@ function create_row_to_cells(cell_dofs::ArrayOfVectorViews, sp)
             n_connected += 1
         end
     end
-    # n_connected = sum(num_cells) better?
 
     # 2: Create the correct datastructure
     data = Vector{Int}(undef, n_connected)