Changeset 26682 for issm/trunk-jpl/src/jl/solve/elementmatrix.jl

Timestamp:

11/30/21 18:48:37 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: done with ys

File:

• issm/trunk-jpl/src/jl/solve/elementmatrix.jl (modified) (2 diffs)

issm/trunk-jpl/src/jl/solve/elementmatrix.jl

@@ -31 +31 @@
         display(this.values)
 end# }}}
+function AddToGlobal!(Ke::ElementMatrix,Kff::IssmMatrix,Kfs::IssmMatrix)#{{{
+
+        #First check that the element matrix looks alright
+        CheckConsistency(Ke)
+
+        #See if we need to do anything
+        is_fset = false
+        is_sset = false
+        for i in 1:Ke.nrows
+                if(Ke.fglobaldoflist[i]>0) is_fset = true end
+                if(Ke.sglobaldoflist[i]>0) is_sset = true end
+        end
+
+        if is_fset
+                AddValues!(Kff,Ke.nrows,Ke.fglobaldoflist,Ke.nrows,Ke.fglobaldoflist,Ke.values)
+        end
+        if is_sset
+                AddValues!(Kfs,Ke.nrows,Ke.fglobaldoflist,Ke.nrows,Ke.sglobaldoflist,Ke.values)
+        end
+
+end#}}}
+function CheckConsistency(Ke::ElementMatrix)#{{{
+
+        for i in 1:Ke.nrows
+                for j in 1:Ke.nrows
+                        if(isnan(Ke.values[i,j])) error("NaN found in Element Matrix") end
+                        if(isinf(Ke.values[i,j])) error("Inf found in Element Matrix") end
+                        if(abs(Ke.values[i,j])>1.e+50) error("Element Matrix values exceeds 1.e+50") end
+                end
+        end
+end#}}}
 
 mutable struct ElementVector#{{{
@@ -58 +89 @@
         display(this.values)
 end# }}}
+function AddToGlobal!(pe::ElementVector,pf::IssmVector)#{{{
+
+        #First check that the element matrix looks alright
+        CheckConsistency(pe)
+
+        #See if we need to do anything
+        is_fset = false
+        for i in 1:pe.nrows
+                if(pe.fglobaldoflist[i]>0)
+                        is_fset = true 
+                        break
+                end
+        end
+
+        if is_fset
+                AddValues!(pf,pe.nrows,pe.fglobaldoflist,pe.values)
+        end
+
+end#}}}
+function CheckConsistency(pe::ElementVector)#{{{
+
+        for i in 1:pe.nrows
+                if(isnan(pe.values[i])) error("NaN found in Element Vector") end
+                if(isinf(pe.values[i])) error("Inf found in Element Vector") end
+                if(abs(pe.values[i])>1.e+50) error("Element Vector values exceeds 1.e+50") end
+        end
+end#}}}