Index: /issm/trunk-jpl/externalpackages/adolc/install-mac-with_ampi.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/adolc/install-mac-with_ampi.sh	(revision 25801)
+++ /issm/trunk-jpl/externalpackages/adolc/install-mac-with_ampi.sh	(revision 25801)
@@ -0,0 +1,38 @@
+#!/bin/bash
+set -eu
+
+
+## Environment
+#
+export CFLAGS="-O2 -L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi"
+export CXXFLAGS="-O2 -L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi"
+
+# Cleanup
+rm -rf install src
+mkdir install src
+
+# Download source
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/ADOL-C.tar.gz" "ADOL-C.tar.gz"
+
+# Unpack source
+tar -zxvf ADOL-C.tar.gz
+
+# Configure
+cd src
+./configure \
+	--prefix="${ISSM_DIR}/externalpackages/adolc/install" \
+	--libdir="${ISSM_DIR}/externalpackages/adolc/install/lib" \
+	--with-mpi-root="${ISSM_DIR}/externalpackages/petsc/install" \
+	--enable-ampi \
+	--with-ampi="${ISSM_DIR}/externalpackages/adjoinablempi/install" \
+	--with-soname=adolc \
+	--disable-tapedoc-values
+
+# Compile and install
+if [ $# -eq 0 ]; then
+	make V=1
+	make V=1 install
+else
+	make V=1 -j $1
+	make V=1 install -j $1
+fi
Index: /issm/trunk-jpl/externalpackages/adolc/install-with_ampi.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/adolc/install-with_ampi.sh	(revision 25801)
+++ /issm/trunk-jpl/externalpackages/adolc/install-with_ampi.sh	(revision 25801)
@@ -0,0 +1,45 @@
+#!/bin/bash
+set -eu
+
+
+# Keeping the following commented line for potential future use.
+#git clone https://gitlab.com/adol-c/adol-c.git src
+
+## Environment
+#
+export CFLAGS="-O2 -L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi"
+export CXXFLAGS="-O2 -std=c++11 -L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi"
+
+# Cleanup
+rm -rf install src
+mkdir install src
+
+# Download source
+${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/ADOL-C.tar.gz" "ADOL-C.tar.gz"
+
+# Unpack source
+tar -zxvf ADOL-C.tar.gz
+
+# Configure
+cd src
+./configure \
+	--prefix=${ISSM_DIR}/externalpackages/adolc/install \
+	--libdir=${ISSM_DIR}/externalpackages/adolc/install/lib \
+	--with-mpi-root=${ISSM_DIR}/externalpackages/petsc/install \
+	--enable-ampi \
+	--with-ampi=${ISSM_DIR}/externalpackages/adjoinablempi/install \
+	--with-soname=adolc \
+	--disable-tapedoc-values
+
+# Clean
+make clean
+
+# Compile
+if [ $# -eq 0 ]; then
+	make V=1
+else
+	make -j $1 V=1
+fi
+
+# Install
+make V=1 install
Index: sm/trunk-jpl/externalpackages/adolc/install-withampi.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/adolc/install-withampi.sh	(revision 25800)
+++ 	(revision )
@@ -1,45 +1,0 @@
-#!/bin/bash
-set -eu
-
-
-# Keeping the following commented line for potential future use.
-#git clone https://gitlab.com/adol-c/adol-c.git src
-
-## Environment
-#
-export CFLAGS="-O2 -L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi"
-export CXXFLAGS="-O2 -std=c++11 -L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi"
-
-# Cleanup
-rm -rf install src
-mkdir install src
-
-# Download source
-${ISSM_DIR}/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/ADOL-C.tar.gz" "ADOL-C.tar.gz"
-
-# Unpack source
-tar -zxvf ADOL-C.tar.gz
-
-# Configure
-cd src
-./configure \
-	--prefix=${ISSM_DIR}/externalpackages/adolc/install \
-	--libdir=${ISSM_DIR}/externalpackages/adolc/install/lib \
-	--with-mpi-root=${ISSM_DIR}/externalpackages/petsc/install \
-	--enable-ampi \
-	--with-ampi=${ISSM_DIR}/externalpackages/adjoinablempi/install \
-	--with-soname=adolc \
-	--disable-tapedoc-values
-
-# Clean
-make clean
-
-# Compile
-if [ $# -eq 0 ]; then
-	make V=1
-else
-	make -j $1 V=1
-fi
-
-# Install
-make V=1 install
Index: /issm/trunk-jpl/jenkins/linux64_caladan_ampi
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_caladan_ampi	(revision 25800)
+++ /issm/trunk-jpl/jenkins/linux64_caladan_ampi	(revision 25801)
@@ -47,5 +47,5 @@
 	triangle		install-linux.sh
 	adjoinablempi	install.sh
-	adolc			install-withampi.sh
+	adolc			install-with_ampi.sh
 	shell2junit		install.sh
 "
Index: /issm/trunk-jpl/jenkins/pine_island-mac-adolc-ampion
===================================================================
--- /issm/trunk-jpl/jenkins/pine_island-mac-adolc-ampion	(revision 25801)
+++ /issm/trunk-jpl/jenkins/pine_island-mac-adolc-ampion	(revision 25801)
@@ -0,0 +1,81 @@
+#--------------------#
+# ISSM Configuration #
+#--------------------#
+
+MATLAB_PATH="/Applications/MATLAB_R2019b.app"
+
+ISSM_CONFIG='\
+	--prefix=${ISSM_DIR} \
+	--disable-static \
+	--enable-development \
+	--enable-debugging \
+	--with-numthreads=4 \
+	--without-kriging \
+	--without-kml \
+	--without-Gia \
+	--without-Love \
+	--with-matlab-dir=${MATLAB_PATH} \
+	--with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
+	--with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
+	--with-fortran-lib="-L/usr/local/Cellar/gcc/10.2.0/lib/gcc/10 -lgfortran" \
+	--with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include  \
+	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
+	--with-metis-dir=${ISSM_DIR}/externalpackages/petsc/install \
+	--with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
+	--with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
+	--with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
+	--with-ampi-dir=${ISSM_DIR}/externalpackages/adjoinablempi/install \
+	--with-adolc-dir=${ISSM_DIR}/externalpackages/adolc/install \
+	--with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
+'
+
+#-------------------#
+# External Packages #
+#-------------------#
+
+# NOTE: The PETSc libraries are compiled but not used as they conflict with
+#		ADOL-C: PETSc is really just being used as an installer for other
+#		external packages.
+#
+EXTERNALPACKAGES="
+	autotools		install.sh
+	cmake			install.sh
+	petsc			install-3.12-mac.sh
+	gsl				install.sh
+	triangle		install-mac.sh
+	adjoinablempi	install-mac.sh
+	adolc			install-mac-with_ampi.sh
+	shell2junit		install.sh
+"
+
+#---------#
+# Testing #
+#---------#
+
+# PYTHON and MATLAB testing
+MATLAB_TEST=1
+PYTHON_TEST=1
+JAVASCRIPT_TEST=0
+EXAMPLES_TEST=0
+
+# Number of CPUs used in ISSM compilation
+#
+# NOTE: One is usually safer as some packages are very sensitive to parallel
+# 		compilation.
+#
+NUMCPUS_INSTALL=8
+
+# Number of CPUs used in the nightly runs
+NUMCPUS_RUN=2
+
+# Nightly run options
+#
+# See documentation in test/NightlyRun/runme.* for more information.
+#
+# NOTE:
+# - test3010 is skipped because it triggers GEMB module and a subsequent
+#	failure on ampioff configuration (really, likely a segmentation fault)
+#
+MATLAB_NROPTIONS="'benchmark','adolc','id',[3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3101, 3102, 3103, 3104, 3105, 3106, 3107, 3108, 3109, 3119],'exclude',3010"
+PYTHON_NROPTIONS="--benchmark=adolc -i 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3101 3102 3103 3104 3105 3106 3107 3108 3109 3119 --exclude=3010"
Index: /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion
===================================================================
--- /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion	(revision 25800)
+++ /issm/trunk-jpl/jenkins/ross-debian_linux-adolc-ampion	(revision 25801)
@@ -45,5 +45,5 @@
 	triangle		install-linux.sh
 	adjoinablempi	install-linux.sh
-	adolc			install-withampi.sh
+	adolc			install-with_ampi.sh
 	shell2junit		install.sh
 "