Index: ../trunk-jpl/etc/environment.sh
===================================================================
--- ../trunk-jpl/etc/environment.sh	(revision 26751)
+++ ../trunk-jpl/etc/environment.sh	(revision 26752)
@@ -503,7 +503,7 @@
 	ld_library_path_append "${SQLITE_ROOT}/lib"
 fi
 
-LIBTIFF_ROOT="${ISSM_EXT_SHARED_DIR}/libtiff/install"
+LIBTIFF_ROOT="${ISSM_EXT_DIR}/libtiff/install"
 if [ -d "${LIBTIFF_ROOT}" ]; then
 	dyld_library_path_append "${LIBTIFF_ROOT}/install/libtiff"
 	ld_library_path_append "${LIBTIFF_ROOT}/install/libtiff"
Index: ../trunk-jpl/externalpackages/proj/install-6 static.sh
===================================================================
--- ../trunk-jpl/externalpackages/proj/install-6 static.sh	(nonexistent)
+++ ../trunk-jpl/externalpackages/proj/install-6 static.sh	(revision 26752)
@@ -0,0 +1,57 @@
+#!/bin/bash
+set -eu
+
+
+# Constants
+#
+VER="6.2.1"
+
+PREFIX="${ISSM_DIR}/externalpackages/proj/install" # Set to location where external package should be installed
+
+## Environment
+#
+export CC=mpicc
+export CXX=mpicxx
+
+# NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently
+# requires,
+#
+#	SQLITE3_LIBS="-lsqlite3".
+#
+# On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
+#
+#	apt-get install sqlite3 libsqlite3-dev
+#
+export SQLITE3_LIBS="-lsqlite3"
+
+# Cleanup
+rm -rf ${PREFIX} src
+mkdir -p ${PREFIX} src
+
+# Download source
+$ISSM_DIR/scripts/DownloadExternalPackage.sh "https://issm.ess.uci.edu/files/externalpackages/proj-${VER}.tar.gz" "proj-${VER}.tar.gz"
+
+# Unpack source
+tar -zxvf proj-${VER}.tar.gz
+
+# Move source into 'src' directory
+mv proj-${VER}/* src
+rm -rf proj-${VER}
+
+# Configure
+cd src
+./configure \
+	--prefix="${PREFIX}" \
+	--disable-dependency-tracking \
+	--enable-fast-install \
+	--disable-shared \
+	--disable-tiff
+
+# Compile and install
+if [ $# -eq 0 ]; then
+	make
+	make install
+else
+	make -j $1
+	make -j $1 install
+fi

Property changes on: ../trunk-jpl/externalpackages/proj/install-6 static.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: ../trunk-jpl/externalpackages/proj/install-6.sh
===================================================================
--- ../trunk-jpl/externalpackages/proj/install-6.sh	(revision 26751)
+++ ../trunk-jpl/externalpackages/proj/install-6.sh	(revision 26752)
@@ -12,15 +12,15 @@
 #
 export CC=mpicc
 export CXX=mpicxx
+
 # NOTE: On macOS, SQLite3 should be installed by default, but PROJ currently
-#		requires,
+# requires,
 #
-#			SQLITE3_LIBS="-lsqlite3".
+#	SQLITE3_LIBS="-lsqlite3".
 #
-#		On Ubuntu Linux, install the SQLite3 binary, libraries and headers
-#		with,
+# On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#			`apt-get install sqlite3 libsqlite3-dev`
+#	apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"
 
Index: ../trunk-jpl/externalpackages/proj/install-8-static-with_tests.sh
===================================================================
--- ../trunk-jpl/externalpackages/proj/install-8-static-with_tests.sh	(revision 26751)
+++ ../trunk-jpl/externalpackages/proj/install-8-static-with_tests.sh	(revision 26752)
@@ -20,7 +20,7 @@
 #
 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#	`apt-get install sqlite3 libsqlite3-dev`
+#	apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"
 
Index: ../trunk-jpl/externalpackages/proj/install-8-static.sh
===================================================================
--- ../trunk-jpl/externalpackages/proj/install-8-static.sh	(revision 26751)
+++ ../trunk-jpl/externalpackages/proj/install-8-static.sh	(revision 26752)
@@ -20,7 +20,7 @@
 #
 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#	`apt-get install sqlite3 libsqlite3-dev`
+#	apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"
 
Index: ../trunk-jpl/externalpackages/proj/install-8-with_tests.sh
===================================================================
--- ../trunk-jpl/externalpackages/proj/install-8-with_tests.sh	(revision 26751)
+++ ../trunk-jpl/externalpackages/proj/install-8-with_tests.sh	(revision 26752)
@@ -20,7 +20,7 @@
 #
 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#	`apt-get install sqlite3 libsqlite3-dev`
+#	apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"
 
Index: ../trunk-jpl/externalpackages/proj/install-8.sh
===================================================================
--- ../trunk-jpl/externalpackages/proj/install-8.sh	(revision 26751)
+++ ../trunk-jpl/externalpackages/proj/install-8.sh	(revision 26752)
@@ -20,7 +20,7 @@
 #
 # On Ubuntu Linux, install the SQLite3 binary, libraries and headers with,
 #
-#	`apt-get install sqlite3 libsqlite3-dev`
+#	apt-get install sqlite3 libsqlite3-dev
 #
 export SQLITE3_LIBS="-lsqlite3"
 
Index: ../trunk-jpl/jenkins/aws-amazon_linux-solid_earth
===================================================================
--- ../trunk-jpl/jenkins/aws-amazon_linux-solid_earth	(revision 26751)
+++ ../trunk-jpl/jenkins/aws-amazon_linux-solid_earth	(revision 26752)
@@ -41,7 +41,7 @@
 	boost			install-1.7-linux.sh
 	curl			install-7-linux.sh
 	netcdf			install-4.7-parallel.sh
-	proj			install-8.sh
+	proj			install-6.sh
 	gdal			install-3-python.sh
 	gshhg			install.sh
 	gmt				install-6-linux.sh
Index: ../trunk-jpl/jenkins/pine_island-mac-binaries-matlab
===================================================================
--- ../trunk-jpl/jenkins/pine_island-mac-binaries-matlab	(revision 26751)
+++ ../trunk-jpl/jenkins/pine_island-mac-binaries-matlab	(revision 26752)
@@ -51,7 +51,7 @@
 	dakota		install-6.2-mac-static.sh
 	curl		install-7-mac-static.sh
 	netcdf		install-4.7-parallel-static.sh
-	proj		install-8-static.sh
+	proj		install-6-static.sh
 	gdal		install-3-static.sh
 	gshhg		install.sh
 	gmt			install-6-mac-static.sh
Index: ../trunk-jpl/jenkins/pine_island-mac-binaries-python
===================================================================
--- ../trunk-jpl/jenkins/pine_island-mac-binaries-python	(revision 26751)
+++ ../trunk-jpl/jenkins/pine_island-mac-binaries-python	(revision 26752)
@@ -49,7 +49,7 @@
 	dakota		install-6.2-mac-static.sh
 	curl		install-7-mac-static.sh
 	netcdf		install-4.7-parallel-static.sh
-	proj		install-8-static.sh
+	proj		install-6-static.sh
 	gdal		install-3-python-static.sh
 	gshhg		install.sh
 	gmt			install-6-mac-static.sh
Index: ../trunk-jpl/jenkins/pine_island-mac-full
===================================================================
--- ../trunk-jpl/jenkins/pine_island-mac-full	(revision 26751)
+++ ../trunk-jpl/jenkins/pine_island-mac-full	(revision 26752)
@@ -49,7 +49,7 @@
 	dakota		install-6.2-mac.sh
 	curl		install-7-mac.sh
 	netcdf		install-4.7-parallel.sh
-	proj		install-8.sh
+	proj		install-6.sh
 	gdal		install-3-python.sh
 	gshhg		install.sh
 	gmt			install-6-mac.sh
Index: ../trunk-jpl/jenkins/pine_island-mac-full-valgrind
===================================================================
--- ../trunk-jpl/jenkins/pine_island-mac-full-valgrind	(revision 26751)
+++ ../trunk-jpl/jenkins/pine_island-mac-full-valgrind	(revision 26752)
@@ -49,7 +49,7 @@
 	dakota		install-6.2-mac.sh
 	curl		install-7-mac.sh
 	netcdf		install-4.7-parallel.sh
-	proj		install-8.sh
+	proj		install-6.sh
 	gdal		install-3-python.sh
 	gshhg		install.sh
 	gmt			install-6-mac.sh
Index: ../trunk-jpl/jenkins/pine_island-mac-python
===================================================================
--- ../trunk-jpl/jenkins/pine_island-mac-python	(revision 26751)
+++ ../trunk-jpl/jenkins/pine_island-mac-python	(revision 26752)
@@ -44,7 +44,7 @@
 	dakota		install-6.2-mac.sh
 	curl		install-7-mac.sh
 	netcdf		install-4.7-parallel.sh
-	proj		install-8.sh
+	proj		install-6.sh
 	gdal		install-3-python.sh
 	gshhg		install.sh
 	gmt			install-6-mac.sh
Index: ../trunk-jpl/jenkins/pleiades-dakota
===================================================================
--- ../trunk-jpl/jenkins/pleiades-dakota	(nonexistent)
+++ ../trunk-jpl/jenkins/pleiades-dakota	(revision 26752)
@@ -0,0 +1,62 @@
+#--------------------#
+# ISSM Configuration #
+#--------------------#
+
+ISSM_CONFIG='\
+	--prefix=$ISSM_DIR \
+	--enable-development \
+	--enable-standalone-libraries \
+	--with-wrappers=no \
+	--with-vendor="intel-pleiades-mpi" \
+	--with-petsc-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+	--with-m1qn3-dir="${ISSM_DIR}/externalpackages/m1qn3/install" \
+	--with-boost-dir=/nasa/pkgsrc/sles12/2018Q3 \
+	--with-dakota-dir="${ISSM_DIR}/externalpackages/dakota/install" \
+	--with-gsl-dir=/nasa/pkgsrc/sles12/2018Q3 \
+	--with-mpi-include=" " \
+	--with-mpi-libflags=" -lmpi" \
+	--with-mkl-libflags="-L/nasa/intel/Compiler/2016.2.181/compilers_and_libraries_2016.2.181/linux/mkl/lib/intel64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -limf -lsvml -lirc" \
+	--with-metis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+	--with-parmetis-dir=${ISSM_DIR}/externalpackages/petsc/install \
+	--with-mumps-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+	--with-scalapack-dir=/nasa/pkgsrc/sles12/2018Q3 \
+	--with-graphics-lib="/usr/lib64/libX11.so" \
+	--with-fortran-lib="-L/nasa/intel/Compiler/2016.2.181/compilers_and_libraries_2016.2.181/linux/compiler/lib/intel64/ -lifcore -lifport" \
+'
+
+#-------------------#
+# External Packages #
+#-------------------#
+
+EXTERNALPACKAGES="
+	petsc	install-3.13-pleiades.sh
+	dakota	install-6.2-pleiades.sh
+	m1qn3	install.sh
+"
+
+#---------#
+# Testing #
+#---------#
+
+# Test suites
+MATLAB_TEST=0
+PYTHON_TEST=0
+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.
+#
+MATLAB_NROPTIONS=""
+PYTHON_NROPTIONS=""

Property changes on: ../trunk-jpl/jenkins/pleiades-dakota
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: ../trunk-jpl/jenkins/ross-debian_linux-binaries-matlab
===================================================================
--- ../trunk-jpl/jenkins/ross-debian_linux-binaries-matlab	(revision 26751)
+++ ../trunk-jpl/jenkins/ross-debian_linux-binaries-matlab	(revision 26752)
@@ -49,7 +49,7 @@
 	dakota		install-6.2-linux-static.sh
 	curl		install-7-linux-static.sh
 	netcdf		install-4.7-parallel-static.sh
-	proj		install-8-static.sh
+	proj		install-6-static.sh
 	gdal		install-3-static.sh
 	gshhg		install.sh
 	gmt			install-6-linux-static.sh
Index: ../trunk-jpl/jenkins/ross-debian_linux-binaries-python
===================================================================
--- ../trunk-jpl/jenkins/ross-debian_linux-binaries-python	(revision 26751)
+++ ../trunk-jpl/jenkins/ross-debian_linux-binaries-python	(revision 26752)
@@ -49,7 +49,7 @@
 	dakota		install-6.2-linux-static.sh
 	curl		install-7-linux-static.sh
 	netcdf		install-4.7-parallel-static.sh
-	proj		install-8-static.sh
+	proj		install-6-static.sh
 	gdal		install-3-python-static.sh
 	gshhg		install.sh
 	gmt			install-6-linux-static.sh
Index: ../trunk-jpl/jenkins/ross-debian_linux-dakota
===================================================================
--- ../trunk-jpl/jenkins/ross-debian_linux-dakota	(revision 26751)
+++ ../trunk-jpl/jenkins/ross-debian_linux-dakota	(revision 26752)
@@ -48,7 +48,7 @@
 	dakota			install-6.2-linux.sh
 	curl			install-7-linux.sh
 	netcdf			install-4.7-parallel.sh
-	proj			install-8.sh
+	proj			install-6.sh
 	gdal			install-3-python.sh
 	gshhg			install.sh
 	gmt				install-6-linux.sh
Index: ../trunk-jpl/jenkins/ross-debian_linux-full
===================================================================
--- ../trunk-jpl/jenkins/ross-debian_linux-full	(revision 26751)
+++ ../trunk-jpl/jenkins/ross-debian_linux-full	(revision 26752)
@@ -49,7 +49,7 @@
 	dakota		install-6.2-linux.sh
 	curl		install-7-linux.sh
 	netcdf		install-4.7-parallel.sh
-	proj		install-8.sh
+	proj		install-6.sh
 	gdal		install-3-python.sh
 	gshhg		install.sh
 	gmt			install-6-linux.sh
Index: ../trunk-jpl/jenkins/ross-debian_linux-full-valgrind
===================================================================
--- ../trunk-jpl/jenkins/ross-debian_linux-full-valgrind	(revision 26751)
+++ ../trunk-jpl/jenkins/ross-debian_linux-full-valgrind	(revision 26752)
@@ -49,7 +49,7 @@
 	dakota		install-6.2-linux.sh
 	curl		install-7-linux.sh
 	netcdf		install-4.7-parallel.sh
-	proj		install-8.sh
+	proj		install-6.sh
 	gdal		install-3-python.sh
 	gshhg		install.sh
 	gmt			install-6-linux.sh
Index: ../trunk-jpl/jenkins/ross-debian_linux-python
===================================================================
--- ../trunk-jpl/jenkins/ross-debian_linux-python	(revision 26751)
+++ ../trunk-jpl/jenkins/ross-debian_linux-python	(revision 26752)
@@ -43,7 +43,7 @@
 	dakota		install-6.2-linux.sh
 	curl		install-7-linux.sh
 	netcdf		install-4.7-parallel.sh
-	proj		install-8.sh
+	proj		install-6.sh
 	gdal		install-3-python.sh
 	gshhg		install.sh
 	gmt			install-6-linux.sh
Index: ../trunk-jpl/jenkins/ross-debian_linux-solid_earth
===================================================================
--- ../trunk-jpl/jenkins/ross-debian_linux-solid_earth	(revision 26751)
+++ ../trunk-jpl/jenkins/ross-debian_linux-solid_earth	(revision 26752)
@@ -46,7 +46,7 @@
 	dakota			install-6.2-linux.sh
 	curl			install-7-linux.sh
 	netcdf			install-4.7-parallel.sh
-	proj			install-8.sh
+	proj			install-6.sh
 	gdal			install-3-python.sh
 	gshhg			install.sh
 	gmt				install-6-linux.sh
Index: ../trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic
===================================================================
--- ../trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic	(revision 26751)
+++ ../trunk-jpl/jenkins/ross-win-msys2-mingw-msmpi-basic	(revision 26752)
@@ -6,7 +6,7 @@
 	--enable-debugging \
 	--with-numthreads=4 \
 	--with-vendor="win-msys2" \
-	--with-matlab-dir=${MATLAB_PATH} \
+	--with-matlab-dir="${MATLAB_PATH}" \
 	--with-mpi-include="${MSMPI_ROOT}/include" \
 	--with-mpi-libdir="${MSMPI_ROOT}/lib" \
 	--with-mpi-libflags="-lmsmpi" \
@@ -14,13 +14,13 @@
 	--with-metis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
 	--with-parmetis-dir="${ISSM_DIR}/externalpackages/petsc/install" \
 	--with-blas-lapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \
-	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
+	--with-scalapack-dir="${ISSM_DIR}/externalpackages/petsc/install" \
+	--with-mumps-dir="${ISSM_DIR}/externalpackages/petsc/install" \
 	--with-petsc-dir="${ISSM_DIR}/externalpackages/petsc/install" \
 	--with-triangle-dir="${ISSM_DIR}/externalpackages/triangle/install" \
-	--with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
-	--with-m1qn3-dir=${ISSM_DIR}/externalpackages/m1qn3/install \
-	--with-semic-dir=${ISSM_DIR}/externalpackages/semic/install \
+	--with-chaco-dir="${ISSM_DIR}/externalpackages/chaco/install" \
+	--with-m1qn3-dir="${ISSM_DIR}/externalpackages/m1qn3/install" \
+	--with-semic-dir="${ISSM_DIR}/externalpackages/semic/install" \
 '
 
 #-------------------#