Index: ../trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp
===================================================================
--- ../trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp	(revision 23251)
+++ ../trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp	(revision 23252)
@@ -93,7 +93,7 @@
 }/*}}}*/
 
 /*For autodiff, we sometimes need to cast our vectors to passive*/
-#ifdef _HAVE_ADOLC_
+#ifdef _HAVE_AD_
 void GetPassiveVectorFromControlInputsx(Vector<IssmPDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data){/*{{{*/
 
 	/*Get active vector first*/
Index: ../trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp
===================================================================
--- ../trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp	(revision 23251)
+++ ../trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp	(revision 23252)
@@ -76,8 +76,9 @@
 		//fprintf(stderr, "*** Codipack CreateParametersAutodiff()\n");
 		/*initialize a placeholder to store solver pointers: {{{*/
 		/*Solver pointers depend on what type of solver we are implementing: */
-		options=OptionsFromAnalysis(parameters,DefaultAnalysisEnum); //options database is not filled in yet, use default.
-		ToolkitOptions::Init(options);
+		options=OptionsFromAnalysis(&toolkit,parameters,DefaultAnalysisEnum);
+		ToolkitOptions::Init(toolkit,options);
+		xDelete<char>(toolkit);
 
 		switch(IssmSolverTypeFromToolkitOptions()){
 			case MumpsEnum:{
Index: ../trunk-jpl/src/c/Makefile.am
===================================================================
--- ../trunk-jpl/src/c/Makefile.am	(revision 23251)
+++ ../trunk-jpl/src/c/Makefile.am	(revision 23252)
@@ -50,12 +50,15 @@
 					 ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\
 					 ./modules/BamgTriangulatex/BamgTriangulatex.cpp
 
-#do not include AmrBamg with ADOLC
+#do not include AmrBamg with AD
 if ADOLC
 else
+if CODIPACK
+else
 issm_sources += ./classes/AmrBamg.cpp
 endif
 endif
+endif
 #}}}
 #Core sources{{{
 issm_sources += ./datastructures/DataSet.cpp\
Index: ../trunk-jpl/src/c/cores/transient_core.cpp
===================================================================
--- ../trunk-jpl/src/c/cores/transient_core.cpp	(revision 23251)
+++ ../trunk-jpl/src/c/cores/transient_core.cpp	(revision 23252)
@@ -69,7 +69,7 @@
 	femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum);
 	if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,TransientRequestedOutputsEnum);
 
-	#if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
+	#if defined(_HAVE_BAMG_) && !defined(_HAVE_AD_)
 	if(amr_frequency){
 		femmodel->parameters->FindParam(&amr_restart,AmrRestartEnum);
 		if(amr_restart) femmodel->ReMesh();
@@ -77,7 +77,7 @@
 	#endif
 
 	if(isoceancoupling){ /*{{{*/
-		#ifndef _HAVE_ADOLC_
+		#ifndef _HAVE_AD_
 		if(VerboseSolution()) _printf0_("   ocean coupling: initialization \n");
 		int my_rank;
 		ISSM_MPI_Comm tomitgcmcomm;
@@ -246,7 +246,7 @@
 
 		if(isoceancoupling){ /*{{{*/
 
-			#ifndef _HAVE_ADOLC_
+			#ifndef _HAVE_AD_
 			if(VerboseSolution()) _printf0_("   ocean coupling: exchanging information\n");
 			int my_rank;
 			ISSM_MPI_Comm tomitgcmcomm;
@@ -459,7 +459,7 @@
 		/*Adaptive mesh refinement*/
 		if(amr_frequency){
 
-			#if !defined(_HAVE_ADOLC_)
+			#if !defined(_HAVE_AD_)
 			if(save_results) femmodel->WriteMeshInResults();
 			if(step%amr_frequency==0 && time<finaltime){
 				if(VerboseSolution()) _printf0_("   refining mesh\n");
@@ -467,7 +467,7 @@
 			}
 
 			#else
-			_error_("AMR not suppored with ADOLC");
+			_error_("AMR not suppored with AD");
 			#endif
 		}
 
Index: ../trunk-jpl/src/c/cores/controlm1qn3_core.cpp
===================================================================
--- ../trunk-jpl/src/c/cores/controlm1qn3_core.cpp	(revision 23251)
+++ ../trunk-jpl/src/c/cores/controlm1qn3_core.cpp	(revision 23252)
@@ -10,7 +10,7 @@
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
 
-#if defined (_HAVE_M1QN3_) && !defined(_HAVE_ADOLC_)
+#if defined (_HAVE_M1QN3_) && !defined(_HAVE_AD_)
 /*m1qn3 prototypes*/
 extern "C" void *ctonbe_; // DIS mode : Conversion
 extern "C" void *ctcabe_; // DIS mode : Conversion
Index: ../trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/FemModel.cpp	(revision 23251)
+++ ../trunk-jpl/src/c/classes/FemModel.cpp	(revision 23252)
@@ -2544,7 +2544,7 @@
 /*}}}*/
 
 /*AMR*/
-#if !defined(_HAVE_ADOLC_)
+#ifndef _HAVE_AD_
 void FemModel::ReMesh(void){/*{{{*/
 
 	/*Intermediaries*/
Index: ../trunk-jpl/src/c/classes/IoModel.cpp
===================================================================
--- ../trunk-jpl/src/c/classes/IoModel.cpp	(revision 23251)
+++ ../trunk-jpl/src/c/classes/IoModel.cpp	(revision 23252)
@@ -2634,7 +2634,7 @@
 		IssmDouble x_t(1.0), y_t(1.0);
 		tape_codi.registerInput(y_t);
 		int codi_allocn = 0;
-		this->FetchData(&codi_allocn, AutodiffTapeAllocEnum);
+		this->FetchData(&codi_allocn,"md.autodiff.tapeAlloc");
 		for(int i = 0;i < codi_allocn;++i) {
 			x_t = y_t * y_t;
 		}