Changeset 16163

Timestamp:

09/17/13 21:32:19 (12 years ago)

Author:

cborstad

Message:

BUG: only marshall and checkconsistency for damage fields if isdamage=1

File:

• issm/trunk-jpl/src/m/classes/damage.py (modified) (2 diffs)

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

@@ -62 +62 @@
         # }}}
         def checkconsistency(self,md,solution,analyses):    # {{{
-        
-                md = checkfield(md,'damage.D','>=',0,'size',[md.mesh.numberofvertices])
-                md = checkfield(md,'damage.law','values',['undamaged','pralong'])
+
+                if self.isdamage:
+                        md = checkfield(md,'damage.D','>=',0,'size',[md.mesh.numberofvertices])
+                        md = checkfield(md,'damage.law','values',['undamaged','pralong'])
                 if self.law == 'pralong':
                         md = checkfield(md,'damage.c1','>=',0)
@@ -76 +77 @@
         def marshall(self,md,fid):    # {{{
 
-                WriteData(fid,'object',self,'class','damage','fieldname','D','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',self,'class','damage','fieldname','law','format','String')
-                if self.damage_law=='pralong':
+                WriteData(fid,'object',self,'class','damage','fieldname','isdamage','format','DoubleMat','mattype',1)
+                if self.isdamage:
+                        WriteData(fid,'object',self,'class','damage','fieldname','D','format','DoubleMat','mattype',1)
+                        WriteData(fid,'object',self,'class','damage','fieldname','law','format','String')
+                if self.law=='pralong':
                         WriteData(fid,'object',self,'class','damage','fieldname','c1','format','Double')
                         WriteData(fid,'object',self,'class','damage','fieldname','c2','format','Double')