diff --git a/cfg/blake/trilinos.profile b/cfg/blake/trilinos.profile index f050c841032df5bfdab1fad60a50ff1bd926f095..2a08ff4ddd0030d146c3e333859f8a8a91e48181 100644 --- a/cfg/blake/trilinos.profile +++ b/cfg/blake/trilinos.profile @@ -2,9 +2,9 @@ function setEnsembleReduction(){ remove2env INCLUDE "${Trilinos_DIR}/include" remove2env LIB "${Trilinos_DIR}/lib" remove2env PYTHONPATH "${Trilinos_DIR}/lib/python2.7/site-packages" - remove2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib/python2.7/site-packages/PyTrilinos/" - remove2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib/python2.7/site-packages/" - remove2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib/" + remove2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib/python2.7/site-packages/PyTrilinos" + remove2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib/python2.7/site-packages" + remove2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib" if [ “$1†== “false†]; then export Trilinos_DIR=$Trilinos_DIR_NO_ER export Waves_DIR=$Waves_DIR_NO_ER @@ -17,9 +17,9 @@ function setEnsembleReduction(){ add2env INCLUDE "${Trilinos_DIR}/include" end add2env LIB "${Trilinos_DIR}/lib" end add2env PYTHONPATH "${Trilinos_DIR}/lib/python2.7/site-packages" front - add2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib/python2.7/site-packages/PyTrilinos/" end - add2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib/python2.7/site-packages/" end - add2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib/" end + add2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib/python2.7/site-packages/PyTrilinos" end + add2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib/python2.7/site-packages" end + add2env LD_LIBRARY_PATH "${Trilinos_DIR}/lib" end } export Trilinos_DIR_ER="/ascldap/users/knliege/local/trilinos_all/blake_ER" @@ -29,14 +29,3 @@ export Waves_DIR_NO_ER="/ascldap/users/knliege/dev/waves_all/blake/waves" setEnsembleReduction false -#export ensemble_reduction="false" -#if [ “$ensemble_reduction†== “false†]; then -#export Trilinos_DIR="/ascldap/users/knliege/local/trilinos_all/blake" -#else -#export Trilinos_DIR="/ascldap/users/knliege/local/trilinos_all/blake_ER" -#fi - -#export INCLUDE=$INCLUDE:"${Trilinos_DIR}/include" -#export LIB=$LIB:"${Trilinos_DIR}/lib" -#export PYTHONPATH="${Trilinos_DIR}/lib/python2.7/site-packages":$PYTHONPATH -#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${Trilinos_DIR}/lib/python2.7/site-packages/PyTrilinos/":"${Trilinos_DIR}/lib/python2.7/site-packages/":"${Trilinos_DIR}/lib/"