Updated environment file

diff --git a/env_SOLVERLAB.sh b/env_SOLVERLAB.sh
index fb3442adc5ec89cbe3c108365738e559e12f5b0d..a7f01dcff173f8900aacb687772c8fdbc830944f 100644 (file)
--- a/env_SOLVERLAB.sh
+++ b/env_SOLVERLAB.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-export CDMATH_INSTALL=@CMAKE_INSTALL_PREFIX@
-export COREFLOWS_INSTALL=@CMAKE_INSTALL_PREFIX@
+export SOLVERLAB_INSTALL=@CMAKE_INSTALL_PREFIX@
 export PETSC_DIR=@PETSC_INSTALL@
 export PETSC_ARCH=@PETSC_ARCH@
 export PETSC_INCLUDES=@PETSC_INCLUDES_INSTALL@
@@ -16,20 +15,22 @@ export PV_LIB_DIR=@PV_LIB_DIR@
 export PV_PYTHON_DIR=@PV_PYTHON_DIR@
 export HDF5_ROOT=@HDF5_ROOT@
 
+export SOLVERLAB=$SOLVERLAB_INSTALL/bin/Executable/COREFLOWSMainExe
+export LD_LIBRARY_PATH=$SOLVERLAB_INSTALL/lib:$PETSC_DIR/lib:$PETSC_DIR/$PETSC_ARCH/lib:$MEDCOUPLING_LIBRARIES:$MEDFILE_ROOT_DIR/lib:$HDF5_ROOT/lib:$PV_LIB_DIR:$LD_LIBRARY_PATH
+export PYTHONPATH=$SOLVERLAB_INSTALL/bin:$SOLVERLAB_INSTALL/bin/cdmath:$SOLVERLAB_INSTALL/bin/cdmath/postprocessing:$SOLVERLAB_INSTALL/bin/coreflows:$SOLVERLAB_INSTALL/lib:$SOLVERLAB_INSTALL/lib/cdmath:$SOLVERLAB_INSTALL/lib/coreflows:$PETSC_DIR/$PETSC_ARCH/lib:$PETSC_DIR/lib:$MEDCOUPLING_LIBRARIES:$MEDCOUPLING_LIBRARIES/python@Python_VERSION_MAJOR@.@Python_VERSION_MINOR@/site-packages/:$MEDFILE_ROOT_DIR/lib:$HDF5_ROOT/lib:$MPI4PY_ROOT_DIR:$PV_PYTHON_DIR:$PYTHONPATH
+
 if [ @SOLVERLAB_WITH_MPI@ = ON ] 
 then
-  export mpirun=${PETSC_DIR}/${PETSC_ARCH}/bin/mpirun
-  export mpiexec=${PETSC_DIR}/${PETSC_ARCH}/bin/mpiexec
+  export mpirun=$PETSC_DIR/$PETSC_ARCH/bin/mpirun
+  export mpiexec=$PETSC_DIR/$PETSC_ARCH/bin/mpiexec
+  export MPI4PY_ROOT_DIR=@MPI4PY_ROOT_DIR@
+  export PYTHONPATH=$MPI4PY_ROOT_DIR:$PYTHONPATH
 fi
 
-export COREFLOWS=$COREFLOWS_INSTALL/bin/Executable/COREFLOWSMainExe
-export LD_LIBRARY_PATH=$COREFLOWS_INSTALL/lib:$CDMATH_INSTALL/lib:${PETSC_DIR}/lib:$PETSC_LIBRARIES:${MEDCOUPLING_LIBRARIES}:${MEDFILE_ROOT_DIR}/lib:$MEDFILE_LIBRARIES:${MEDFILE_C_LIBRARIES}:$HDF5_ROOT/lib:$PV_LIB_DIR:${LD_LIBRARY_PATH}
-export PYTHONPATH=$COREFLOWS_INSTALL/bin:$COREFLOWS_INSTALL/lib:$COREFLOWS_INSTALL/lib/coreflows:$COREFLOWS_INSTALL/bin/coreflows:$COREFLOWS_INSTALL/lib/python:$CDMATH_INSTALL/lib/cdmath:$CDMATH_INSTALL/bin/cdmath:$CDMATH_INSTALL/bin/cdmath/postprocessing:$PV_PYTHON_DIR:${PETSC_DIR}/${PETSC_ARCH}/lib:${PETSC_DIR}/lib:$PETSC_LIBRARIES:${PETSC_DIR}/${PETSC_ARCH}/lib/petsc4py:${PETSC_DIR}/${PETSC_ARCH}/lib/petsc4py/lib/${PETSC_ARCH}:${PETSC_DIR}/lib/petsc4py:${PETSC_DIR}/lib/petsc4py/lib:${MEDCOUPLING_LIBRARIES}:${MEDCOUPLING_LIBRARIES}/python@Python_VERSION_MAJOR@.@Python_VERSION_MINOR@/site-packages/:${MEDFILE_ROOT_DIR}/lib:$MEDFILE_LIBRARIES:${MEDFILE_C_LIBRARIES}:${PYTHONPATH}
-
 if [ @PRELOAD_NETCDF_ON_UBUNTU20@ = ON ] 
 then
     export  LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libnetcdf.so
 fi
 
-export SOLVERLAB_ROOT_DIR=$COREFLOWS_INSTALL
-export SOLVERLABGUI=$COREFLOWS_INSTALL/bin/salome/CoreFlows_Standalone.py
+export SOLVERLAB_ROOT_DIR=$SOLVERLAB_INSTALL
+export SOLVERLABGUI=$SOLVERLAB_INSTALL/bin/salome/CoreFlows_Standalone.py