Changeset 26744 for issm/trunk/src/m/classes/frictionschoof.m

Timestamp:

12/22/21 10:39:44 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 26742

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/frictionschoof.m (modified) (5 diffs)

issm/trunk/src/m/classes/frictionschoof.m

@@ -6 +6 @@
 classdef frictionschoof
         properties (SetAccess=public) 
-                C    = NaN;
-                Cmax = NaN;
-                m    = NaN;
+                C                        = NaN;
+                Cmax                     = NaN;
+                m                        = NaN;
+                coupling                 = 0;
+                effective_pressure       = NaN;
                 effective_pressure_limit = 0;
         end
@@ -26 +28 @@
                         self.Cmax = project3d(md,'vector',self.Cmax,'type','node');
                         self.m    = project3d(md,'vector',self.m,'type','element');
+                        if self.coupling==3 || self.coupling==4
+                                self.effective_pressure=project3d(md,'vector',self.effective_pressure,'type','node','layer',1);
+                        end
                 end % }}}
                 function self = setdefaultparameters(self) % {{{
 
+         self.coupling = 0;
                         self.effective_pressure_limit = 0;
 
@@ -36 +42 @@
                         %Early return
                         if ~ismember('StressbalanceAnalysis',analyses) & ~ismember('ThermalAnalysis',analyses), return; end
-                        md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1,'Inf',1,'>',0.);
+                        md = checkfield(md,'fieldname','friction.C','timeseries',1,'NaN',1,'Inf',1,'>=',0.);
                         md = checkfield(md,'fieldname','friction.Cmax','timeseries',1,'NaN',1,'Inf',1,'>',0.);
                         md = checkfield(md,'fieldname','friction.m','NaN',1,'Inf',1,'>',0.,'size',[md.mesh.numberofelements,1]);
                         md = checkfield(md,'fieldname','friction.effective_pressure_limit','numel',[1],'>=',0);
+         md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0:4]);
+         if self.coupling==3
+            md = checkfield(md,'fieldname','friction.effective_pressure','NaN',1,'Inf',1,'timeseries',1);
+         end
                 end % }}}
                 function disp(self) % {{{
@@ -52 +62 @@
                         fielddisplay(self,'Cmax','Iken''s bound (typically between 0.17 and 0.84) [SI]');
                         fielddisplay(self,'m','m exponent (generally taken as m = 1/n = 1/3)');
+                        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 % }}}
@@ -62 +74 @@
                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','m','format','DoubleMat','mattype',2);
                         WriteData(fid,prefix,'object',self,'class','friction','fieldname','effective_pressure_limit','format','Double');
+         WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer');
+         if self.coupling==3 || self.coupling==4
+            WriteData(fid,prefix,'class','friction','object',self,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+         end
                 end % }}}
         end