Index: /issm/trunk/etc/environment.csh
===================================================================
--- /issm/trunk/etc/environment.csh	(revision 1350)
+++ /issm/trunk/etc/environment.csh	(revision 1351)
@@ -16,11 +16,9 @@
 #PETSC
 setenv PETSC_DIR
-setenv PETSC_ARCH
-setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$PETSC_DIR/lib/{$PETSC_ARCH}
+setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$PETSC_DIR/lib/{$ISSM_ARCH}
 
 #SLEPC
 setenv SLEPC_DIR
-setenv SLEPC_ARCH
-setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$SLEPC_DIR/lib/{$PETSC_ARCH}
+setenv LD_LIBRARY_PATH {$LD_LIBRARY_PATH}:$SLEPC_DIR/lib/{$ISSM_ARCH}
 
 
Index: /issm/trunk/etc/environment.sh
===================================================================
--- /issm/trunk/etc/environment.sh	(revision 1350)
+++ /issm/trunk/etc/environment.sh	(revision 1351)
@@ -16,13 +16,11 @@
 #PETSC
 export PETSC_DIR
-export PETSC_ARCH
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PETSC_DIR/lib/$PETSC_ARCH"
-export LD_RUN_PATH="$LD_RUN_PATH:$PETSC_DIR/lib/$PETSC_ARCH"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PETSC_DIR/lib/$ISSM_ARCH"
+export LD_RUN_PATH="$LD_RUN_PATH:$PETSC_DIR/lib/$ISSM_ARCH"
 
 #SLEPC
 export SLEPC_DIR
-export SLEPC_ARCH
-export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SLEPC_DIR/lib/$PETSC_ARCH"
-export LD_RUN_PATH="$LD_RUN_PATH:$SLEPC_DIR/lib/$PETSC_ARCH"
+export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SLEPC_DIR/lib/$ISSM_ARCH"
+export LD_RUN_PATH="$LD_RUN_PATH:$SLEPC_DIR/lib/$ISSM_ARCH"
 
 #Dakota
Index: /issm/trunk/etc/environment_variables.csh
===================================================================
--- /issm/trunk/etc/environment_variables.csh	(revision 1350)
+++ /issm/trunk/etc/environment_variables.csh	(revision 1351)
@@ -13,9 +13,7 @@
 #PETSC
 set PETSC_DIR={$ISSM_DIR}/externalpackages/petsc/install
-set PETSC_ARCH=linux-gnu-amd64
 
 #SLEPC
 set SLEPC_DIR={$ISSM_DIR}/externalpackages/slepc/install
-set SLEPC_ARCH=linux-gnu-amd64
 
 #Dakota
@@ -41,8 +39,8 @@
 
 #LAPACK
-set LAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$PETSC_ARCH
+set LAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$ISSM_ARCH
 
 #SCALAPACK
-set SCALAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$PETSC_ARCH
+set SCALAPACK_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$ISSM_ARCH
 
 #PLAPACK
@@ -50,5 +48,5 @@
 
 #BLACS
-set BLACS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$PETSC_ARCH
+set BLACS_DIR={$ISSM_DIR}/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$ISSM_ARCH
 
 #sowing
Index: /issm/trunk/etc/environment_variables.sh
===================================================================
--- /issm/trunk/etc/environment_variables.sh	(revision 1350)
+++ /issm/trunk/etc/environment_variables.sh	(revision 1351)
@@ -14,9 +14,7 @@
 #PETSC
 PETSC_DIR="$ISSM_DIR/externalpackages/petsc/install"
-PETSC_ARCH="linux-gnu-amd64"
 
 #SLEPC
 SLEPC_DIR="$ISSM_DIR/externalpackages/slepc/install"
-SLEPC_ARCH="linux-gnu-amd64"
 
 #Dakota
@@ -39,17 +37,17 @@
 
 #BLAS
-BLAS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalexternalpackages/fblaslapack"
+BLAS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack"
 
 #LAPACK
-LAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalexternalpackages/fblaslapack/$PETSC_ARCH"
+LAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH"
 
 #SCALAPACK
-SCALAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalexternalpackages/SCALAPACK/$PETSC_ARCH"
+SCALAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH"
 
 #PLAPACK
-PLAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalexternalpackages/PLAPACKR32"
+PLAPACK_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32"
 
 #BLACS
-BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$PETSC_ARCH"
+BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
 
 #sowing
@@ -57,5 +55,5 @@
 
 #BLACS
-BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalexternalpackages/blacs-dev/$PETSC_ARCH"
+BLACS_DIR="$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH"
 
 #YAMS