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

Timestamp:

09/24/12 22:26:49 (12 years ago)

Author:

Eric.Larour

Message:

CHG: new way of handling independent and dependent objects. We create a dataset for
each of these objects, so that we do not confuse num_dependents and num_dependent_objects,
same thing for indepedndents. Makes handling of Autodiff drivers easier too.

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (modified) (2 diffs)

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

@@ -14 +14 @@
 void CreateParametersAutodiff(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type){
         
-        int         i,j;
+        int         i;
         Parameters *parameters       = NULL;
         bool        autodiff_analysis;
-        int*        dependents       = NULL;
-        int         num_dependents;
-        int*        independents       = NULL;
-        int         num_independents;
-        int         numberofvertices;
+        int         num_dependent_objects;
+        int         num_dep=0;
+        int*        names=NULL;
+        int*        types=NULL;
+        int         dummy;
+        
         IssmDouble* xp=NULL;
+        IssmDouble* xp_backup=NULL;
+        int         num_ind,local_num_ind;
+        DataSet*    dependent_objects=NULL;
         
         /*Get parameters: */
@@ -32 +36 @@
         if(autodiff_analysis){
 
-                iomodel->Constant(&num_independents,AutodiffNumIndependentsEnum);
-                iomodel->Constant(&num_dependents,AutodiffNumDependentsEnum);
-                iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
+                /*retrieve driver: */
+                parameters->AddObject(iomodel->CopyConstantObject(AutodiffDriverEnum));
+                parameters->AddObject(iomodel->CopyConstantObject(AutodiffFosForwardIndexEnum));
 
-                /*recover dependents: */
-                parameters->AddObject(iomodel->CopyConstantObject(AutodiffNumDependentsEnum));
-                if(num_dependents){
-                        iomodel->FetchData(&dependents,NULL,&num_dependents,AutodiffDependentsEnum);
-                        parameters->AddObject(new IntVecParam(AutodiffDependentsEnum,dependents,num_dependents));
+                /*Deal with dependents first: {{{*/
+                iomodel->Constant(&num_dependent_objects,AutodiffNumDependentObjectsEnum);
+                dependent_objects=new DataSet();
+                num_dep=0;
+                
+                if(num_dependent_objects){
+                        iomodel->FetchData(&names,&dummy,&dummy,AutodiffDependentObjectNamesEnum);
+                        iomodel->FetchData(&types,&dummy,&dummy,AutodiffDependentObjectTypesEnum);
+
+                        for(i=0;i<num_dependent_objects;i++){
+                                DependentObject* dep=new DependentObject(names[i],types[i]);
+                                dependent_objects->AddObject(dep);
+                                num_dep+=dep->NumDependents();
+                        }
+
+                        /*Free ressources:*/
+                        xDelete<int>(names);
+                        xDelete<int>(types);
                 }
+                parameters->AddObject(new DataSetParam(AutodiffDependentObjectsEnum,dependent_objects));
+                parameters->AddObject(new IntParam(AutodiffNumDependentsEnum,num_dep));
 
-                /*recover independents: */
-                parameters->AddObject(iomodel->CopyConstantObject(AutodiffNumIndependentsEnum));
-                if(num_independents){
-                        iomodel->FetchData(&independents,NULL,&num_independents,AutodiffIndependentsEnum);
-                        parameters->AddObject(new IntVecParam(AutodiffIndependentsEnum,independents,num_independents));
+                delete dependent_objects;
+                /*}}}*/
 
-                        /*Build state vector, value at which we compute our gradients of dependent variables in adolc: the xp vector  */
-                        xp=xNew<IssmDouble>(num_independents*numberofvertices);
-                        for(i=0;i<num_independents;i++){
-                                IssmDouble* values=iomodel->data[independents[i]];
-                                for(j=0;j<numberofvertices;j++){
-                                        xp[i*numberofvertices+j]=values[j];
-                                }
+                /*Deal with independents: {{{*/
+
+                /*Independents have already been recovered in iomodel->DeclareIndependents. Just do some more processing. 
+                 *In particular, figure out num_independents, and create the state vector xp, or size num_independents x 1 :*/
+                num_ind=0;
+                for(i=0;i<iomodel->independent_objects->Size();i++){
+                        IndependentObject* ind=(IndependentObject*)iomodel->independent_objects->GetObjectByOffset(i);
+                        num_ind+=ind->NumIndependents();
+                }
+                if(num_ind){
+                        xp=xNew<IssmDouble>(num_ind);
+                        xp_backup=xp;
+                        for(i=0;i<iomodel->independent_objects->Size();i++){
+                                IndependentObject* ind=(IndependentObject*)iomodel->independent_objects->GetObjectByOffset(i);
+                                ind->FillIndependents(iomodel->data,xp);
+                                local_num_ind=ind->NumIndependents(); xp=xp+local_num_ind;
                         }
-                        parameters->AddObject(new DoubleVecParam(AutodiffXpEnum,xp,num_independents*numberofvertices));
+                        xp=xp_backup; parameters->AddObject(new DoubleVecParam(AutodiffXpEnum,xp,num_ind));
                 }
+                parameters->AddObject(new IntParam(AutodiffNumIndependentsEnum,num_ind));
+
+                /*Don't forget to copy  iomodel->independent_objects to parameters: */
+                parameters->AddObject(new DataSetParam(AutodiffIndependentObjectsEnum,iomodel->independent_objects));
+                /*}}}*/
 
                 /*Assign output pointer: */