Changeset 20690 for issm/trunk-jpl/src/m/classes/damage.js

Timestamp:

06/03/16 10:05:11 (9 years ago)

Author:

Mathieu Morlighem

Message:

NEW: marhsall strings instead of enums

File:

• issm/trunk-jpl/src/m/classes/damage.js (modified) (3 diffs)

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

@@ -70 +70 @@
                         if (this.isdamage){
                                 checkfield(md,'fieldname','damage.law','numel',[1],'values',[0,1,2]);
-                                checkfield(md,'fieldname','damage.D','>=',0,'<=',self.max_damage,'size',[md.mesh.numberofvertices ,1]);
+                                checkfield(md,'fieldname','damage.D','>=',0,'<=',this.max_damage,'size',[md.mesh.numberofvertices ,1]);
                                 checkfield(md,'fieldname','damage.spcdamage','Inf',1,'timeseries',1);
                                 checkfield(md,'fieldname','damage.max_damage','<',1,'>=',0);
@@ -94 +94 @@
                 this.marshall=function(md,fid) { //{{{
                 
-                        WriteData(fid,'object',this,'fieldname','isdamage','format','Boolean');
+                        WriteData(fid,prefix,'object',this,'fieldname','isdamage','format','Boolean');
                         if (this.isdamage){
-                                WriteData(fid,'object',this,'fieldname','law','format','Integer');
-                                WriteData(fid,'object',this,'fieldname','D','format','DoubleMat','mattype',1);
-                                WriteData(fid,'object',this,'fieldname','spcdamage','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
-                                WriteData(fid,'object',this,'fieldname','max_damage','format','Double');
+                                WriteData(fid,prefix,'object',this,'fieldname','law','format','Integer');
+                                WriteData(fid,prefix,'object',this,'fieldname','D','format','DoubleMat','mattype',1);
+                                WriteData(fid,prefix,'object',this,'fieldname','spcdamage','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1);
+                                WriteData(fid,prefix,'object',this,'fieldname','max_damage','format','Double');
 
-                                WriteData(fid,'object',this,'fieldname','stabilization','format','Integer');
-                                WriteData(fid,'object',this,'fieldname','maxiter','format','Integer');
-                                WriteData(fid,'enum',DamageElementinterpEnum(),'data',StringToEnum(this.elementinterp),'format','Integer');
-                                WriteData(fid,'object',this,'fieldname','stress_threshold','format','Double');
-                                WriteData(fid,'object',this,'fieldname','kappa','format','Double');
-                                WriteData(fid,'object',this,'fieldname','c1','format','Double');
-                                WriteData(fid,'object',this,'fieldname','c2','format','Double');
-                                WriteData(fid,'object',this,'fieldname','c3','format','Double');
-                                WriteData(fid,'object',this,'fieldname','c4','format','Double');
-                                WriteData(fid,'object',this,'fieldname','healing','format','Double');
-                                WriteData(fid,'object',this,'fieldname','equiv_stress','format','Integer');
+                                WriteData(fid,prefix,'object',this,'fieldname','stabilization','format','Integer');
+                                WriteData(fid,prefix,'object',this,'fieldname','maxiter','format','Integer');
+                                WriteData(fid,prefix,'name','md.damage.elementinterp','data',StringToEnum(this.elementinterp),'format','Integer');
+                                WriteData(fid,prefix,'object',this,'fieldname','stress_threshold','format','Double');
+                                WriteData(fid,prefix,'object',this,'fieldname','kappa','format','Double');
+                                WriteData(fid,prefix,'object',this,'fieldname','c1','format','Double');
+                                WriteData(fid,prefix,'object',this,'fieldname','c2','format','Double');
+                                WriteData(fid,prefix,'object',this,'fieldname','c3','format','Double');
+                                WriteData(fid,prefix,'object',this,'fieldname','c4','format','Double');
+                                WriteData(fid,prefix,'object',this,'fieldname','healing','format','Double');
+                                WriteData(fid,prefix,'object',this,'fieldname','equiv_stress','format','Integer');
                         }
 
@@ -123 +123 @@
                         }
                         if (this.isdamage){
-                                WriteData(fid,'data',outputs,'enum',DamageEvolutionRequestedOutputsEnum(),'format','StringArray');
+                                WriteData(fid,prefix,'data',outputs,'name','md.damage.requested_outputs','format','StringArray');
                         }