Changeset 13432 for issm/trunk-jpl/src/c/modules/RequestedDependentsx/RequestedDependentsx.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/RequestedDependentsx/RequestedDependentsx.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/RequestedDependentsx/RequestedDependentsx.cpp

@@ -14 +14 @@
 
         int         i;
-        int         output_enum;
         bool        isautodiff      = false;
         IssmDouble  output_value;
-        Element    *element         = NULL;
-        int        *dependent_enums = NULL;
 
         int         num_dependents;
         IssmPDouble *dependents;
+        DataSet*    dependent_objects=NULL;
 
         /*AD mode on?: */
@@ -29 +27 @@
                 #ifdef _HAVE_ADOLC_
                 parameters->FindParam(&num_dependents,AutodiffNumDependentsEnum);
+                parameters->FindParam(&dependent_objects,AutodiffDependentObjectsEnum);
                 if(num_dependents){
                         dependents=xNew<IssmPDouble>(num_dependents);
-                        parameters->FindParam(&dependent_enums,&num_dependents,AutodiffDependentsEnum);
 
                         /*Go through our dependent variables, and compute the response:*/
-                        for(i=0;i<num_dependents;i++){
-                                Responsex(&output_value,elements,nodes,vertices,loads,materials,parameters,dependent_enums[i],false,0);
+                        for(i=0;i<dependent_objects->Size();i++){
+                                DependentObject* dep=(DependentObject*)dependent_objects->GetObjectByOffset(i);
+                                Responsex(&output_value,elements,nodes,vertices,loads,materials,parameters,dep->name,false,0);
                                 output_value>>=dependents[i];
                         }
                 }
+                delete dependent_objects;
                 #else
                 _error_("Should not be requesting dependents when an AD library is not available!");