Changeset 16179

Timestamp:

09/18/13 17:14:52 (12 years ago)

Author:

cborstad

Message:

CHG: class does not need to be passed to WriteData unless the class name is different

Location:

issm/trunk-jpl/src/m/classes

Files:

• damage.m (modified) (1 diff)
• damage.py (modified) (1 diff)

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

@@ -85 +85 @@
                 function marshall(obj,md,fid) % {{{
                 
-                        WriteData(fid,'object',obj,'class','damage','fieldname','isdamage','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'class','damage','fieldname','D','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','isdamage','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','D','format','DoubleMat','mattype',1);
                         if obj.isdamage,
-                                WriteData(fid,'object',obj,'class','damage','fieldname','law','format','String');
+                                WriteData(fid,'object',obj,'fieldname','law','format','String');
                         end
                         if strcmpi(obj.law,'pralong'),
-                                WriteData(fid,'object',obj,'class','damage','fieldname','c1','format','Double');
-                                WriteData(fid,'object',obj,'class','damage','fieldname','c2','format','Double');
-                                WriteData(fid,'object',obj,'class','damage','fieldname','c3','format','Double');
-                                WriteData(fid,'object',obj,'class','damage','fieldname','c4','format','Double');
-                                WriteData(fid,'object',obj,'class','damage','fieldname','stress_threshold','format','Double');
+                                WriteData(fid,'object',obj,'fieldname','c1','format','Double');
+                                WriteData(fid,'object',obj,'fieldname','c2','format','Double');
+                                WriteData(fid,'object',obj,'fieldname','c3','format','Double');
+                                WriteData(fid,'object',obj,'fieldname','c4','format','Double');
+                                WriteData(fid,'object',obj,'fieldname','stress_threshold','format','Double');
                         end
 

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

@@ -77 +77 @@
         def marshall(self,md,fid):    # {{{
 
-                WriteData(fid,'object',self,'class','damage','fieldname','isdamage','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',self,'class','damage','fieldname','D','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'fieldname','isdamage','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'fieldname','D','format','DoubleMat','mattype',1)
                 if self.isdamage:
-                        WriteData(fid,'object',self,'class','damage','fieldname','law','format','String')
+                        WriteData(fid,'object',self,'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')
-                        WriteData(fid,'object',self,'class','damage','fieldname','c3','format','Double')
-                        WriteData(fid,'object',self,'class','damage','fieldname','c4','format','Double')
-                        WriteData(fid,'object',self,'class','damage','fieldname','stress_threshold','format','Double')
+                        WriteData(fid,'object',self,'fieldname','c1','format','Double')
+                        WriteData(fid,'object',self,'fieldname','c2','format','Double')
+                        WriteData(fid,'object',self,'fieldname','c3','format','Double')
+                        WriteData(fid,'object',self,'fieldname','c4','format','Double')
+                        WriteData(fid,'object',self,'fieldname','stress_threshold','format','Double')
         # }}}