Changeset 13550

Timestamp:

10/05/12 08:36:40 (12 years ago)

Author:

Eric.Larour

Message:

CHG: fixed bug. Solver pointers need to be allocated even when autodiff is not on

File:

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

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

@@ -111 +111 @@
                 parameters->AddObject(new DataSetParam(AutodiffIndependentObjectsEnum,iomodel->independent_objects));
                 /*}}}*/
-        /*initialize a placeholder to store solver pointers: {{{*/
-        GenericParam<Adolc_edf> *theAdolcEDF_p=new GenericParam<Adolc_edf>(AdolcParamEnum);
-        theAdolcEDF_p->GetParameterValue().myEDF_for_solverx_p=reg_ext_fct(EDF_for_solverx);
-        // to save some space:
-        // we know we won't use adolc inside of  the solver:
-        theAdolcEDF_p->GetParameterValue().myEDF_for_solverx_p->nestedAdolc=false;
-        // the solution vector is just allocated and doesn't have a meaningfull prior value
-        theAdolcEDF_p->GetParameterValue().myEDF_for_solverx_p->dp_y_priorRequired=false;
-         // the solver wrapper makes sure the matrix and the right hand side don't change
-        theAdolcEDF_p->GetParameterValue().myEDF_for_solverx_p->dp_x_changes=false;
-        parameters->AddObject(theAdolcEDF_p);
-        /*}}}*/
 
                 #endif
+        }
+                
+        #ifdef _HAVE_ADOLC_
+                /*initialize a placeholder to store solver pointers: {{{*/
+                GenericParam<Adolc_edf> *theAdolcEDF_p=new GenericParam<Adolc_edf>(AdolcParamEnum);
+                theAdolcEDF_p->GetParameterValue().myEDF_for_solverx_p=reg_ext_fct(EDF_for_solverx);
+                // to save some space:
+                // we know we won't use adolc inside of  the solver:
+                theAdolcEDF_p->GetParameterValue().myEDF_for_solverx_p->nestedAdolc=false;
+                // the solution vector is just allocated and doesn't have a meaningfull prior value
+                theAdolcEDF_p->GetParameterValue().myEDF_for_solverx_p->dp_y_priorRequired=false;
+                // the solver wrapper makes sure the matrix and the right hand side don't change
+                theAdolcEDF_p->GetParameterValue().myEDF_for_solverx_p->dp_x_changes=false;
+                parameters->AddObject(theAdolcEDF_p);
+                /*}}}*/
+        #endif
+        
+        /*Assign output pointer: */
+        *pparameters=parameters;
 
-                /*Assign output pointer: */
-                *pparameters=parameters;
-
-        }
 }