Changeset 20973

Timestamp:

07/21/16 14:14:37 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to debug AD

Location:

issm/trunk-jpl/src/m/classes

Files:

• autodiff.m (modified) (2 diffs)
• autodiff.py (modified) (1 diff)

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

@@ -122 +122 @@
 
                         if(num_independent_objects),
-                                names=zeros(num_independent_objects,1);
+                                names=cell(num_independent_objects,1);
                                 types=zeros(num_independent_objects,1);
 
@@ -128 +128 @@
                                         indep=self.independents{i};
 
-                                        names(i)=StringToEnum(indep.name);
+                                        names{i}=indep.name;
                                         types(i)=indep.typetoscalar();
                                 end
-                                WriteData(fid,prefix,'data',names,'name','md.autodiff.independent_object_names','format','IntMat','mattype',3);
+                                WriteData(fid,prefix,'data',names,'name','md.autodiff.independent_object_names','format','StringArray');
                                 WriteData(fid,prefix,'data',types,'name','md.autodiff.independent_object_types','format','IntMat','mattype',3);
                         end

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

@@ -122 +122 @@
 
                 if num_independent_objects:
-                        names=numpy.zeros(num_independent_objects)
+                        names=[None] * num_independent_objects
                         types=numpy.zeros(num_independent_objects)
 
                         for i,indep in enumerate(self.independents):
-                                names[i]=StringToEnum(indep.name)[0]
+                                names[i]=indep.name
                                 types[i]=indep.typetoscalar()
 
-                        WriteData(fid,prefix,'data',names,'name','md.autodiff.independent_object_names','format','IntMat','mattype',3)
+                        WriteData(fid,prefix,'data',names,'name','md.autodiff.independent_object_names','format','StringArray')
                         WriteData(fid,prefix,'data',types,'name','md.autodiff.independent_object_types','format','IntMat','mattype',3)
                 #}}}