Changeset 13542 for issm/trunk-jpl/src/c/solutions/issm.cpp

Timestamp:

10/04/12 18:08:49 (12 years ago)

Author:

Eric.Larour

Message:

CHG: transferred AD statements to CreateParametersAutodiff, namely
the creation of an AdolcEdf parameter to holds solver pointers.

File:

• issm/trunk-jpl/src/c/solutions/issm.cpp (modified) (2 diffs)

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

@@ -61 +61 @@
         /*Create femmodel, using input file: */
         profiler->Tag(StartInit);
-        
         femmodel=new FemModel(rootpath,binfilename,outbinfilename,solution_type,analyses,numanalyses);
         
@@ -83 +82 @@
         profiler->Tag(FinishInit);
         
-        /*If running AD, then initialize a placeholder with which to work: */
-        #ifdef _HAVE_ADOLC_
-        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;
-        femmodel->parameters->AddObject(theAdolcEDF_p);
-        #else
-        if(autodiff) _error_("ISSM was not compiled with ADOLC support, cannot carry out autodiff analysis!");
-        #endif
-
         _pprintLine_("call computational core:");
         profiler->Tag(StartCore); solutioncore(femmodel); profiler->Tag(FinishCore);