Changeset 19851

Timestamp:

12/02/15 06:13:55 (9 years ago)

Author:

cborstad

Message:

BUG: incorrect enums were being marshalled for frictioncoulomb class

File:

• issm/trunk-jpl/src/m/classes/frictioncoulomb.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/frictioncoulomb.py

@@ -57 +57 @@
     def marshall(self,md,fid):    # {{{
         WriteData(fid,'enum',FrictionLawEnum(),'data',1,'format','Integer')
-        WriteData(fid,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',1)
-        WriteData(fid,'object',self,'fieldname','coefficientcoulomb','format','DoubleMat','mattype',1)
-        WriteData(fid,'object',self,'fieldname','p','format','DoubleMat','mattype',2)
-        WriteData(fid,'object',self,'fieldname','q','format','DoubleMat','mattype',2)
+        WriteData(fid,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'enum',FrictionCoefficientEnum())
+        WriteData(fid,'object',self,'fieldname','coefficientcoulomb','format','DoubleMat','mattype',1,'enum',FrictionCoefficientcoulombEnum())
+        WriteData(fid,'object',self,'fieldname','p','format','DoubleMat','mattype',2,'enum',FrictionPEnum())
+        WriteData(fid,'object',self,'fieldname','q','format','DoubleMat','mattype',2,'enum',FrictionQEnum())
     # }}}