Changeset 26744 for issm/trunk/src/m/classes/friction.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/friction.m (modified) (4 diffs)

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

@@ -6 +6 @@
 classdef friction
         properties (SetAccess=public) 
-                coefficient = NaN;
-                p           = NaN;
-                q           = NaN;
-                coupling    = 0;
-                effective_pressure = NaN;
+                coefficient              = NaN;
+                p                        = NaN;
+                q                        = NaN;
+                coupling                 = 0;
+                effective_pressure       = NaN;
                 effective_pressure_limit = 0;
         end
@@ -18 +18 @@
                         self.p=project3d(md,'vector',self.p,'type','element');
                         self.q=project3d(md,'vector',self.q,'type','element');
-                        switch self.coupling
-                                case 0
-                                case 1
-                                case 2
-                                case 3
-                                        self.effective_pressure=project3d(md,'vector',self.effective_pressure,'type','node','layer',1);
-                                case 4
-                                        self.effective_pressure=project3d(md,'vector',self.effective_pressure,'type','node','layer',1);
-                                otherwise
-                                        error('not supported yet');             
+                        if self.coupling==3 || self.coupling==4
+                                self.effective_pressure=project3d(md,'vector',self.effective_pressure,'type','node','layer',1);
                         end
                 end % }}}
@@ -57 +49 @@
                         md = checkfield(md,'fieldname','friction.coupling','numel',[1],'values',[0:4]);
                         md = checkfield(md,'fieldname','friction.effective_pressure_limit','numel',[1],'>=',0);
-                        switch self.coupling
-                                case 0
-                                case 1
-                                case 2
-                                case 3
-                                        md = checkfield(md,'fieldname','friction.effective_pressure','NaN',1,'Inf',1,'timeseries',1);
-                                case 4
-                                
-                                otherwise
-                                        error('not supported yet');
+         if self.coupling==3
+            md = checkfield(md,'fieldname','friction.effective_pressure','NaN',1,'Inf',1,'timeseries',1);
                         end
                 end % }}}
@@ -92 +76 @@
                         WriteData(fid,prefix,'class','friction','object',self,'fieldname','coupling','format','Integer');
                         WriteData(fid,prefix,'object',self,'class','friction','fieldname','effective_pressure_limit','format','Double');
-                        switch self.coupling
-                                case 0
-                                case 1
-                                case 2
-                                case 3
-                                        WriteData(fid,prefix,'class','friction','object',self,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                                case 4
-                                        WriteData(fid,prefix,'class','friction','object',self,'fieldname','effective_pressure','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                                otherwise
-                                        error('not supported yet');             
+                        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 % }}}