Changeset 16400

Timestamp:

10/11/13 15:07:56 (11 years ago)

Author:

Eric.Larour

Message:

CHG: trying autodiff output definition responses

Location:

issm/trunk-jpl/src

Files:

• c/classes/DependentObject.cpp (modified) (5 diffs)
• c/classes/DependentObject.h (modified) (2 diffs)
• c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (modified) (2 diffs)
• m/classes/autodiff.m (modified) (2 diffs)
• m/classes/autodiff.py (modified) (1 diff)

issm/trunk-jpl/src/c/classes/DependentObject.cpp

@@ -15 +15 @@
 /*FUNCTION DependentObject::DependentObject(){{{*/
 DependentObject::DependentObject(){
-        this->name=NoneEnum;
+        this->name=NulL;
         this->type=0;
         this->index=-1;
@@ -23 +23 @@
 DependentObject::DependentObject(int in_name, int in_type,int in_index){
 
-        this->name=in_name;
+        this->name=xNew<char>(strlen(in_name)+1); xMemCpy<char>(this->name,in_name,strlen(in_name)+1);
         this->type=in_type;
         this->index=in_index;
@@ -33 +33 @@
 /*FUNCTION DependentObject::~DependentObject() {{{*/
 DependentObject::~DependentObject(){ //destructor
+        xDelete<char>(this->name);
 }
 /*}}}*/
@@ -41 +42 @@
 
         _printf_("DependentObject:\n");
-        _printf_("   name: " << EnumToStringx(this->name) << "\n");
+        _printf_("   name: " << this->name << "\n");
         if(this->type==0)
                 _printf_("   type: scalar\n");
@@ -88 +89 @@
 void  DependentObject::Responsex(IssmDouble* poutput_value,FemModel* femmodel){
 
-        if(this->name==MassFluxEnum){
-
-                /*to identify the mass flux that will be computed, we need the index of the profile: */
-                femmodel->parameters->SetParam(this->index,IndexEnum);
+        /*Is this some special type of response for which we need to go in the output definitions? :*/
+        if (StringToEnumx(this->name,false)==-1){
+                *poutput_value=OutputDefinitionsResponsex(femmodel,this->name);
         }
-
-        femmodel->Responsex(poutput_value,this->name);
+        else femmodel->Responsex(poutput_value,this->name);
 
 }

issm/trunk-jpl/src/c/classes/DependentObject.h

@@ -17 +17 @@
         public:
 
-                int name;
+                char* name;
                 int type;  /*0: scalar, 1: vertex*/
                 int index;  /*0: scalar, 1: vertex*/
@@ -23 +23 @@
                 /*DependentObject constructors, destructors {{{*/
                 DependentObject();
-                DependentObject(int name, int type,int index);
+                DependentObject(char* name, int type,int index);
                 ~DependentObject();
                 /*}}}*/

issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp

@@ -15 +15 @@
         int         num_dependent_objects;
         int         num_dep=0;
-        int*        names=NULL;
+        char**      names=NULL;
         int*        types=NULL;
         int         dummy;
@@ -71 +71 @@
 
                 if(num_dependent_objects){
-                        iomodel->FetchData(&names,&dummy,&dummy,AutodiffDependentObjectNamesEnum);
+                        iomodel->FetchData(&names,&dummy,AutodiffDependentObjectNamesEnum);
                         iomodel->FetchData(&types,&dummy,&dummy,AutodiffDependentObjectTypesEnum);
                         iomodel->FetchData(&indices,&dummy,&dummy,AutodiffDependentObjectIndicesEnum);

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

@@ -101 +101 @@
 
                         if(num_dependent_objects),
-                                names=zeros(num_dependent_objects,1);
+                                names={};
                                 types=zeros(num_dependent_objects,1);
                                 indices=zeros(num_dependent_objects,1);
@@ -108 +108 @@
                                         dep=obj.dependents{i};
 
-                                        names(i)=StringToEnum(dep.name);
+                                        names{i}=dep.name;
                                         types(i)=dep.typetoscalar();
                                         indices(i)=dep.index;
                                 end
-                                WriteData(fid,'data',names,'enum',AutodiffDependentObjectNamesEnum(),'format','IntMat','mattype',3);
+                                WriteData(fid,'data',names,'enum',AutodiffDependentObjectNamesEnum(),'format','StringArray');
                                 WriteData(fid,'data',types,'enum',AutodiffDependentObjectTypesEnum(),'format','IntMat','mattype',3);
                                 WriteData(fid,'data',indices,'enum',AutodiffDependentObjectIndicesEnum(),'format','IntMat','mattype',3);

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

@@ -103 +103 @@
 
                 if num_dependent_objects:
-                        names=numpy.zeros(num_dependent_objects)
+                        names=[]
                         types=numpy.zeros(num_dependent_objects)
                         indices=numpy.zeros(num_dependent_objects)
 
                         for i,dep in enumerate(self.dependents):
-                                names[i]=StringToEnum(dep.name)[0]
+                                names[i]=dep.name
                                 types[i]=dep.typetoscalar()
                                 indices[i]=dep.index
 
-                        WriteData(fid,'data',names,'enum',AutodiffDependentObjectNamesEnum(),'format','IntMat','mattype',3)
+                        WriteData(fid,'data',names,'enum',AutodiffDependentObjectNamesEnum(),'format','StringArray')
                         WriteData(fid,'data',types,'enum',AutodiffDependentObjectTypesEnum(),'format','IntMat','mattype',3)
                         WriteData(fid,'data',indices,'enum',AutodiffDependentObjectIndicesEnum(),'format','IntMat','mattype',3)