Index: /issm/trunk-jpl/etc/environment.csh
===================================================================
--- /issm/trunk-jpl/etc/environment.csh	(revision 26213)
+++ /issm/trunk-jpl/etc/environment.csh	(revision 26214)
@@ -60,5 +60,5 @@
 if ( -d {$PETSC_ROOT} ) then
 	setenv PETSC_ROOT {$PETSC_ROOT}
-	setenv LD_LIBRARY_PATH "{$PETSC_ROOT}/lib:{$LD_LIBRARY_PATH}"
+	setenv LD_LIBRARY_PATH {$PETSC_ROOT}/lib:{$LD_LIBRARY_PATH}
 
 	# In case we have installed certain external packages via PETSc
@@ -73,8 +73,8 @@
 	if ( `find {$PETSC_ROOT}/lib -name libhdf5.*` != "" ) then
 		setenv HDF5_ROOT "{$PETSC_ROOT}" # Used in installation of NetCDF, GDAL
-		setenv CPATH "{$CPATH}:{$PETSC_ROOT}/include"
-		setenv LIBRARY_PATH "{$LIBRARY_PATH}:{$PETSC_ROOT}/lib"
-		setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$PETSC_ROOT}/lib"
-		setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$PETSC_ROOT}/lib"
+		setenv CPATH {$CPATH}:{$PETSC_ROOT}/include
+		setenv LIBRARY_PATH {$LIBRARY_PATH}:{$PETSC_ROOT}/lib
+		setenv DYLD_LIBRARY_PATH {$DYLD_LIBRARY_PATH}:{$PETSC_ROOT}/lib
+		setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$PETSC_ROOT}/lib
 	endif
 
@@ -94,8 +94,8 @@
 		setenv MPI_DIR {$MPI_ROOT}
 		setenv MPI_HOME {$MPI_ROOT} # Used in installation of Dakota
-		setenv MPI_INC_DIR "{$MPI_ROOT}/include"
-		setenv PATH "{$MPI_ROOT}/bin:{$PATH}"
-		setenv CPATH "{$MPI_ROOT}/include:{$CPATH}"
-		setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$MPI_ROOT}/lib"
+		setenv MPI_INC_DIR {$MPI_ROOT}/include
+		setenv PATH {$MPI_ROOT}/bin:{$PATH}
+		setenv CPATH {$MPI_ROOT}/include:{$CPATH}
+		setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$MPI_ROOT}/lib
 	endif
 
@@ -103,34 +103,34 @@
 	if ( `find {$PETSC_ROOT}/lib -name libz.*` != "" ) then
 		setenv ZLIB_ROOT "{$PETSC_ROOT}" # Used in installation of NetCDF, GDAL
-		setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$PETSC_ROOT}/lib"
+		setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$PETSC_ROOT}/lib
 	endif
 endif
 
 set SCOTCH_ROOT="{$ISSM_EXT_DIR}/scotch/install"
-if ( -d "{$SCOTCH_ROOT}" ) then
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$SCOTCH_ROOT}/lib"
+if ( -d {$SCOTCH_ROOT} ) then
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$SCOTCH_ROOT}/lib
 endif
 
 set SLEPC_ROOT="{$ISSM_EXT_DIR}/slepc/install"
-if ( -d "{$SLEPC_ROOT}" ) then
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$SLEPC_ROOT}/lib"
+if ( -d {$SLEPC_ROOT} ) then
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$SLEPC_ROOT}/lib
 endif
 
 set TAO_ROOT="{$ISSM_EXT_DIR}/tao/install"
-if ( -d "{$TAO_ROOT}" ) then
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$TAO_ROOT}/lib"
+if ( -d {$TAO_ROOT} ) then
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$TAO_ROOT}/lib
 endif
 
 set DAKOTA_ROOT="{$ISSM_EXT_DIR}/dakota/install"
-if ( -d "{$DAKOTA_ROOT}" ) then
-	setenv PATH "{$PATH}:{$DAKOTA_ROOT}/bin"
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$DAKOTA_ROOT}/lib"
-	setenv DYLD_LIBRARY_PATH "{$DAKOTA_ROOT}/lib:{$DYLD_LIBRARY_PATH}"
+if ( -d {$DAKOTA_ROOT} ) then
+	setenv PATH {$PATH}:{$DAKOTA_ROOT}/bin
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$DAKOTA_ROOT}/lib
+	setenv DYLD_LIBRARY_PATH {$DAKOTA_ROOT}/lib:{$DYLD_LIBRARY_PATH}
 endif
 
 set MERCURIAL_ROOT="{$ISSM_EXT_DIR}/mercurial/install"
 if ( -d {$MERCURIAL_ROOT} ) then
-	setenv PYTHONPATH "{$PYTHONPATH}:{$MERCURIAL_ROOT}/mercurial/pure"
-	setenv PATH "{$PATH}:{$MERCURIAL_ROOT}"
+	setenv PYTHONPATH {$PYTHONPATH}:{$MERCURIAL_ROOT}/mercurial/pure
+	setenv PATH {$PATH}:{$MERCURIAL_ROOT}
 endif
 
@@ -140,8 +140,8 @@
 	setenv BOOST_DIR {$BOOST_ROOT}
 	setenv BOOSTROOT {$BOOST_ROOT}
-	setenv LIBRARY_PATH "{$BOOST_ROOT}/lib:{$LIBRARY_PATH}"
-	setenv LD_LIBRARY_PATH "{$BOOST_ROOT}/lib:{$LD_LIBRARY_PATH}"
-	setenv DYLD_LIBRARY_PATH "{$BOOST_ROOT}/lib:{$DYLD_LIBRARY_PATH}"
-	setenv PATH "{$BOOST_ROOT}/bin:{$PATH}"
+	setenv LIBRARY_PATH {$BOOST_ROOT}/lib:{$LIBRARY_PATH}
+	setenv LD_LIBRARY_PATH {$BOOST_ROOT}/lib:{$LD_LIBRARY_PATH}
+	setenv DYLD_LIBRARY_PATH {$BOOST_ROOT}/lib:{$DYLD_LIBRARY_PATH}
+	setenv PATH {$BOOST_ROOT}/bin:{$PATH}
 endif
 
@@ -149,97 +149,97 @@
 if ( -d {$GSL_ROOT} ) then
 	setenv GSL_HOME "{$GSL_ROOT}" # Used in installation of Dakota
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$GSL_ROOT}/lib"
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$GSL_ROOT}/lib
 endif
 
 set NETCDF_ROOT="{$ISSM_EXT_DIR}/netcdf/install"
-if ( -d "{$NETCDF_ROOT}" ) then
+if ( -d {$NETCDF_ROOT} ) then
 	setenv NETCDF_ROOT "{$NETCDF_ROOT}" # Used in installation of GDAL, GMT
-	setenv PATH "{$PATH}:{$NETCDF_ROOT}/bin"
-	setenv CPATH "{$CPATH}:{$NETCDF_ROOT}/include"
-	setenv LIBRARY_PATH "{$LIBRARY_PATH}:{$NETCDF_ROOT}/lib"
-	setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$NETCDF_ROOT}/lib"
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$NETCDF_ROOT}/lib"
+	setenv PATH {$PATH}:{$NETCDF_ROOT}/bin
+	setenv CPATH {$CPATH}:{$NETCDF_ROOT}/include
+	setenv LIBRARY_PATH {$LIBRARY_PATH}:{$NETCDF_ROOT}/lib
+	setenv DYLD_LIBRARY_PATH {$DYLD_LIBRARY_PATH}:{$NETCDF_ROOT}/lib
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$NETCDF_ROOT}/lib
 endif
 
 set CURL_ROOT="{$ISSM_EXT_DIR}/curl/install"
-if ( -d "{$CURL_ROOT}" ) then
+if ( -d {$CURL_ROOT} ) then
 	setenv CURL_ROOT "{$CURL_ROOT}" # Used in installation of NetCDF, GDAL, GMT
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$CURL_ROOT}/lib"
-	setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$CURL_ROOT}/lib"
-	setenv PATH "{$PATH}:{$CURL_ROOT}/bin"
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$CURL_ROOT}/lib
+	setenv DYLD_LIBRARY_PATH {$DYLD_LIBRARY_PATH}:{$CURL_ROOT}/lib
+	setenv PATH {$PATH}:{$CURL_ROOT}/bin
 endif
 
 set HDF5_ROOT="{$ISSM_EXT_DIR}/hdf5/install"
-if ( -d "{$HDF5_ROOT}" ) then
+if ( -d {$HDF5_ROOT} ) then
 	setenv HDF5_ROOT "{$HDF5_ROOT}" # Used in installation of NetCDF, GDAL
-	setenv CPATH "{$CPATH}:{$HDF5_ROOT}/include"
-	setenv LIBRARY_PATH "{$LIBRARY_PATH}:{$HDF5_ROOT}/lib"
-	setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$HDF5_ROOT}/lib"
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$HDF5_ROOT}/lib"
+	setenv CPATH {$CPATH}:{$HDF5_ROOT}/include
+	setenv LIBRARY_PATH {$LIBRARY_PATH}:{$HDF5_ROOT}/lib
+	setenv DYLD_LIBRARY_PATH {$DYLD_LIBRARY_PATH}:{$HDF5_ROOT}/lib
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$HDF5_ROOT}/lib
 endif
 
 set SQLITE_ROOT="{$ISSM_EXT_DIR}/sqlite/install"
-if ( -d "{$SQLITE_ROOT}" ) then
-	setenv PATH "{$PATH}:{$SQLITE_ROOT}/bin"
-	setenv LIBRARY_PATH "{$LIBRARY_PATH}:{$SQLITE_ROOT}/lib"
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$SQLITE_ROOT}/lib"
+if ( -d {$SQLITE_ROOT} ) then
+	setenv PATH {$PATH}:{$SQLITE_ROOT}/bin
+	setenv LIBRARY_PATH {$LIBRARY_PATH}:{$SQLITE_ROOT}/lib
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$SQLITE_ROOT}/lib
 endif
 
 set PROJ_ROOT="{$ISSM_EXT_DIR}/proj/install"
-if ( -d "{$PROJ_ROOT}" ) then
+if ( -d {$PROJ_ROOT} ) then
 	setenv PROJ_ROOT "${PROJ_ROOT}" # Used in installation of GDAL
-	setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$PROJ_ROOT}/lib"
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$PROJ_ROOT}/lib"
+	setenv DYLD_LIBRARY_PATH {$DYLD_LIBRARY_PATH}:{$PROJ_ROOT}/lib
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$PROJ_ROOT}/lib
 endif
 
 set GDAL_ROOT="{$ISSM_EXT_DIR}/gdal/install"
-if ( -d "{$GDAL_ROOT}" ) then
+if ( -d {$GDAL_ROOT} ) then
 	setenv GDAL_ROOT "{$GDAL_ROOT}" # Used in installation of GMT
-	setenv PATH "{$GDAL_ROOT}/bin:{$PATH}"
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$GDAL_ROOT}/lib"
+	setenv PATH {$GDAL_ROOT}/bin:{$PATH}
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$GDAL_ROOT}/lib
 endif
 
 set GSHHG_ROOT="{$ISSM_EXT_DIR}/gshhg/install"
-if ( -d "{$GSHHG_ROOT}" ) then
+if ( -d {$GSHHG_ROOT} ) then
 	setenv GSHHG_ROOT "{$GSHHG_ROOT}" # Used in installation of GMT
 endif
 
 set GMT_ROOT="{$ISSM_EXT_DIR}/gmt/install"
-if ( -d "{$GMT_ROOT}" ) then
-	setenv PATH "{$GMT_ROOT}/bin:{$PATH}"
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$GMT_ROOT}/lib"
-	setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$GMT_ROOT}/lib"
+if ( -d {$GMT_ROOT} ) then
+	setenv PATH {$GMT_ROOT}/bin:{$PATH}
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$GMT_ROOT}/lib
+	setenv DYLD_LIBRARY_PATH {$DYLD_LIBRARY_PATH}:{$GMT_ROOT}/lib
 endif
 
 set GMSH_ROOT="{$ISSM_EXT_DIR}/gmsh/install"
-if ( -d "{$GMSH_ROOT}" ) then
-	setenv PATH "{$GMSH_ROOT}/bin:{$PATH}"
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$GMSH_ROOT}/lib"
-	setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$GMSH_ROOT}/lib"
+if ( -d {$GMSH_ROOT} ) then
+	setenv PATH {$GMSH_ROOT}/bin:{$PATH}
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$GMSH_ROOT}/lib
+	setenv DYLD_LIBRARY_PATH {$DYLD_LIBRARY_PATH}:{$GMSH_ROOT}/lib
 endif
 
 set TRIANGLE_ROOT="{$ISSM_EXT_DIR}/triangle/install"
-if ( -d "{$TRIANGLE_ROOT}" ) then
-	setenv LD_LIBRARY_PATH "{$LD_LIBRARY_PATH}:{$TRIANGLE_ROOT}/lib"
-	setenv DYLD_LIBRARY_PATH "{$DYLD_LIBRARY_PATH}:{$TRIANGLE_ROOT}/lib"
+if ( -d {$TRIANGLE_ROOT} ) then
+	setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:{$TRIANGLE_ROOT}/lib
+	setenv DYLD_LIBRARY_PATH {$DYLD_LIBRARY_PATH}:{$TRIANGLE_ROOT}/lib
 endif
 
 set YAMS_ROOT="{$ISSM_EXT_DIR}/yams/install"
 if ( -d {$YAMS_ROOT} ) then
-	setenv PATH "{$PATH}:{$YAMS_ROOT}"
+	setenv PATH {$PATH}:{$YAMS_ROOT}
 endif
 
 set VALGRIND_ROOT="{$ISSM_EXT_DIR}/valgrind/install"
 if ( -d {$VALGRIND_ROOT} ) then
-	setenv PATH "{$VALGRIND_ROOT}/bin:{$PATH}"
+	setenv PATH {$VALGRIND_ROOT}/bin:{$PATH}
 endif
 
 set DOXYGEN_ROOT="{$ISSM_EXT_DIR}/doxygen/install"
 if ( -d {$DOXYGEN_ROOT} ) then
-	setenv PATH "{$DOXYGEN_ROOT}/bin:{$PATH}"
+	setenv PATH {$DOXYGEN_ROOT}/bin:{$PATH}
 endif
 
 set SHELL2JUNIT_ROOT="{$ISSM_EXT_DIR}/shell2junit/install"
 if ( -d {$SHELL2JUNIT_ROOT} ) then
-	setenv PATH "{$PATH}:{$SHELL2JUNIT_ROOT}/install"
-endif
+	setenv PATH {$PATH}:{$SHELL2JUNIT_ROOT}/install
+endif