Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 21849)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 21850)
@@ -4316,5 +4316,5 @@
 #endif
 
-#ifdef _HAVE_BAMG_
+#if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
 void FemModel::ReMeshBamg(int* pnewnumberofvertices,int* pnewnumberofelements,IssmDouble** pnewx,IssmDouble** pnewy,IssmDouble** pnewz,int** pnewelementslist){/*{{{*/
 
@@ -4414,5 +4414,5 @@
 #endif
 
-#ifdef _HAVE_NEOPZ_
+#if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
 void FemModel::ReMeshNeopz(int* pnewnumberofvertices,int* pnewnumberofelements,IssmDouble** pnewx,IssmDouble** pnewy,IssmDouble** pnewz,int** pnewelementslist){/*{{{*/
 
Index: /issm/trunk-jpl/src/c/classes/FemModel.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.h	(revision 21849)
+++ /issm/trunk-jpl/src/c/classes/FemModel.h	(revision 21850)
@@ -20,8 +20,8 @@
 class Profiler;
 class Elements;
-#ifdef _HAVE_NEOPZ_
+#if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
 #include "./AdaptiveMeshRefinement.h"
 #endif
-#ifdef _HAVE_BAMG_
+#if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
 #include "./AmrBamg.h"
 #endif
@@ -51,9 +51,9 @@
 
 		//FIXME: do we want only one class and have virtual functions? or keep 2 classes, at least rename AdaptiveMeshRefinement -> AmrNeopz
-		#ifdef _HAVE_NEOPZ_
+		#if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
 		AdaptiveMeshRefinement *amr;		  //adaptive mesh refinement object. It keeps coarse mesh and execute refinement process
 		#endif
 
-		#ifdef _HAVE_BAMG_
+		#if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
 		AmrBamg *amrbamg; //adaptive mesh refinement object. It keeps coarse mesh and execute refinement process
 		#endif
@@ -177,10 +177,10 @@
 		void MeanGroundedIceLevelSet(IssmDouble** pmasklevelset);
 
-		#ifdef _HAVE_BAMG_
+		#if defined(_HAVE_BAMG_) && !defined(_HAVE_ADOLC_)
 		void ReMeshBamg(int* pnewnumberofvertices,int* pnewnumberofelements,IssmDouble** pnewx,IssmDouble** pnewy,IssmDouble** pnewz,int** pnewelementslist);
 		void InitializeAdaptiveRefinementBamg(void);
 		#endif
 
-		#ifdef _HAVE_NEOPZ_
+		#if defined(_HAVE_NEOPZ_) && !defined(_HAVE_ADOLC_)
 		/*Adaptive mesh refinement methods*/
 		void ReMeshNeopz(int* pnewnumberofvertices,int* pnewnumberofelements,IssmDouble** pnewx,IssmDouble** pnewy,IssmDouble** pnewz,int** pnewelementslist);