Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/IoModel.cpp	(revision 23254)
+++ /issm/trunk-jpl/src/c/classes/IoModel.cpp	(revision 23255)
@@ -1762,5 +1762,5 @@
 	if(X) Xcount=*pXcount;
 
-	#ifdef _HAVE_ADOLC_ //cannot come here unless you are running AD mode, from DeclaredIndependents:
+	#ifdef _HAVE_AD_ //cannot come here unless you are running AD mode, from DeclaredIndependents:
 
 	/*Intermediaries*/
Index: /issm/trunk-jpl/src/c/cores/controlad_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/controlad_core.cpp	(revision 23254)
+++ /issm/trunk-jpl/src/c/cores/controlad_core.cpp	(revision 23255)
@@ -11,4 +11,5 @@
 #include "../solutionsequences/solutionsequences.h"
 
+/*This file is probably never used!*/
 #if defined (_HAVE_M1QN3_)  & defined (_HAVE_ADOLC_)
 /*m1qn3 prototypes {{{*/
Index: /issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp	(revision 23254)
+++ /issm/trunk-jpl/src/c/modules/FloatingiceMeltingRatePicox/FloatingiceMeltingRatePicox.cpp	(revision 23255)
@@ -78,5 +78,6 @@
 		IssmDouble val=sqrt(dmax_basin[i]/dist_max)*(maxbox-1);
 
-		#ifdef _HAVE_ADOLC_
+		#ifdef _HAVE_AD_
+		_error_("Check the implementation of floor below");
 		/*Do not use floor when AD is on*/
 		int k=0; while(k<val+.5){k++;}
Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp	(revision 23254)
+++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp	(revision 23255)
@@ -135,5 +135,5 @@
 void UpdateElementsAndMaterialsControlAD(Elements* elements,Parameters* parameters,Materials* materials, IoModel* iomodel){
 
-	#if defined(_HAVE_ADOLC_)
+	#if defined(_HAVE_AD_)
 	/*Intermediaries*/
 	int				num_independent_objects,M,N,M_par,N_par;
Index: /issm/trunk-jpl/src/c/shared/Elements/PrintArrays.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Elements/PrintArrays.cpp	(revision 23254)
+++ /issm/trunk-jpl/src/c/shared/Elements/PrintArrays.cpp	(revision 23255)
@@ -12,5 +12,5 @@
 	_printf_("\n");
 }
-#ifdef _HAVE_ADOLC_
+#ifdef _HAVE_AD_
 void printarray(IssmDouble* array,int lines,int cols){
 	_printf_("\n");
Index: /issm/trunk-jpl/src/c/shared/Elements/elements.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Elements/elements.h	(revision 23254)
+++ /issm/trunk-jpl/src/c/shared/Elements/elements.h	(revision 23255)
@@ -42,5 +42,5 @@
 /*Print arrays*/
 void printarray(IssmPDouble* array,int lines,int cols=1);
-#if _HAVE_ADOLC_  && !defined(_WRAPPERS_)
+#if _HAVE_AD_  && !defined(_WRAPPERS_)
 void printarray(IssmDouble* array,int lines,int cols=1);
 #endif
Index: /issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h	(revision 23254)
+++ /issm/trunk-jpl/src/c/toolkits/mpi/issmmpi.h	(revision 23255)
@@ -98,5 +98,5 @@
 template <class T> ISSM_MPI_Datatype TypeToMPIType(){assert(false);};
 template <> inline ISSM_MPI_Datatype TypeToMPIType<IssmDouble>(){return ISSM_MPI_DOUBLE;};
-#if defined(_HAVE_ADOLC_) && !defined(_WRAPPERS_) 
+#if defined(_HAVE_AD_) && !defined(_WRAPPERS_) 
 template <> inline ISSM_MPI_Datatype TypeToMPIType<IssmPDouble>(){return ISSM_MPI_PDOUBLE;};
 #endif
Index: /issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp	(revision 23254)
+++ /issm/trunk-jpl/src/c/toolkits/mumps/MumpsSolve.cpp	(revision 23255)
@@ -616,5 +616,6 @@
     dataHandler->addData(parameters); // we assume here that parameters is still intact when the reverse run is called
 
-    tape.pushExternalFunction(&MumpsSolve_codi_b, dataHandler, &MumpsSolve_codi_delete);
+	 tape.pushExternalFunction(&MumpsSolve_codi_b, dataHandler, &MumpsSolve_codi_delete);
+    //tape.pushExternalFunctionHandle(&MumpsSolve_codi_b, dataHandler, &MumpsSolve_codi_delete);
   } else {
     // if the tape is active valueB is stored in the dataHandler and deleted in the reverse sweep
Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp	(revision 23254)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp	(revision 23255)
@@ -21,5 +21,5 @@
 PetscMat::PetscMat(){/*{{{*/
 	this->matrix=NULL;
-	#ifdef _HAVE_ADOLC_
+	#ifdef _HAVE_AD_
 	this->amatrix=NULL;
 	#endif
Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h	(revision 23254)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.h	(revision 23255)
@@ -27,5 +27,5 @@
 		Mat matrix;
 
-		#ifdef _HAVE_ADOLC_
+		#ifdef _HAVE_AD_
 		IssmDouble* amatrix;
 		#endif
Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp	(revision 23254)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp	(revision 23255)
@@ -21,5 +21,5 @@
 PetscVec::PetscVec(){/*{{{*/
 	this->vector=NULL;
-	#ifdef _HAVE_ADOLC_
+	#ifdef _HAVE_AD_
 	this->avector=NULL;
 	#endif
Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.h	(revision 23254)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.h	(revision 23255)
@@ -25,5 +25,5 @@
 		Vec vector;
 
-		#ifdef _HAVE_ADOLC_
+		#ifdef _HAVE_AD_
 		IssmDouble* avector;
 		#endif