Branch around parallel tasks in assembly if num_partitions is 1

WIAS-PDELib · Jul 18, 2024 · 0e5f741 · 0e5f741 · j-fu · Jul 18, 2024
1 parent efced03
commit 0e5f741
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "VoronoiFVM"
 uuid = "82b139dc-5afc-11e9-35da-9b9bdfd336f3"
 authors = ["Jürgen Fuhrmann <[email protected]>", "Dilara Abdel", "Jan Weidner", "Alexander Seiler", "Patricio Farrell", "Matthias Liero"]
-version = "1.22.0"
+version = "1.22.1"
 
 [deps]
 BandedMatrices = "aae01518-5342-5314-be14-df237901396f"

diff --git a/src/vfvm_assembly.jl b/src/vfvm_assembly.jl
@@ -476,23 +476,33 @@ function eval_and_assemble(system::System{Tv, Tc, Ti, Tm, TSpecMat, TSolArray},
     tstepinv = 1.0 / tstep
     ncallocs = zeros(Int, num_partitions(system.assembly_data))
     nballocs = zeros(Int, num_partitions(system.assembly_data))
-    colpart = system.assembly_data.pcolor_partitions
-    for color in pcolors(system.assembly_data)
-        @tasks for part in pcolor_partitions(system.assembly_data,color)
-            ncalloc = assemble_nodes(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
-            ncalloc += assemble_edges(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
-            ncallocs[part] = ncalloc
-       end
-    end
 
-    for color in pcolors(system.boundary_assembly_data)
-        @tasks for part in pcolor_partitions(system.boundary_assembly_data,color)
-            nballoc = assemble_bnodes(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
-            nballoc += assemble_bedges(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
-            nballocs[part] = nballoc
+    if num_partitions(system.assembly_data) > 1
+        for color in pcolors(system.assembly_data)
+            @tasks for part in pcolor_partitions(system.assembly_data,color)
+                ncalloc = assemble_nodes(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
+                ncalloc += assemble_edges(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
+                ncallocs[part] = ncalloc
+            end
+        end
+
+        for color in pcolors(system.boundary_assembly_data)
+            @tasks for part in pcolor_partitions(system.boundary_assembly_data,color)
+                nballoc = assemble_bnodes(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
+                nballoc += assemble_bedges(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
+                nballocs[part] = nballoc
+            end
         end
+    else
+        part=1
+        ncalloc = assemble_nodes(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
+        ncalloc += assemble_edges(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
+        ncallocs[part] = ncalloc
+        nballoc = assemble_bnodes(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
+        nballoc += assemble_bedges(system, matrix, time, tstepinv, λ, params, part, U, UOld, F)
+        nballocs[part] = nballoc
     end
-
+    
     noallocs(m::AbstractExtendableSparseMatrixCSC)= iszero(nnznew(m))
     noallocs(m::ExtendableSparseMatrix) = isnothing(m.lnkmatrix)
     noallocs(m::AbstractMatrix) = false