Changeset 26705 for issm/trunk-jpl/src/jl/solve/friction.jl

Timestamp:

12/03/21 11:18:50 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added subelement GL calculation

File:

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

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

@@ -1 +1 @@
 #Friction class definition
-struct Friction#{{{
+
+abstract type CoreFriction end
+struct CoreBuddFriction#{{{
         H_input::ElementInput
         b_input::ElementInput
@@ -8 +10 @@
         g::Float64
 end# }}}
-function Friction(element::Tria) #{{{
+function CoreFriction(element::Tria) #{{{
 
-        H_input  = GetInput(element, ThicknessEnum)
-        b_input  = GetInput(element, BaseEnum)
-        c_input  = GetInput(element, FrictionCoefficientEnum)
+        frictionlaw = FindParam(element, FrictionLawEnum)
 
-        rho_ice   = FindParam(element, MaterialsRhoIceEnum)
-        rho_water = FindParam(element, MaterialsRhoSeawaterEnum)
-        g         = FindParam(element, ConstantsGEnum)
+        if frictionlaw==1
+                H_input  = GetInput(element, ThicknessEnum)
+                b_input  = GetInput(element, BaseEnum)
+                c_input  = GetInput(element, FrictionCoefficientEnum)
 
-        return Friction(H_input, b_input, c_input, rho_ice, rho_water, g)
+                rho_ice   = FindParam(element, MaterialsRhoIceEnum)
+                rho_water = FindParam(element, MaterialsRhoSeawaterEnum)
+                g         = FindParam(element, ConstantsGEnum)
+
+                return CoreBuddFriction(H_input, b_input, c_input, rho_ice, rho_water, g)
+        else
+                error("Friction ",typeof(md.friction)," not supported yet")
+        end
 end#}}}
 
 #vertices functions
-function Alpha2(friction::Friction, gauss::GaussTria, i::Int64) #{{{
+function Alpha2(friction::CoreBuddFriction, gauss::GaussTria, i::Int64) #{{{
 
         #Get effective pressure