Changeset 13700

Timestamp:

10/16/12 13:40:42 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moving RequestedDepentsx to FemModel + fixing issues on ADOLC compile

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/FemModel.cpp (modified) (3 diffs)
• classes/FemModel.h (modified) (1 diff)
• modules/RequestedDependentsx (deleted)
• modules/modules.h (modified) (1 diff)
• solutions/diagnostic_core.cpp (modified) (1 diff)
• solutions/prognostic_core.cpp (modified) (1 diff)
• solutions/transient_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -318 +318 @@
                                         ./modules/ConstraintsStatex/ConstraintsStatex.h\
                                         ./modules/ConstraintsStatex/ConstraintsStateLocal.h\
-                                        ./modules/RequestedDependentsx/RequestedDependentsx.h\
-                                        ./modules/RequestedDependentsx/RequestedDependentsx.cpp\
                                         ./modules/ResetConstraintsx/ResetConstraintsx.h\
                                         ./modules/ResetConstraintsx/ResetConstraintsx.cpp\

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

@@ -508 +508 @@
 }
 /*}}}*/
+void FemModel::RequestedDependentsx(void){/*{{{*/
+
+
+        int         i;
+        bool        isautodiff      = false;
+        IssmDouble  output_value;
+
+        int         num_dependents;
+        IssmPDouble *dependents;
+        DataSet*    dependent_objects=NULL;
+
+        /*AD mode on?: */
+        parameters->FindParam(&isautodiff,AutodiffIsautodiffEnum);
+
+        if(isautodiff){
+                #ifdef _HAVE_ADOLC_
+                parameters->FindParam(&num_dependents,AutodiffNumDependentsEnum);
+                parameters->FindParam(&dependent_objects,AutodiffDependentObjectsEnum);
+                if(num_dependents){
+                        dependents=xNew<IssmPDouble>(num_dependents);
+
+                        /*Go through our dependent variables, and compute the response:*/
+                        for(i=0;i<dependent_objects->Size();i++){
+                                DependentObject* dep=(DependentObject*)dependent_objects->GetObjectByOffset(i);
+                                dep->Responsex(&output_value,this);
+                                output_value>>=dependents[i];
+                        }
+                }
+                delete dependent_objects;
+                #else
+                _error_("Should not be requesting dependents when an AD library is not available!");
+                #endif
+        }
+}
+/*}}}*/
 #ifdef _HAVE_CONTROL_
 void FemModel::ThicknessAbsGradientx( IssmDouble* pJ, bool process_units, int weight_index){/*{{{*/
@@ -537 +572 @@
 }
 /*}}}*/
-#endif
-
-#ifdef  _HAVE_DAKOTA_
 void FemModel::CostFunctionx(IssmDouble* pJ){/*{{{*/
 
@@ -568 +600 @@
 }
 /*}}}*/
+#endif
+
+#ifdef  _HAVE_DAKOTA_
 void FemModel::DakotaResponsesx(double* d_responses,char** responses_descriptors,int numresponsedescriptors,int d_numresponses){/*{{{*/
 

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

@@ -64 +64 @@
                 /*Modules: {{{*/
                  #ifdef  _HAVE_DAKOTA_
-                void CostFunctionx( IssmDouble* pJ);
                 void DakotaResponsesx(double* d_responses,char** responses_descriptors,int numresponsedescriptors,int d_numresponses);
                 #endif
 
                 void RequestedOutputsx(int* requested_outputs, int numoutputs);
+                void RequestedDependentsx(void);
                 void Responsex(IssmDouble* presponse,int response_descriptor_enum,bool process_units,int weight_index);
                 void Responsex(IssmDouble* presponse,const char* response_descriptor,bool process_units,int weight_index);
                 #ifdef _HAVE_CONTROL_
+                void CostFunctionx( IssmDouble* pJ);
                 void ThicknessAbsGradientx( IssmDouble* pJ, bool process_units,int weight_index);
                 #endif

issm/trunk-jpl/src/c/modules/modules.h

@@ -98 +98 @@
 #include "./Reducevectorgtosx/Reducevectorgtosx.h"
 #include "./Reducevectorgtofx/Reducevectorgtofx.h"
-#include "./RequestedDependentsx/RequestedDependentsx.h"
 #include "./ResetConstraintsx/ResetConstraintsx.h"
 #include "./ResetCoordinateSystemx/ResetCoordinateSystemx.h"

issm/trunk-jpl/src/c/solutions/diagnostic_core.cpp

@@ -105 +105 @@
         }
 
-        if(solution_type==DiagnosticSolutionEnum)RequestedDependentsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+        if(solution_type==DiagnosticSolutionEnum)femmodel->RequestedDependentsx();
 
         /*Free ressources:*/

issm/trunk-jpl/src/c/solutions/prognostic_core.cpp

@@ -54 +54 @@
         }
 
-        if(solution_type==PrognosticSolutionEnum)RequestedDependentsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+        if(solution_type==PrognosticSolutionEnum)femmodel->RequestedDependentsx();
 
         /*Free ressources:*/

issm/trunk-jpl/src/c/solutions/transient_core.cpp

@@ -152 +152 @@
         }
 
-        RequestedDependentsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+        femmodel->RequestedDependentsx();
 
         /*Free ressources:*/