source: issm/oecreview/Archive/25834-26739/ISSM-26633-26634.diff@ 28275

../trunk-jpl/src/jl/test101.jl

@@ -3 +3 @@
 using .ISSM
 
 md = ISSM.model()
-md = ISSM.triangle(md,"../../test/Exp/Square.exp",180000.)
+#md = ISSM.triangle(md,"../../test/Exp/Square.exp",180000.)
+md = ISSM.triangle(md,"../../test/Exp/Square.exp",250000.)
 md = ISSM.setmask(md,"all","")
 
 #Geometry

../trunk-jpl/src/jl/solve/analyses.jl

@@ -52 +52 @@
         end
 
 end#}}}
+function GetSolutionFromInputs(analysis::StressbalanceAnalysis,ug::Vector{Float64},element::Tria) #{{{
+        error("STOP")
+end#}}}
+
 function Core(analysis::StressbalanceAnalysis,femmodel::FemModel)# {{{
 
         #Fetch parameters relevant to solution sequence
@@ -64 +68 @@
         error("STOP")
 
 end #}}}
+
+
 function solutionsequence_nonlinear(femmodel::FemModel,analysis::Analysis,maxiter::Int64,restol::Float64,reltol::Float64,abstol::Float64) # {{{
 
         #Initialize number of iterations

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

@@ -33 +33 @@
         #Constrain and Number nodes
         SpcNodesx(nodes,constraints,parameters)
         NodesDofx(nodes,parameters)
-        error("STOP")
 
         #Build FemModel
         return FemModel(elements,vertices,nodes,parameters,inputs,constraints)
@@ -106 +105 @@
 end# }}}
 function NodesDofx(nodes::Vector{Node}, parameters::Parameters) #{{{
 
-        error("not implemented yet")
+        #Do we have any nodes?
+        if length(nodes)==0
+                return
+        end
 
+        #Do we really need to update dof indexing
+        if(~RequiresDofReindexing(nodes)) return end
+
+        print("   Renumbering degrees of freedom\n")
+        DistributeDofs(nodes,GsetEnum)
+        DistributeDofs(nodes,FsetEnum)
+        DistributeDofs(nodes,SsetEnum)
+
 end# }}}
+function GetSolutionFromInputsx(analysis::Analysis,femmodel::FemModel) #{{{
+
+        #Get size of vector
+        gsize = NumberOfDofs(femmodel.nodes,GsetEnum)
+
+        println(gsize)
+        error("Stop ===")
+
+        #Initialize solution vector
+        ug = Vector{Float64}(undef,gsize)
+
+        #Go through elements and plug in solution
+        for i=1:length(femmodel.elements)
+                GetSolutionFromInputs(analysis,ug,femmodel.elements[i])
+        end
+
+        return ug
+
+end#}}}

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

@@ -31 +31 @@
         node.svalues[dof]   = value
 
 end# }}}
+function DistributeDofs(node::Node,setenum::IssmEnum,dofcount::Int64) #{{{
+
+        if setenum==GsetEnum
+                for i=1:node.gsize
+                        node.gdoflist[i] = dofcount
+                        dofcount += 1
+                end
+        elseif setenum==FsetEnum
+                for i=1:node.gsize
+                        if  node.fdoflist[i]!=-1
+                                @assert node.sdoflist[i]==-1
+                                node.fdoflist[i] = dofcount
+                                dofcount += 1
+                        end
+                end
+        elseif setenum==SsetEnum
+                for i=1:node.gsize
+                        if  node.sdoflist[i]!=-1
+                                @assert node.fdoflist[i]==-1
+                                node.sdoflist[i] = dofcount
+                                dofcount += 1
+                        end
+                end
+        else
+                error("not supported")
+        end
+
+        return dofcount
+end# }}}
+function GetNumberOfDofs(node::Node,setenum::IssmEnum) #{{{
+
+        if setenum==GsetEnum
+                dofcount = node.gsize
+        elseif setenum==FsetEnum
+                dofcount = 0
+                for i=1:node.gsize
+                        if  node.fdoflist[i]!=-1
+                                dofcount += 1
+                        end
+                end
+        elseif setenum==SsetEnum
+                dofcount = 0
+                for i=1:node.gsize
+                        if  node.sdoflist[i]!=-1
+                                dofcount += 1
+                        end
+                end
+        else
+                error("not supported")
+        end
+
+        return dofcount
+
+end# }}}
+
+#Nodes functions
+function RequiresDofReindexing(nodes::Vector{Node}) #{{{
+
+        for i in 1:length(nodes)
+                if nodes[i].indexingupdate
+                        return true
+                end
+        end
+
+        return false
+
+end# }}}
+function DistributeDofs(nodes::Vector{Node},setenum::IssmEnum) #{{{
+
+        dofcount = 1
+
+        for i in 1:length(nodes)
+                dofcount = DistributeDofs(nodes[i],setenum,dofcount)
+        end
+
+
+end# }}}
+function NumberOfDofs(nodes::Vector{Node},setenum::IssmEnum) #{{{
+
+        numdofs = 0
+        for i in 1:length(nodes)
+                numdofs += GetNumberOfDofs(nodes[i],setenum)
+        end
+        return numdofs
+
+end# }}}