generalize to a range of elements

PetrKryslUCSD · May 3, 2024 · d5341bf · d5341bf · PetrKryslUCSD · May 3, 2024
1 parent f563142
commit d5341bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 39 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.16"
+version = "8.0.17"
 
 [deps]
 ChunkSplitters = "ae650224-84b6-46f8-82ea-d812ca08434e"

diff --git a/src/FENodeToFEMapModule.jl b/src/FENodeToFEMapModule.jl
@@ -41,12 +41,12 @@ struct FENodeToFEMap{IT}
     map::Vector{Vector{IT}}
 end
 
-function _makemap(conn, nmax::IT) where {IT<:Integer}
+function _makemap(conn, fesindexes, nmax::IT) where {IT<:Integer}
     map = Array{Vector{IT}}(undef, nmax)
     @inbounds for i in eachindex(map)
         map[i] = IT[]  # initially empty arrays
     end
-    @inbounds for j in eachindex(conn)
+    @inbounds for j in fesindexes
         c = conn[j]
         for i in eachindex(c)
             ni = c[i]
@@ -70,18 +70,7 @@ m = FENodeToFEMap(fes.conn, count(fens))
 ```
 """
 function FENodeToFEMap(conn::Vector{NTuple{N,IT}}, nmax::IT) where {N,IT<:Integer}
-    # map = Vector{IT}[]
-    # sizehint!(map, nmax)
-    # for i in 1:nmax
-    #     push!(map, IT[])  # initially empty arrays
-    # end
-    # @inbounds for j in eachindex(conn)
-    #     for i in eachindex(conn[j])
-    #         ni = conn[j][i]
-    #         push!(map[ni], j)
-    #     end
-    # end
-    return FENodeToFEMap(_makemap(conn, nmax))
+    return FENodeToFEMap(_makemap(conn, 1:length(conn), nmax))
 end
 
 """
@@ -92,30 +81,7 @@ Map from finite element nodes to the finite elements connecting them.
 Convenience constructor.
 """
 function FENodeToFEMap(fes::FE, nmax::IT) where {FE<:AbstractFESet,IT<:Integer}
-    return FENodeToFEMap(_makemap(fes.conn, nmax))
+    return FENodeToFEMap(_makemap(fes.conn, 1:count(fes), nmax))
 end
 
-# """
-#     FENodeToFEMap(conns::FIntMat, nmax::FInt)
-
-# Map from finite element nodes to the finite elements connecting them.
-
-# - `conns` = integer array of the connectivities
-# - `nmax` = largest possible node number
-# """
-# function FENodeToFEMap(conns::Matrix{IT}, nmax::IT) where {IT<:Integer}
-#     map = Vector{IT}[]
-#     sizehint!(map, nmax)
-#     for i in 1:nmax
-#         push!(map, IT[])  # initially empty arrays
-#     end
-#     @inbounds for j in axes(conns, 1)
-#         for i in axes(conns, 2)
-#             ni = conns[j, i]
-#             push!(map[ni], j)
-#         end
-#     end
-#     return FENodeToFEMap(map)
-# end
-
 end