Changeset 26766

Timestamp:

01/11/22 11:58:04 (3 years ago)

Author:

jwilner

Message:

NEW: added Weertman friction law

Location:

issm/trunk-jpl/src/jl

Files:

• core/analyses/stressbalanceanalysis.jl (modified) (2 diffs)
• core/friction.jl (modified) (3 diffs)
• issm.jl (modified) (1 diff)
• usr/classes.jl (modified) (1 diff)

issm/trunk-jpl/src/jl/core/analyses/stressbalanceanalysis.jl ¶

@@ -50 +50 @@
         if typeof(md.friction)==BuddFriction
                 FetchDataToInput(md,inputs,elements,md.friction.coefficient,FrictionCoefficientEnum)
+        elseif typeof(md.friction)==WeertmanFriction
+                FetchDataToInput(md,inputs,elements,md.friction.C,FrictionCEnum)
+                FetchDataToInput(md,inputs,elements,md.friction.m,FrictionMEnum)
         else
                 error("Friction ", typeof(md.friction), " not supported yet")
@@ -64 +67 @@
         if typeof(md.friction)==BuddFriction
                 AddParam(parameters, 1, FrictionLawEnum)
+        elseif typeof(md.friction)==WeertmanFriction
+                AddParam(parameters, 2, FrictionLawEnum)
         else
                 error("Friction ", typeof(md.friction), " not supported yet")

issm/trunk-jpl/src/jl/core/friction.jl ¶

@@ -10 +10 @@
         g::Float64
 end# }}}
+struct CoreWeertmanFriction#{{{
+   c_input::ElementInput
+        m_input::ElementInput
+        vx_input::ElementInput
+        vy_input::ElementInput
+end# }}}
+
 function CoreFriction(element::Tria) #{{{
 
@@ -24 +31 @@
 
                 return CoreBuddFriction(H_input, b_input, c_input, rho_ice, rho_water, g)
+        elseif frictionlaw==2
+                c_input   = GetInput(element, FrictionCEnum)
+                m_input   = GetInput(element, FrictionMEnum)
+                vx_input  = GetInput(element, VxEnum)
+                vy_input  = GetInput(element, VyEnum)
+                return CoreWeertmanFriction(c_input,m_input,vx_input,vy_input)
         else
                 error("Friction ",typeof(md.friction)," not supported yet")
@@ -42 +55 @@
         return c^2*N
 end #}}}
+
+function Alpha2(friction::CoreWeertmanFriction, gauss::GaussTria, i::Int64)#{{{
+        c = GetInputValue(friction.c_input, gauss, i)
+        m = GetInputValue(friction.m_input, gauss, i)
+        vx = GetInputValue(friction.vx_input, gauss, i)
+        vy = GetInputValue(friction.vy_input, gauss, i)
+        
+        if sqrt(vx^2+vy^2)==0 && m<1
+                return 0
+        else
+                return c^2*sqrt(vx^2+vy^2)^(m-1)
+        end
+end#}}}

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

@@ -7 +7 @@
 
 include("usr/classes.jl")
-export model
+export model, WeertmanFriction
 include("usr/exp.jl")
 export expread, ContourToNodes

issm/trunk-jpl/src/jl/usr/classes.jl ¶

@@ -141 +141 @@
         m::Vector{Float64}
 end
+function WeertmanFriction() #{{{
+        return WeertmanFriction(Vector{Float64}(undef,0),Vector{Float64}(undef,0))
+end# }}}
+function Base.show(io::IO, this::WeertmanFriction)# {{{
+   IssmStructDisp(io, this)
+end# }}}
 # }}}
 #Basalforcings {{{