Changeset 27487

Timestamp:

12/31/22 10:50:41 (2 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added linearize as a possible way to evaluate friction

File:

• issm/trunk-jpl/src/m/classes/friction.m (modified) (6 diffs)

issm/trunk-jpl/src/m/classes/friction.m

@@ -10 +10 @@
                 q                        = NaN;
                 coupling                 = 0;
+                linearize                = 0;
                 effective_pressure       = NaN;
                 effective_pressure_limit = 0;
@@ -34 +35 @@
                 function self = setdefaultparameters(self) % {{{
 
-                        self.coupling = 0;
+                        self.linearize = 0;
+                        self.coupling  = 0;
                         self.effective_pressure_limit = 0;
 
@@ -47 +49 @@
                         md = checkfield(md,'fieldname','friction.q','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
                         md = checkfield(md,'fieldname','friction.p','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
+                        md = checkfield(md,'fieldname','friction.linearize','numel',[1],'values',[0:2]);
                         md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0:4]);
                         md = checkfield(md,'fieldname','friction.effective_pressure_limit','numel',[1],'>=',0);
@@ -58 +61 @@
                         fielddisplay(self,'p','p exponent');
                         fielddisplay(self,'q','q exponent');
+                        fielddisplay(self,'coupling','Coupling flag 0: uniform sheet (negative pressure ok, default), 1: ice pressure only, 2: water pressure assuming uniform sheet (no negative pressure), 3: use provided effective_pressure, 4: use coupled model (not implemented yet)');
+                        fielddisplay(self,'linearize','0: not linearized, 1: interpolated linearly, 2: constant per element (default is 0)');
                         fielddisplay(self,'effective_pressure','Effective Pressure for the forcing if not coupled [Pa]');
-                        fielddisplay(self,'coupling','Coupling flag 0: uniform sheet (negative pressure ok, default), 1: ice pressure only, 2: water pressure assuming uniform sheet (no negative pressure), 3: use provided effective_pressure, 4: use coupled model (not implemented yet)');
                         fielddisplay(self,'effective_pressure_limit','Neff do not allow to fall below a certain limit: effective_pressure_limit*rho_ice*g*thickness (default 0)');
                 end % }}}
@@ -75 +79 @@
                         WriteData(fid,prefix,'object',self,'fieldname','q','format','DoubleMat','mattype',2);
                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer');
+                        WriteData(fid,prefix,'class','friction','object',self,'fieldname','linearize','format','Integer');
                         WriteData(fid,prefix,'object',self,'class','friction','fieldname','effective_pressure_limit','format','Double');
                         if self.coupling==3 || self.coupling==4
@@ -86 +91 @@
                         writejs1Darray(fid,[modelname '.friction.q'],self.q);
                         writejs1Darray(fid,[modelname '.friction.coupling'],self.coupling);
+                        writejs1Darray(fid,[modelname '.friction.linearize'],self.linearize);
                         writejs1Darray(fid,[modelname '.friction.effective_pressure'],self.effective_pressure);
                         writejs1Darray(fid,[modelname '.friction.effective_pressure_limit'],self.effective_pressure_limit);