Changeset 26704

Timestamp:

12/03/21 08:38:01 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added friction

Location:

issm/trunk-jpl/src/jl/solve

Files:

• analyses/stressbalanceanalysis.jl (modified) (2 diffs)
• friction.jl (added)
• solve.jl (modified) (1 diff)

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

@@ -45 +45 @@
         FetchDataToInput(md,inputs,elements,md.initialization.vy./md.constants.yts,VyEnum)
 
+        FetchDataToInput(md,inputs,elements,md.friction.coefficient,FrictionCoefficientEnum)
+
 end#}}}
 function UpdateParameters(analysis::StressbalanceAnalysis,parameters::Parameters,md::model) #{{{
@@ -100 +102 @@
                 end
         end
+
+        #Add basal friction
+        basis = Vector{Float64}(undef,numnodes)
+        friction = Friction(element)
+
+        #Start integrating
+        gauss = GaussTria(2)
+        for ig in 1:gauss.numgauss
+
+                Jdet = JacobianDeterminant(xyz_list, gauss)
+                NodalFunctions(element, basis, gauss, ig, P1Enum)
+
+                alpha2 = Alpha2(friction, gauss, ig)
+
+                for i in 1:numnodes
+                        for j in 1:numnodes
+                                Ke.values[2*i-1,2*j-1] += gauss.weights[ig]*Jdet*alpha2*basis[i]*basis[j]
+                                Ke.values[2*i  ,2*j  ] += gauss.weights[ig]*Jdet*alpha2*basis[i]*basis[j]
+                        end
+                end
+        end
+        
 
         return Ke

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

@@ -11 +11 @@
 include("./results.jl")
 include("./matice.jl")
+include("./friction.jl")
 include("./femmodel.jl")
 include("./analyses/analysis.jl")