Changeset 27493

Timestamp:

01/02/23 16:56:41 (2 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added linearization for Weertman as well

Location:

issm/trunk-jpl/src/m/classes

Files:

• frictionweertman.m (modified) (5 diffs)
• frictionweertman.py (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/frictionweertman.m ¶

@@ -8 +8 @@
                 C = NaN;
                 m = NaN;
+                linearize  = 0;
         end
    methods (Static)
@@ -29 +30 @@
                 function self = setdefaultparameters(self) % {{{
 
+                        self.linearize = 0;
+
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -36 +39 @@
                         md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','friction.m','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
+                        md = checkfield(md,'fieldname','friction.linearize','numel',[1],'values',[0:2]);
                 end % }}}
                 function disp(self) % {{{
@@ -47 +51 @@
                         fielddisplay(self,'C','friction coefficient [SI]');
                         fielddisplay(self,'m','m exponent');
+                        fielddisplay(self,'linearize','0: not linearized, 1: interpolated linearly, 2: constant per element (default is 0)');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
@@ -54 +59 @@
                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','C','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','m','format','DoubleMat','mattype',2);
-                        
-
+                        WriteData(fid,prefix,'class','friction','object',self,'fieldname','linearize','format','Integer');
                 end % }}}
         end

issm/trunk-jpl/src/m/classes/frictionweertman.py ¶

@@ -15 +15 @@
         self.C = float('NaN')
         self.m = float('NaN')
+        self.linearize = 0
 
     #set defaults
@@ -26 +27 @@
         string = "%s\n%s" % (string, fielddisplay(self, "C", "friction coefficient [SI]"))
         string = "%s\n%s" % (string, fielddisplay(self, "m", "m exponent"))
+        string = "%s\n%s" % (string, fielddisplay(self, "linearize", "0: not linearized, 1: interpolated linearly, 2: constant per element (default is 0)"))
         return string
     # }}}
 
     def setdefaultparameters(self):  # {{{
+        self.linearize = 0
         return self
     # }}}
@@ -41 +44 @@
         md = checkfield(md, 'fieldname', 'friction.C', 'timeseries', 1, 'NaN', 1, 'Inf', 1)
         md = checkfield(md, 'fieldname', 'friction.m', 'NaN', 1, 'Inf', 1, 'size', [md.mesh.numberofelements])
+        md = checkfield(md, 'fieldname', 'friction.linearize', 'numel', [1], 'values', [0, 1, 2])
 
         return md
@@ -49 +53 @@
         WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'C', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'm', 'format', 'DoubleMat', 'mattype', 2)
+        WriteData(fid, prefix, 'class', 'friction', 'object', self, 'fieldname', 'linearize', 'format', 'Integer')
     # }}}