Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 24379)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 24380)
@@ -188,5 +188,6 @@
 	export MPI_DIR
 	export MPI_INC_DIR="$MPI_DIR/include"
-	path_prepend    "$MPI_DIR/bin"
+	path_prepend "${MPI_DIR}/bin"
+	cpath_prepend "${MPI_DIR}/include"
 	ld_library_path_prepend "$MPI_DIR/lib"
 fi
@@ -200,5 +201,5 @@
 if [ -d "$PETSC_DIR" ]; then
 	export PETSC_DIR
-	ld_library_path_append "$PETSC_DIR/lib"
+	ld_library_path_append "${PETSC_DIR}/lib"
 fi
 
@@ -347,24 +348,24 @@
 path_append "$ASPELL_DIR/bin"
 
+NETCDF_DIR="${ISSM_DIR}/externalpackages/netcdf/install"
+if [ -d "${NETCDF_DIR}" ]; then
+	path_append "${NETCDF_DIR}/bin"
+	cpath_append "${NETCDF_DIR}/include"
+	library_path_append "${NETCDF_DIR}/lib"
+	dyld_library_path_append "${NETCDF_DIR}/lib"
+	ld_library_path_append "${NETCDF_DIR}/lib"
+fi
+
+NETCDF_CXX_DIR="${ISSM_DIR}/externalpackages/netcdf-cxx/install"
+if [ -d "${NETCDF_CXX_DIR}" ]; then
+	ld_library_path_append "${NETCDF_CXX_DIR}/lib"
+fi
+
 HDF5_DIR="${ISSM_DIR}/externalpackages/hdf5/install"
 if [ -d "${HDF5_DIR}" ]; then
-	c_include_path_append "${HDF5_DIR}/include"
+	cpath_append "${HDF5_DIR}/include"
 	library_path_append "${HDF5_DIR}/lib"
 	dyld_library_path_append "${HDF5_DIR}/lib"
 	ld_library_path_append "${HDF5_DIR}/lib"
-fi
-
-NETCDF_DIR="${ISSM_DIR}/externalpackages/netcdf/install"
-if [ -d "${NETCDF_DIR}" ]; then
-	path_append "${NETCDF_DIR}/bin"
-	c_include_path_append "${NETCDF_DIR}/include"
-	library_path_append "${NETCDF_DIR}/lib"
-	dyld_library_path_append "${NETCDF_DIR}/lib"
-	ld_library_path_append "${NETCDF_DIR}/lib"
-fi
-
-NETCDF_CXX_DIR="${ISSM_DIR}/externalpackages/netcdf-cxx/install"
-if [ -d "${NETCDF_CXX_DIR}" ]; then
-	ld_library_path_append "${NETCDF_CXX_DIR}/lib"
 fi
 
Index: /issm/trunk-jpl/externalpackages/gdal/install-3.0-netcdf.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gdal/install-3.0-netcdf.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/gdal/install-3.0-netcdf.sh	(revision 24380)
@@ -6,4 +6,6 @@
 #
 VER="3.0.2"
+HDF5_ROOT="${ISSM_DIR}/externalpackages/hdf5/install"
+NETCDF_ROOT="${ISSM_DIR}/externalpackages/netcdf/install"
 PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install"
 
@@ -26,4 +28,6 @@
 ./configure \
 	--prefix="${ISSM_DIR}/externalpackages/gdal/install" \
+	--with-hdf5="${HDF5_ROOT}" \
+	--with-netcdf="${NETCDF_ROOT}" \
 	--with-proj="${PROJ_ROOT}"
 
@@ -36,2 +40,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/gdal/install-3.0-python-netcdf.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gdal/install-3.0-python-netcdf.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/gdal/install-3.0-python-netcdf.sh	(revision 24380)
@@ -7,7 +7,9 @@
 #
 
-## Constants
+# Constants
 #
 VER="3.0.2"
+HDF5_ROOT="${ISSM_DIR}/externalpackages/hdf5/install"
+NETCDF_ROOT="${ISSM_DIR}/externalpackages/netcdf/install"
 PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install"
 
@@ -31,4 +33,6 @@
 	--prefix="${ISSM_DIR}/externalpackages/gdal/install" \
 	--with-python \
+	--with-hdf5="${HDF5_ROOT}" \
+	--with-netcdf="${NETCDF_ROOT}" \
 	--with-proj="${PROJ_ROOT}"
 
@@ -41,2 +45,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/gdal/install-3.0-python.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gdal/install-3.0-python.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/gdal/install-3.0-python.sh	(revision 24380)
@@ -43,2 +43,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/gdal/install-3.0.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/gdal/install-3.0.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/gdal/install-3.0.sh	(revision 24380)
@@ -30,4 +30,5 @@
 	--with-proj="${PROJ_ROOT}"
 
+
 # Compile and install
 if [ $# -eq 0 ]; then
@@ -38,2 +39,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/hdf5/install-1.10-parallel-with_tests.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/hdf5/install-1.10-parallel-with_tests.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/hdf5/install-1.10-parallel-with_tests.sh	(revision 24380)
@@ -42,2 +42,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/hdf5/install-1.10-parallel.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/hdf5/install-1.10-parallel.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/hdf5/install-1.10-parallel.sh	(revision 24380)
@@ -40,2 +40,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/hdf5/install-1.10-with_tests.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/hdf5/install-1.10-with_tests.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/hdf5/install-1.10-with_tests.sh	(revision 24380)
@@ -37,2 +37,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/hdf5/install-1.10.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/hdf5/install-1.10.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/hdf5/install-1.10.sh	(revision 24380)
@@ -35,2 +35,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-with_tests.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-with_tests.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-with_tests.sh	(revision 24380)
@@ -55,2 +55,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel.sh	(revision 24380)
@@ -41,5 +41,5 @@
 ./configure \
  	--prefix="${ISSM_DIR}/externalpackages/netcdf/install" \
- 	--disbable-shared \
+ 	--disable-shared \
  	--disable-doxygen
 
@@ -52,2 +52,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/netcdf/install-4.7-with_tests.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/netcdf/install-4.7-with_tests.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/netcdf/install-4.7-with_tests.sh	(revision 24380)
@@ -51,2 +51,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/externalpackages/netcdf/install-4.7.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/netcdf/install-4.7.sh	(revision 24379)
+++ /issm/trunk-jpl/externalpackages/netcdf/install-4.7.sh	(revision 24380)
@@ -49,2 +49,5 @@
 	make -j $1 install
 fi
+
+# Return to initial directory
+cd ..
Index: /issm/trunk-jpl/jenkins/linux64_ross_se
===================================================================
--- /issm/trunk-jpl/jenkins/linux64_ross_se	(revision 24379)
+++ /issm/trunk-jpl/jenkins/linux64_ross_se	(revision 24380)
@@ -76,5 +76,8 @@
 NUMCPUS_INSTALL=8
 
-#number of cpus used in the nightly runs. (pb of access to all_vertices.txt if more than 1)
+# Number of cpus used in the nightly runs
+#
+# NOTE: Possible problem of access to all_vertices.txt if more than 1.
+#
 NUMCPUS_RUN=8