Changeset 25836 for issm/trunk/src/m/classes/friction.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/friction.m (modified) (3 diffs)

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

@@ -1 +1 @@
 %FRICTION class definition
 %
-%   Usage:
-%      friction=friction();
+%       Usage:
+%               friction=friction();
 
 classdef friction
@@ -66 +66 @@
                                 
                                 otherwise
-                                        error('not supported yet');             
+                                        error('not supported yet');
                         end
                 end % }}}
@@ -79 +79 @@
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
-                        yts=md.constants.yts;
-
                         WriteData(fid,prefix,'name','md.friction.law','data',1,'format','Integer');
-                        WriteData(fid,prefix,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        if(size(self.coefficient,1)==md.mesh.numberofvertices | size(self.coefficient,1)==md.mesh.numberofvertices+1),
+                                mattype=1;
+                                tsl = md.mesh.numberofvertices;
+                        else
+                                mattype=2;
+                                tsl = md.mesh.numberofelements;
+                        end
+                        WriteData(fid,prefix,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',mattype,'timeserieslength',tsl+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'fieldname','p','format','DoubleMat','mattype',2);
                         WriteData(fid,prefix,'object',self,'fieldname','q','format','DoubleMat','mattype',2);