Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 21489)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 21490)
@@ -1852,4 +1852,31 @@
 	AM_CONDITIONAL([SNOWPACK], [test x$HAVE_SNOWPACK = xyes])
 	dnl }}}
+	dnl neopz{{{
+	AC_ARG_WITH([neopz-dir],
+		AS_HELP_STRING([--with-neopz-dir=DIR], [neopz root directory.]),
+		[NEOPZ_ROOT=$withval],[NEOPZ_ROOT="no"]) 
+
+	dnl Check whether neopz is enabled
+	AC_MSG_CHECKING([for neopz])
+	if test "x$NEOPZ_ROOT" = "xno" ; then
+		HAVE_NEOPZ=no
+	else
+		HAVE_NEOPZ=yes
+		if ! test -d "$NEOPZ_ROOT"; then
+			AC_MSG_ERROR([neopz directory provided ($NEOPZ_ROOT) does not exist]);
+		fi
+	fi
+	AC_MSG_RESULT($HAVE_NEOPZ)
+	
+	dnl neopz headers and libraries
+	if test "x$HAVE_NEOPZ" == "xyes"; then
+	  NEOPZLIB="$NEOPZ_ROOT/lib/libpz.a"
+     NEOPZINCL=-I"$NEOPZ_ROOT/include"
+	  AC_DEFINE([_HAVE_NEOPZ_],[1],[with NEOPZ in ISSM src])
+	  AC_SUBST([NEOPZINCL])
+	  AC_SUBST([NEOPZLIB])
+	fi
+	AM_CONDITIONAL([NEOPZ], [test x$HAVE_NEOPZ = xyes])
+	dnl }}}
 
 	dnl Capabilities
@@ -1895,18 +1922,4 @@
 	AM_CONDITIONAL([KRIGING], [test x$HAVE_KRIGING = xyes])
 	AC_MSG_RESULT($HAVE_KRIGING)
-	dnl }}}
-	dnl with-amr{{{
-	AC_ARG_WITH([amr],
-		AS_HELP_STRING([--with-amr = YES],[compile with Adaptive Mesh Refinment capability (default is no)]),
-		[AMR=$withval],[AMR=no]) 
-	AC_MSG_CHECKING(for AMR capability compilation)
-
-	HAVE_AMR=no
-	if test "x$AMR" = "xyes"; then
-		HAVE_AMR=yes
-		AC_DEFINE([_HAVE_AMR_],[1],[with amr capability])
-	fi
-	AM_CONDITIONAL([AMR], [test x$HAVE_AMR = xyes])
-	AC_MSG_RESULT($HAVE_AMR)
 	dnl }}}
 	AX_ANALYSES_SELECTION
Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 21489)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 21490)
@@ -1,3 +1,3 @@
-AM_CPPFLAGS = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJ4INCL@
+AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJ4INCL@
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -530,6 +530,6 @@
 				  ./kml/KMLFileReadUtils.cpp
 #}}}
-#AMR sources  {{{
-amr_sources = ./classes/AdaptiveMeshRefinement.cpp
+#NEOPZ sources  {{{
+neopz_sources = ./classes/AdaptiveMeshRefinement.cpp
 #}}}
 #Modules sources{{{
@@ -616,6 +616,6 @@
 libISSMModules_la_SOURCES += $(kml_sources)
 endif
-if AMR
-libISSMModules_la_SOURCES += $(amr_sources)
+if NEOPZ
+libISSMModules_la_SOURCES += $(neopz_sources)
 endif
 libISSMModules_la_CXXFLAGS = $(ALLCXXFLAGS)
@@ -680,5 +680,5 @@
 
 #External packages
-LDADD +=  $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(PETSCLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB)  $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(AMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJ4LIB)
+LDADD +=  $(NEOPZLIB) $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(PETSCLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB)  $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(AMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJ4LIB)
 
 if FORTRAN
Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 21489)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 21490)
@@ -81,5 +81,5 @@
 	this->parameters->AddObject(new GenericParam<ISSM_MPI_Comm>(incomm,FemModelCommEnum));
 
-	#ifdef _HAVE_AMR_
+	#ifdef _HAVE_NEOPZ_
 	this->InitializeAdaptiveRefinement();
 	#endif
@@ -2914,5 +2914,5 @@
 #endif
 
-#ifdef _HAVE_AMR_
+#ifdef _HAVE_NEOPZ_
 void FemModel::InitializeAdaptiveRefinement(void){/*{{{*/
 	
Index: /issm/trunk-jpl/src/c/classes/FemModel.h
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.h	(revision 21489)
+++ /issm/trunk-jpl/src/c/classes/FemModel.h	(revision 21490)
@@ -138,5 +138,5 @@
 		#endif
 
-		#ifdef _HAVE_AMR_
+		#ifdef _HAVE_NEOPZ_
 		/*Adaptive mesh refinement methods*/
 		void InitializeAdaptiveRefinement(void);