diff --git a/cfg/blake-lsm1/gmsh.profile b/cfg/blake-lsm1/gmsh.profile deleted file mode 100644 index acbc6406482abb9367df35a287bc07840c77d15c..0000000000000000000000000000000000000000 --- a/cfg/blake-lsm1/gmsh.profile +++ /dev/null @@ -1 +0,0 @@ -PATH="/home/knliege/local/gmsh/bin":$PATH diff --git a/cfg/blake-lsm1/trilinos.profile b/cfg/blake-lsm1/trilinos.profile deleted file mode 100644 index 471eb687fa480888840b842add536e730227ff75..0000000000000000000000000000000000000000 --- a/cfg/blake-lsm1/trilinos.profile +++ /dev/null @@ -1,6 +0,0 @@ - -export Trilinos_DIR="/ascldap/users/knliege/local/trilinos_all/blake" -export INCLUDE=$INCLUDE:"${Trilinos_DIR}/include" -export LIB=$LIB:"${Trilinos_DIR}/lib" -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/" - diff --git a/cfg/blake-lsm1/anaconda.profile b/cfg/blake/anaconda.profile similarity index 85% rename from cfg/blake-lsm1/anaconda.profile rename to cfg/blake/anaconda.profile index 14b79af81f9160afde7764d3e289fae8b630b5e3..d23a9a7fd9c20fc518d396c55cb4ed95b3161daf 100644 --- a/cfg/blake-lsm1/anaconda.profile +++ b/cfg/blake/anaconda.profile @@ -1,7 +1,9 @@ #module load python/2.7.13 export PATH="/ascldap/users/knliege/blake/miniconda2/bin:$PATH" +#echo ". /ascldap/users/knliege/blake/miniconda2/etc/profile.d/conda.sh" >> ~/.bashrc +#echo "conda activate" >> ~/.bashrc export PYTHONPATH="/ascldap/users/knliege/local/python_blake/lib/python2.7/site-packages":$PYTHONPATH -export PYTHONPATH="/ascldap/users/knliege/local/trilinos_all/blake/lib/python2.7/site-packages":$PYTHONPATH + #export PATH="/ascldap/users/knliege/local/python/bin":$PATH #export PATH="/ascldap/users/knliege/local/python/bin":$PATH #export PATH=/ascldap/users/knliege/.local/bin:$PATH diff --git a/cfg/blake-lsm1/compilers.profile b/cfg/blake/compilers.profile similarity index 100% rename from cfg/blake-lsm1/compilers.profile rename to cfg/blake/compilers.profile diff --git a/cfg/blake/gmsh.profile b/cfg/blake/gmsh.profile new file mode 100644 index 0000000000000000000000000000000000000000..4b9d4e93edf8930ec93abd9fb478b387af09aa28 --- /dev/null +++ b/cfg/blake/gmsh.profile @@ -0,0 +1,2 @@ +PATH="/ascldap/users/knliege/local/gmsh2/gmsh-3.0.5-Linux/bin":$PATH +export LD_LIBRARY_PATH=/ascldap/users/knliege/local/lib:$LD_LIBRARY_PATH diff --git a/cfg/blake-lsm1/swig.profile b/cfg/blake/swig.profile similarity index 100% rename from cfg/blake-lsm1/swig.profile rename to cfg/blake/swig.profile diff --git a/cfg/blake/trilinos.profile b/cfg/blake/trilinos.profile new file mode 100644 index 0000000000000000000000000000000000000000..f050c841032df5bfdab1fad60a50ff1bd926f095 --- /dev/null +++ b/cfg/blake/trilinos.profile @@ -0,0 +1,42 @@ +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/" + if [ “$1†== “false†]; then + export Trilinos_DIR=$Trilinos_DIR_NO_ER + export Waves_DIR=$Waves_DIR_NO_ER + export ensemble_reduction="false" + else + export Trilinos_DIR=$Trilinos_DIR_ER + export Waves_DIR=$Waves_DIR_ER + export ensemble_reduction="true" + fi + 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 +} + +export Trilinos_DIR_ER="/ascldap/users/knliege/local/trilinos_all/blake_ER" +export Trilinos_DIR_NO_ER="/ascldap/users/knliege/local/trilinos_all/blake" +export Waves_DIR_ER="/ascldap/users/knliege/dev/waves_all/blake_ER/waves" +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/" diff --git a/cfg/blake-lsm1/vtk.profile b/cfg/blake/vtk.profile similarity index 100% rename from cfg/blake-lsm1/vtk.profile rename to cfg/blake/vtk.profile diff --git a/cfg/blake/vtune.profile b/cfg/blake/vtune.profile new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/cfg/bowman-lsm1/gmsh.profile b/cfg/bowman-lsm1/gmsh.profile index acbc6406482abb9367df35a287bc07840c77d15c..4b9d4e93edf8930ec93abd9fb478b387af09aa28 100644 --- a/cfg/bowman-lsm1/gmsh.profile +++ b/cfg/bowman-lsm1/gmsh.profile @@ -1 +1,2 @@ -PATH="/home/knliege/local/gmsh/bin":$PATH +PATH="/ascldap/users/knliege/local/gmsh2/gmsh-3.0.5-Linux/bin":$PATH +export LD_LIBRARY_PATH=/ascldap/users/knliege/local/lib:$LD_LIBRARY_PATH diff --git a/cfg/loop.sh b/cfg/loop.sh index e3b00cae4a4951ae6e1a9f04452940204ccf2658..6c2823886ef657ebb35c28b5d6942833ec55be27 100755 --- a/cfg/loop.sh +++ b/cfg/loop.sh @@ -10,6 +10,20 @@ # (by gnome on ubuntu/debian for the .profile) # => avoid bashisms (e.g. ~ becomes $HOME) +function remove2env() +{ + if [ $# -ne 2 ] ; then + echo "remove2env VARNAME folder" + return + fi + + eval PATH_TMP=\$$1 + PATH_TMP=${PATH_TMP//":$2:"/":"} # delete any instances in the middle + PATH_TMP=${PATH_TMP/#"$2:"/} # delete any instance at the beginning + PATH_TMP=${PATH_TMP/%":$2"/} # delete any instance at the end + eval export $1=$PATH_TMP +} + function add2env() { #verb=1 #uncomment to debug script