take steps to speed up element colouring

PetrKryslUCSD · Mar 25, 2024 · ba712aa · ba712aa
1 parent a0bc649
commit ba712aa
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "FinEtools"
 uuid = "91bb5406-6c9a-523d-811d-0644c4229550"
 authors = ["Petr Krysl <pkrysl@ucsd.edu>"]
-version = "8.0.12"
+version = "8.0.13"
 
 [deps]
 ChunkSplitters = "ae650224-84b6-46f8-82ea-d812ca08434e"

diff --git a/src/MeshModificationModule.jl b/src/MeshModificationModule.jl
@@ -1274,18 +1274,27 @@ function element_coloring(fes, n2e, ellist::Vector{IT} = Int[]) where {IT<:Integ
     return element_coloring!(element_colors, unique_colors, color_counts, fes, n2e, ellistit)
 end
 
-function __find_minimal_count(__color_used, color_counts)
-    c = 1
+function __find_minimal_count(color_used, color_counts)
+    c = 0
     mincount = typemax(eltype(color_counts))
-    for k in eachindex(__color_used)
-        if __color_used[k] == 0 && mincount > color_counts[k]
+    @inbounds for k in eachindex(color_used)
+        if color_used[k] == 0 && mincount > color_counts[k]
             mincount = color_counts[k]
             c = k
         end
     end
     return c
 end
 
+function __find_first_zero(color_used)
+    @inbounds for k in eachindex(color_used)
+        if color_used[k] == 0 
+            return k
+        end
+    end
+    return 0
+end
+
 """
     element_coloring!(element_colors, unique_colors, color_counts, fes, n2e, ellist)
 
@@ -1300,7 +1309,7 @@ function element_coloring!(element_colors, unique_colors, color_counts, fes, n2e
     for e in ellist_iterator
         if element_colors[e] == 0
             __color_used .= 0
-            for n in fes.conn[e]
+            @inbounds for n in fes.conn[e]
                 m = n2e.map[n]
                 for j in eachindex(m)
                     oe = m[j]
@@ -1315,13 +1324,12 @@ function element_coloring!(element_colors, unique_colors, color_counts, fes, n2e
                 element_colors[e] = unique_colors[c]
                 color_counts[c] += 1
             else
-                first_not_used = findfirst(x -> x == 0, __color_used)
-                if first_not_used === nothing
+                if __find_first_zero(__color_used) == 0
                     added = maximum(unique_colors) + 1
                     push!(unique_colors, added)
                     push!(color_counts, 0)
                     push!(__color_used, 0)
-                    c = argmin(color_counts)
+                    c = length(color_counts)
                     element_colors[e] = unique_colors[c]
                     color_counts[c] += 1
                 else