Changeset 26698

Timestamp:

12/02/21 10:45:36 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: done with VecMerge

Location:

issm/trunk-jpl/src/jl/solve

Files:

• modules.jl (modified) (1 diff)
• nodes.jl (modified) (1 diff)
• solutionsequences.jl (modified) (1 diff)
• toolkits.jl (modified) (1 diff)

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

@@ -161 +161 @@
 
 end#}}}
+function Mergesolutionfromftogx(ug::IssmVector, uf::IssmVector, ys::IssmVector, nodes::Vector{Node}) #{{{
+
+        #Go through elements and plug in solution
+        for i=1:length(nodes)
+                VecMerge(nodes[i],ug,uf.vector,ys.vector)
+        end
+
+        return ug
+
+end#}}}
 function Reduceloadx!(pf::IssmVector, Kfs::IssmMatrix, ys::IssmVector) #{{{
 

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

@@ -145 +145 @@
 
 end# }}}
+function VecMerge(node::Node,ug::IssmVector,uf::Vector{Float64},ys::Vector{Float64}) #{{{
+
+        fsize = FSize(node)
+        ssize = SSize(node)
+
+        if fsize>0
+                indices = Vector{Int64}(undef,fsize)
+                values  = Vector{Float64}(undef,fsize)
+
+                count = 1
+                for i=1:node.gsize
+                        if node.fdoflist[i]!=-1
+                                indices[count] = node.gdoflist[i]
+                                values[count]  = uf[node.fdoflist[i]]
+                                count += 1
+                        end
+                end
+                SetValues!(ug,fsize,indices,values)
+        end
+
+        if ssize>0
+                indices = Vector{Int64}(undef,ssize)
+                values  = Vector{Float64}(undef,ssize)
+
+                count = 1
+                for i=1:node.gsize
+                        if node.sdoflist[i]!=-1
+                                indices[count] = node.gdoflist[i]
+                                values[count]  = ys[node.sdoflist[i]]
+                                count += 1
+                        end
+                end
+                SetValues!(ug,ssize,indices,values)
+        end
+
+end# }}}
 function SSize(node::Node) #{{{
 
         ssize = 0
+
+        for i=1:node.gsize
+                if node.sdoflist[i]!=-1
+                        ssize+=1
+                end
+        end
+
+        return ssize
+
+end# }}}
+function FSize(node::Node) #{{{
+
+        fsize = 0
 
         for i=1:node.gsize
                 if node.fdoflist[i]!=-1
-                        ssize+=1
-                end
-        end
-
-        return ssize
+                        fsize+=1
+                end
+        end
+
+        return fsize
 
 end# }}}

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

@@ -26 +26 @@
                 uf = Solverx(Kff, pf, old_uf)
 
-                print(uf)
+                #Merge uf with ys
+                Mergesolutionfromftogx(ug, uf, ys, femmodel.nodes)
+
+                print(ug)
                 error("compare with ISSM...")
 

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

@@ -73 +73 @@
 
         x = IssmVector(GetSize(xold))
-        x.vector = (b.vector\A.matrix)' #not sure why we need to transpose... that's a mystery!
+        x.vector = (A.matrix\b.vector)
 
         return x