Changeset 18031

Timestamp:

05/20/14 12:53:01 (11 years ago)

Author:

cborstad

Message:

BUG: fixed marshalling of elementinterp as an enum

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

@@ -227 +227 @@
                                 WriteData(fid,'object',obj,'fieldname','stabilization','format','Integer');
                                 WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer');
-                                WriteData(fid,'object',obj,'fieldname','elementinterp','format','String');
+                                WriteData(fid,'enum',DamageElementinterpEnum(),'data',StringToEnum(self.elementinterp)[0],'format','Integer');
                                 WriteData(fid,'object',obj,'fieldname','penalty_threshold','format','Integer');
                                 WriteData(fid,'object',obj,'fieldname','penalty_lock','format','Integer');

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

@@ -166 +166 @@
                         WriteData(fid,'object',self,'fieldname','max_damage','format','Double')
                         WriteData(fid,'object',self,'fieldname','stabilization','format','Integer')
-                        WriteData(fid,'object',self,'fieldname','elementinterp','format','String')
+                        WriteData(fid,'object',self,'fieldname','maxiter','format','Integer')
+                        WriteData(fid,'enum',DamageElementinterpEnum(),'data',StringToEnum(self.elementinterp)[0],'format','Integer')
                         WriteData(fid,'object',self,'fieldname','penalty_threshold','format','Integer')
-                        WriteData(fid,'object',self,'fieldname','maxiter','format','Integer')
                         WriteData(fid,'object',self,'fieldname','penalty_lock','format','Integer')
                         WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double')