Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 22417)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 22418)
@@ -49,6 +49,5 @@
 					 ./modules/Bamgx/Bamgx.cpp\
 					 ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\
-					 ./modules/BamgTriangulatex/BamgTriangulatex.cpp\
-					 ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp
+					 ./modules/BamgTriangulatex/BamgTriangulatex.cpp
 
 #do not include AmrBamg with ADOLC
@@ -567,4 +566,5 @@
 			./modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp\
 			./modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp\
+			./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\
 			./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp\
 			./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp\
Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 22417)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 22418)
@@ -2628,9 +2628,5 @@
 
 	/*Finally: interpolate all inputs and insert them into the new elements.*/
-	#ifdef _HAVE_BAMG_
 	this->InterpolateInputs(new_vertices,new_elements);
-	#else
-	_error_("Cannot interpolate inputs without bamg");
-	#endif
 
 	/*Delete old structure and set new pointers*/
@@ -2871,5 +2867,4 @@
 }
 /*}}}*/
-#ifdef _HAVE_BAMG_
 void FemModel::InterpolateInputs(Vertices* newfemmodel_vertices,Elements* newfemmodel_elements){/*{{{*/
 	
@@ -2986,5 +2981,4 @@
 }
 /*}}}*/
-#endif
 void FemModel::WriteMeshInResults(void){/*{{{*/
 
@@ -3427,11 +3421,7 @@
 
 	/*Interpolate spc values and flags in the new partition*/
-	#ifdef _HAVE_BAMG_
 	InterpFromMeshToMesh2dx(&newspc,elementslist,x,y,numberofvertices,numberofelements,
 								spc,numberofvertices,numberofcols,
 								newx,newy,newnumberofvertices,NULL);
-	#else
-	_error_("cannot interpolate without bamg");
-	#endif
 	
 	/*Now, insert the interpolated constraints in the data set (constraints)*/
Index: /issm/trunk-jpl/src/c/classes/FemModel.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.h	(revision 22417)
+++ /issm/trunk-jpl/src/c/classes/FemModel.h	(revision 22418)
@@ -176,7 +176,5 @@
 		void CreateConstraints(Vertices* newfemmodel_vertices,int nodecounter,int constraintcounter,int analysis_enum,Constraints* newfemmodel_constraints);
 		void GetInputs(int* pnumP0inputs,IssmDouble** pP0inputs,int** pP0input_enums,int** pP0input_interp,int* pnumP1inputs,IssmDouble** pP1inputs,int** pP1input_enums,int** pP1input_interp);
-		#ifdef _HAVE_BAMG_
 		void InterpolateInputs(Vertices* newfemmodel_vertices,Elements* newfemmodel_elements);
-		#endif
 		void UpdateElements(int newnumberofelements,int* newelementslist,bool* my_elements,int nodecounter,int analysis_counter,Elements* newelements);
 		void ElementsAndVerticesPartitioning(int& newnumberofvertices,int& newnumberofelements,int& elementswidth,int* newelementslist,bool** pmy_elements,int** pmy_vertices);
Index: /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp	(revision 22417)
+++ /issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp	(revision 22418)
@@ -7,11 +7,15 @@
 #include "../../toolkits/toolkits.h"
 #include "../../classes/classes.h"
+
+#ifdef _HAVE_BAMG_
 #include "../../bamg/bamgobjects.h"
-
 using namespace bamg;
 using namespace std;
+#endif
 
 int InterpFromMeshToMesh2dx(double** pdata_interp,int* index_data,double* x_data,double* y_data,int nods_data,int nels_data,
 			double* data,int M_data,int N_data,double* x_interp,double* y_interp,int N_interp,Options* options){
+
+	#ifdef _HAVE_BAMG_
 
 	/*Output*/
@@ -172,4 +176,8 @@
 	xDelete<int>(connectivity);
 	*pdata_interp=data_interp;
+
+	#else
+	_error_("Cannot interpolate without bamg support");
+	#endif
 	return 1;
 }
Index: /issm/trunk-jpl/src/c/modules/modules.h
===================================================================
--- /issm/trunk-jpl/src/c/modules/modules.h	(revision 22417)
+++ /issm/trunk-jpl/src/c/modules/modules.h	(revision 22418)
@@ -10,5 +10,4 @@
 #include "./BamgConvertMeshx/BamgConvertMeshx.h"
 #include "./BamgTriangulatex/BamgTriangulatex.h"
-#include "./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h"
 #endif
 
@@ -44,4 +43,5 @@
 #include "./InterpFromMesh2dx/InterpFromMesh2dx.h"
 #include "./InterpFromGridToMeshx/InterpFromGridToMeshx.h"
+#include "./InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.h"
 #include "./InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.h"
 #include "./InterpFromMeshToGridx/InterpFromMeshToGridx.h"