Index: /issm/trunk-jpl/etc/environment.csh
===================================================================
--- /issm/trunk-jpl/etc/environment.csh	(revision 12160)
+++ /issm/trunk-jpl/etc/environment.csh	(revision 12161)
@@ -1,4 +1,4 @@
-#ISSM_TIER and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
-source $ISSM_TIER/etc/environment_variables.csh
+#ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
+source $ISSM_DIR/etc/environment_variables.csh
 
 #Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables 
@@ -10,8 +10,8 @@
 
 #CRON utilities
-setenv PATH {$PATH}:{$ISSM_TIER}/cron
+setenv PATH {$PATH}:{$ISSM_DIR}/cron
 
 #SCRIPTS utilities
-setenv PATH {$PATH}:{$ISSM_TIER}/scripts
+setenv PATH {$PATH}:{$ISSM_DIR}/scripts
 
 #MATLAB
Index: /issm/trunk-jpl/etc/environment.sh
===================================================================
--- /issm/trunk-jpl/etc/environment.sh	(revision 12160)
+++ /issm/trunk-jpl/etc/environment.sh	(revision 12161)
@@ -1,10 +1,10 @@
-#ISSM_TIER and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
+#ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
 
 #Windows compilers: 
 if [[ "$ISSM_ARCH" == "cygwin-intel" ]]; then
-	source $ISSM_TIER/externalpackages/windows/windows_environment.sh
+	source $ISSM_DIR/externalpackages/windows/windows_environment.sh
 fi
 
-source $ISSM_TIER/etc/environment_variables.sh
+source $ISSM_DIR/etc/environment_variables.sh
 
 #Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them after exporting the variables
@@ -16,8 +16,8 @@
 
 #CRON utilities
-PATH="$PATH:$ISSM_TIER/cron"
+PATH="$PATH:$ISSM_DIR/cron"
 
 #scripts
-PATH="$PATH:$ISSM_TIER/scripts"
+PATH="$PATH:$ISSM_DIR/scripts"
 
 ##MATLAB
@@ -137,5 +137,5 @@
 #export INTEL_DIR
 #PATH="$PATH:$INTEL_DIR"
-#source $ISSM_TIER/externalpackages/intel/intel.sh
+#source $ISSM_DIR/externalpackages/intel/intel.sh
 
 #SDK
@@ -259,6 +259,6 @@
 #PYTHON
 export PATH="$PYTHON_DIR/bin:$PATH"
-export PYTHONPATH="$PYTHONPATH:$ISSM_TIER/src/modules/python"
-export LD_LIBRARY_PATH=$ISSM_TIER/src/modules/python:$LD_LIBRARY_PATH
+export PYTHONPATH="$PYTHONPATH:$ISSM_DIR/src/modules/python"
+export LD_LIBRARY_PATH=$ISSM_DIR/src/modules/python:$LD_LIBRARY_PATH
 
 #MODELE
Index: /issm/trunk-jpl/etc/environment_variables.csh
===================================================================
--- /issm/trunk-jpl/etc/environment_variables.csh	(revision 12160)
+++ /issm/trunk-jpl/etc/environment_variables.csh	(revision 12161)
@@ -1,77 +1,77 @@
 #
 #
-#This routine can only be run if the ISSM_TIER variable has been correctly set!
+#This routine can only be run if the ISSM_DIR variable has been correctly set!
 #
 #
 
 #MATLAB
-set MATLAB_DIR={$ISSM_TIER}/externalpackages/matlab/install
+set MATLAB_DIR={$ISSM_DIR}/externalpackages/matlab/install
 
 #MPI
-set MPI_DIR={$ISSM_TIER}/externalpackages/mpich2/install
+set MPI_DIR={$ISSM_DIR}/externalpackages/mpich2/install
 
 #PETSC
-set PETSC_DIR={$ISSM_TIER}/externalpackages/petsc/install
+set PETSC_DIR={$ISSM_DIR}/externalpackages/petsc/install
 
 #SLEPC
-set SLEPC_DIR={$ISSM_TIER}/externalpackages/slepc/install
+set SLEPC_DIR={$ISSM_DIR}/externalpackages/slepc/install
 
 #Dakota
-set DAKOTA_DIR={$ISSM_TIER}/externalpackages/dakota/install
+set DAKOTA_DIR={$ISSM_DIR}/externalpackages/dakota/install
 
 #Qhull
-set QHULL_DIR={$ISSM_TIER}/externalpackages/qhull/install
+set QHULL_DIR={$ISSM_DIR}/externalpackages/qhull/install
 
 #Doxygen
-set DOXYGEN_DIR={$ISSM_TIER}/externalpackages/doxygen/install
+set DOXYGEN_DIR={$ISSM_DIR}/externalpackages/doxygen/install
 
 #MTOC
-set MTOC_DIR={$ISSM_TIER}/externalpackages/mtoc/install
+set MTOC_DIR={$ISSM_DIR}/externalpackages/mtoc/install
 
 #Triangle
-set TRIANGLE_DIR={$ISSM_TIER}/externalpackages/triangle/install
+set TRIANGLE_DIR={$ISSM_DIR}/externalpackages/triangle/install
 
 #METIS
-set METIS_DIR={$ISSM_TIER}/externalpackages/metis/install
+set METIS_DIR={$ISSM_DIR}/externalpackages/metis/install
 
 #BLAS
-set BLAS_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/fblaslapack
+set BLAS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack
 
 #LAPACK
-set LAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH
+set LAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH
 
 #SCALAPACK
-set SCALAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH
+set SCALAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH
 
 #PLAPACK
-set PLAPACK_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32
+set PLAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32
 
 #BLACS
-set BLACS_DIR={$ISSM_TIER}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH
+set BLACS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH
 
 #sowing
-set SOWING_DIR={$ISSM_TIER}/externalpackages/sowing/install
+set SOWING_DIR={$ISSM_DIR}/externalpackages/sowing/install
 
 #YAMS
-set YAMS_DIR={$ISSM_TIER}/externalpackages/yams/install
+set YAMS_DIR={$ISSM_DIR}/externalpackages/yams/install
 
 #TEX2IM
-set TEX2IM_DIR={$ISSM_TIER}/externalpackages/tex2im/install
+set TEX2IM_DIR={$ISSM_DIR}/externalpackages/tex2im/install
 
 #Chaco
-set CHACO_DIR={$ISSM_TIER}/externalpackages/chaco/install
+set CHACO_DIR={$ISSM_DIR}/externalpackages/chaco/install
 
 #MeshPart
-set MESHPART_DIR={$ISSM_TIER}/externalpackages/meshpart/install
+set MESHPART_DIR={$ISSM_DIR}/externalpackages/meshpart/install
 
 #SCOTCH
-set SCOTCH_DIR={$ISSM_TIER}/externalpackages/scotch/install
+set SCOTCH_DIR={$ISSM_DIR}/externalpackages/scotch/install
 
 #Development packages
 #automake
-set AUTOMAKE_DIR={$ISSM_TIER}/externalpackages/automake/install
+set AUTOMAKE_DIR={$ISSM_DIR}/externalpackages/automake/install
 
 #autoconf
-set AUTOCONF_DIR={$ISSM_TIER}/externalpackages/autoconf/install
+set AUTOCONF_DIR={$ISSM_DIR}/externalpackages/autoconf/install
 
 #borland
@@ -79,6 +79,6 @@
 
 #ssh
-set SSH_DIR={$ISSM_TIER}/externalpackages/ssh
+set SSH_DIR={$ISSM_DIR}/externalpackages/ssh
 
 #valgrind
-set VALGRIND_DIR={$ISSM_TIER}/externalpackages/valgrind/install/bin
+set VALGRIND_DIR={$ISSM_DIR}/externalpackages/valgrind/install/bin
Index: /issm/trunk-jpl/etc/environment_variables.sh
===================================================================
--- /issm/trunk-jpl/etc/environment_variables.sh	(revision 12160)
+++ /issm/trunk-jpl/etc/environment_variables.sh	(revision 12161)
@@ -1,83 +1,83 @@
 #
 #
-#This routine can only be run if the ISSM_TIER variable has been correctly set!
+#This routine can only be run if the ISSM_DIR variable has been correctly set!
 #
 #
 
 #MATLAB
-MATLAB_DIR="$ISSM_TIER/externalpackages/matlab/install"
+MATLAB_DIR="$ISSM_DIR/externalpackages/matlab/install"
 
 #MPI
-MPI_DIR="$ISSM_TIER/externalpackages/mpich2/install"
+MPI_DIR="$ISSM_DIR/externalpackages/mpich2/install"
 
 #PETSC
-PETSC_DIR="$ISSM_TIER/externalpackages/petsc/install"
+PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"
 
 #SLEPC
-SLEPC_DIR="$ISSM_TIER/externalpackages/slepc/install"
+SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install"
 
 #Dakota
-DAKOTA_DIR="$ISSM_TIER/externalpackages/dakota/install"
+DAKOTA_DIR="$ISSM_DIR/externalpackages/dakota/install"
 
 #Qhull
-QHULL_DIR="$ISSM_TIER/externalpackages/qhull/install"
+QHULL_DIR="$ISSM_DIR/externalpackages/qhull/install"
 
 #Doxygen
-DOXYGEN_DIR="$ISSM_TIER/externalpackages/doxygen/install"
+DOXYGEN_DIR="$ISSM_DIR/externalpackages/doxygen/install"
 
 #MTOC
-MTOC_DIR="$ISSM_TIER/externalpackages/mtoc/install"
+MTOC_DIR="$ISSM_DIR/externalpackages/mtoc/install"
 
 #Triangle
-TRIANGLE_DIR="$ISSM_TIER/externalpackages/triangle/install"
+TRIANGLE_DIR="$ISSM_DIR/externalpackages/triangle/install"
 
 #METIS
-METIS_DIR="$ISSM_TIER/externalpackages/metis/install"
+METIS_DIR="$ISSM_DIR/externalpackages/metis/install"
 
 #BLAS
-BLAS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack"
+BLAS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack"
 
 #LAPACK
-LAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH"
+LAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH"
 
 #SCALAPACK
-SCALAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH"
+SCALAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH"
 
 #PLAPACK
-PLAPACK_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/PLAPACKR32"
+PLAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32"
 
 #BLACS
-BLACS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
+BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
 
 #sowing
-SOWING_DIR="$ISSM_TIER/externalpackages/sowing/install"
+SOWING_DIR="$ISSM_DIR/externalpackages/sowing/install"
 
 #BLACS
-BLACS_DIR="$ISSM_TIER/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
+BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
 
 #YAMS
-YAMS_DIR="$ISSM_TIER/externalpackages/yams/install"
+YAMS_DIR="$ISSM_DIR/externalpackages/yams/install"
 
 #BAMG
-BAMG_DIR="$ISSM_TIER/externalpackages/bamg/install"
+BAMG_DIR="$ISSM_DIR/externalpackages/bamg/install"
 
 #Chaco
-CHACO_DIR="$ISSM_TIER/externalpackages/chaco/install"
+CHACO_DIR="$ISSM_DIR/externalpackages/chaco/install"
 
 #MeshPart
-MESHPART_DIR="$ISSM_TIER/externalpackages/meshpart/install"
+MESHPART_DIR="$ISSM_DIR/externalpackages/meshpart/install"
 
 #SCOTCH
-SCOTCH_DIR="$ISSM_TIER/externalpackages/scotch/install"
+SCOTCH_DIR="$ISSM_DIR/externalpackages/scotch/install"
 
 #Development packages
 #automake
-AUTOMAKE_DIR="$ISSM_TIER/externalpackages/automake/install"
+AUTOMAKE_DIR="$ISSM_DIR/externalpackages/automake/install"
 
 #libtool
-LIBTOOL_DIR="$ISSM_TIER/externalpackages/libtool/install"
+LIBTOOL_DIR="$ISSM_DIR/externalpackages/libtool/install"
 
 #autoconf
-AUTOCONF_DIR="$ISSM_TIER/externalpackages/autoconf/install"
+AUTOCONF_DIR="$ISSM_DIR/externalpackages/autoconf/install"
 
 #borland
@@ -88,5 +88,5 @@
 
 #TEX2IM			 
-TEX2IM_DIR="$ISSM_TIER/externalpackages/tex2im/install" 
+TEX2IM_DIR="$ISSM_DIR/externalpackages/tex2im/install" 
 
 #sdk
@@ -94,40 +94,40 @@
 
 #ssh 
-SSH_DIR="$ISSM_TIER/externalpackages/ssh"
+SSH_DIR="$ISSM_DIR/externalpackages/ssh"
 
 #valgrind
-VALGRIND_DIR="$ISSM_TIER/externalpackages/valgrind/install/bin"
+VALGRIND_DIR="$ISSM_DIR/externalpackages/valgrind/install/bin"
 
 #graphviz
-GRAPHVIZ_DIR="$ISSM_TIER/externalpackages/graphviz/install/bin"
+GRAPHVIZ_DIR="$ISSM_DIR/externalpackages/graphviz/install/bin"
 
 #cppcheck
-CPPCHECK_DIR="$ISSM_TIER/externalpackages/cppcheck/install"
+CPPCHECK_DIR="$ISSM_DIR/externalpackages/cppcheck/install"
 
 #gdal
-GDAL_DIR="$ISSM_TIER/externalpackages/gdal/install"
+GDAL_DIR="$ISSM_DIR/externalpackages/gdal/install"
 
 #mercurial
-MERCURIAL_DIR="$ISSM_TIER/externalpackages/mercurial/install"
+MERCURIAL_DIR="$ISSM_DIR/externalpackages/mercurial/install"
 
 #boost
-BOOST_DIR="$ISSM_TIER/externalpackages/boost/install"
-BOOSTROOT="$ISSM_TIER/externalpackages/boost/install"
+BOOST_DIR="$ISSM_DIR/externalpackages/boost/install"
+BOOSTROOT="$ISSM_DIR/externalpackages/boost/install"
 
 #OpenAnalysis
-OPENANALYSISROOT="$ISSM_TIER/externalpackages/openanalysis/install"
+OPENANALYSISROOT="$ISSM_DIR/externalpackages/openanalysis/install"
 
 #xerces
-XERCESROOT="$ISSM_TIER/externalpackages/xerces/install"
-XERCESCROOT="$ISSM_TIER/externalpackages/xerces/src"
+XERCESROOT="$ISSM_DIR/externalpackages/xerces/install"
+XERCESCROOT="$ISSM_DIR/externalpackages/xerces/src"
 
 #xaifBooster
-XAIFBOOSTERROOT="$ISSM_TIER/externalpackages/xaifbooster/"
-XAIF_DIR="$ISSM_TIER/externalpackages/xaifbooster/xaifBooster"
-XAIFBOOSTER_HOME="$ISSM_TIER/externalpackages/xaifbooster/xaifBooster"
+XAIFBOOSTERROOT="$ISSM_DIR/externalpackages/xaifbooster/"
+XAIF_DIR="$ISSM_DIR/externalpackages/xaifbooster/xaifBooster"
+XAIFBOOSTER_HOME="$ISSM_DIR/externalpackages/xaifbooster/xaifBooster"
 PLATFORM=x86-Linux
 
 #angel
-ANGELROOT="$ISSM_TIER/externalpackages/angel/angel"
+ANGELROOT="$ISSM_DIR/externalpackages/angel/angel"
 
 #java
@@ -135,44 +135,44 @@
 
 #bbftp
-BBFTP_DIR="$ISSM_TIER/externalpackages/bbftp/install"
+BBFTP_DIR="$ISSM_DIR/externalpackages/bbftp/install"
 
 #adic2
-ADIC_DIR="$ISSM_TIER/externalpackages/adic/install"
+ADIC_DIR="$ISSM_DIR/externalpackages/adic/install"
 
 #colpack
-COLPACK_DIR="$ISSM_TIER/externalpackages/colpack/install"
+COLPACK_DIR="$ISSM_DIR/externalpackages/colpack/install"
 
 #eclipse
-ECLIPSE_DIR="$ISSM_TIER/externalpackages/eclipse/install"
+ECLIPSE_DIR="$ISSM_DIR/externalpackages/eclipse/install"
 
 #flaim
-FLAIM_DIR="$ISSM_TIER/externalpackages/flaim/install"
+FLAIM_DIR="$ISSM_DIR/externalpackages/flaim/install"
 
 #appscan
-APPSCAN_DIR="$ISSM_TIER/externalpackages/appscan"
+APPSCAN_DIR="$ISSM_DIR/externalpackages/appscan"
 
 #cppcheck
-CPPCHECK_DIR="$ISSM_TIER/externalpackages/cppcheck/install"
+CPPCHECK_DIR="$ISSM_DIR/externalpackages/cppcheck/install"
 
 #rats
-RATS_DIR="$ISSM_TIER/externalpackages/rats/install"
+RATS_DIR="$ISSM_DIR/externalpackages/rats/install"
 
 #dyson
-DYSON_DIR="$ISSM_TIER/externalpackages/dyson/"
+DYSON_DIR="$ISSM_DIR/externalpackages/dyson/"
 
 #cmake
-CMAKE_DIR="$ISSM_TIER/externalpackages/cmake/install"
+CMAKE_DIR="$ISSM_DIR/externalpackages/cmake/install"
 
 #shapelib
-SHAPELIB_DIR="$ISSM_TIER/externalpackages/shapelib/install"
+SHAPELIB_DIR="$ISSM_DIR/externalpackages/shapelib/install"
 
 #cccl
-CCCL_DIR="$ISSM_TIER/externalpackages/cccl/install"
+CCCL_DIR="$ISSM_DIR/externalpackages/cccl/install"
 
 #packagemaker
-PACKAGEMAKER_DIR="$ISSM_TIER/externalpackages/packagemaker/install"
+PACKAGEMAKER_DIR="$ISSM_DIR/externalpackages/packagemaker/install"
 
 #android-dev-dir
-ANDROID_DIR="$ISSM_TIER/externalpackages/android"
+ANDROID_DIR="$ISSM_DIR/externalpackages/android"
 
 #android-ndk
@@ -186,12 +186,12 @@
 
 #gsl
-GSL_DIR="$ISSM_TIER/externalpackages/gsl/install"
+GSL_DIR="$ISSM_DIR/externalpackages/gsl/install"
 
 #gnu make
-GMAKE_DIR="$ISSM_TIER/externalpackages/gmake/install"
+GMAKE_DIR="$ISSM_DIR/externalpackages/gmake/install"
 
 #PYTHON
-PYTHON_DIR="$ISSM_TIER/externalpackages/python/install"
+PYTHON_DIR="$ISSM_DIR/externalpackages/python/install"
 
 #MODELE
-MODELE_DIR="$ISSM_TIER/externalpackages/modelE"
+MODELE_DIR="$ISSM_DIR/externalpackages/modelE"