Changeset 19496

Timestamp:

08/14/15 16:29:12 (10 years ago)

Author:

glperez

Message:

BUG: Minor order change to make sure fix for test3015 does not blow up non AD builds.

File:

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

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

@@ -30 +30 @@
         iomodel->Constant(&autodiff_analysis,AutodiffIsautodiffEnum);
 
+        #ifdef _HAVE_ADOLC_
                 /*initialize a placeholder to store solver pointers: {{{*/
                 GenericParam<Adolc_edf> *theAdolcEDF_p=new GenericParam<Adolc_edf>(AdolcParamEnum);
@@ -70 +71 @@
                 xDelete<char>(options);
                 /*}}}*/
+
         if(autodiff_analysis){
-
-        #ifdef _HAVE_ADOLC_
-
                 /*Copy some parameters from IoModel to parameters dataset: {{{*/
                 parameters->AddObject(iomodel->CopyConstantObject(AutodiffKeepEnum));