enable scattering of all degree of freedom kinds

PetrKryslUCSD · May 21, 2024 · d8bf110 · d8bf110 · PetrKryslUCSD · May 21, 2024
1 parent d30ae0a
commit d8bf110
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 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.21"
+version = "8.0.22"
 
 [deps]
 DataDrop = "aa547a04-dd37-49ab-8e73-656744f8a8fc"

diff --git a/src/FieldModule.jl b/src/FieldModule.jl
@@ -182,8 +182,7 @@ function gathersysvec(self::F, kind::Symbol) where {F<:AbstractField}
 end
 
 """
-    gathersysvec!(self::F,
-        vec::Vector{T}, which = :f) where {F<:AbstractField, T}
+    gathersysvec!(self::F, vec::Vector{T}, kind::KIND_INT = DOF_KIND_FREE) where {F<:AbstractField,T}
 
 Gather values from the field for the system vector.
 
@@ -192,7 +191,7 @@ Gather values from the field for the system vector.
 - `vec`: destination buffer;
 - `kind`: integer, kind of degrees of freedom to gather: default is `DOF_KIND_FREE`.
 """
-function gathersysvec!(self::F, vec::Vector{T}, kind = DOF_KIND_FREE) where {F<:AbstractField,T}
+function gathersysvec!(self::F, vec::Vector{T}, kind::KIND_INT = DOF_KIND_FREE) where {F<:AbstractField,T}
     nents, dim = size(self.values)
     from, upto = first(dofrange(self, kind)), last(dofrange(self, kind))
     length(vec) == length(from:upto) || error("Vector needs to be of length equal to $(length(from:upto))")
@@ -650,21 +649,22 @@ function applyebc!(self::F) where {F<:AbstractField}
 end
 
 """
-    scattersysvec!(self::F, vec::AbstractVector{T}) where {F<:AbstractField, T<:Number}
+    scattersysvec!(self::F, vec::AbstractVector{T}, kind::KIND_INT = DOF_KIND_FREE) where {F<:AbstractField,T<:Number}
 
 Scatter values to the field from a system vector.
 
-The vector may be either for just the free degrees of freedom, or for all the
-degrees of freedom.
+The vector may be for an arbitrary kind of degrees of freedom (default is the free degrees of freedom).
 """
-function scattersysvec!(self::F, vec::AbstractVector{T}) where {F<:AbstractField,T<:Number}
+function scattersysvec!(self::F, vec::AbstractVector{T}, kind::KIND_INT = DOF_KIND_FREE) where {F<:AbstractField,T<:Number}
     nents, dim = size(self.values)
-    nve = length(vec)
-    for i = 1:nents
-        for j = 1:dim
-            dn = self.dofnums[i, j]
-            if (dn > 0) && (dn <= nve)
-                self.values[i, j] = vec[dn]
+    from, upto = first(dofrange(self, kind)), last(dofrange(self, kind))
+    length(vec) == length(from:upto) || error("Vector needs to be of length equal to $(length(from:upto))")
+    @inbounds for i in 1:nents
+        for j in 1:dim
+            en = self.dofnums[i, j]
+            if from <= en <= upto
+                p = en - from + 1
+                self.values[i, j] = vec[p] 
             end
         end
     end