Corrected SOLVERLAB environment file (PYTHONPATH and LD_LIBRARY_PATH

diff --git a/CDMATH/env_CDMATH.sh b/CDMATH/env_CDMATH.sh
index d878806d3ef3a98379c4c68b6a4a946376e1543d..b3589402dc77d5f96554fc664d0137440bc50bb1 100755 (executable)
--- a/CDMATH/env_CDMATH.sh
+++ b/CDMATH/env_CDMATH.sh
@@ -14,6 +14,6 @@ export MEDCOUPLING_LIBRARIES=@MEDCOUPLING_LIBRARIES@
 export PV_LIB_DIR=@PV_LIB_DIR@
 export PV_PYTHON_DIR=@PV_PYTHON_DIR@
 
-export LD_LIBRARY_PATH=$CDMATH_INSTALL/lib:$MEDCOUPLING_LIBRARIES:$MEDFILE_LIBRARIES:$PETSC_LIBRARIES:${PETSC_DIR}/${PETSC_ARCH}/lib:$PV_LIB_DIR:${LD_LIBRARY_PATH}
-export PYTHONPATH=$CDMATH_INSTALL/lib/cdmath:$CDMATH_INSTALL/bin/cdmath:$CDMATH_INSTALL/bin/cdmath/postprocessing:$CDMATH_INSTALL/$PV_PYTHON_DIR:$MEDCOUPLING_LIBRARIES:$MEDFILE_LIBRARIES:$PETSC_LIBRARIES:${PETSC_DIR}/${PETSC_ARCH}/lib:${PYTHONPATH}
+export LD_LIBRARY_PATH=$CDMATH_INSTALL/lib:$MEDCOUPLING_LIBRARIES:$MEDFILE_LIBRARIES:${MEDFILE_ROOT_DIR}/lib:${MEDFILE_C_LIBRARIES}:$PETSC_LIBRARIES:${PETSC_DIR}/${PETSC_ARCH}/lib:$PV_LIB_DIR:${LD_LIBRARY_PATH}
+export PYTHONPATH=$CDMATH_INSTALL/lib/cdmath:$CDMATH_INSTALL/bin/cdmath:$CDMATH_INSTALL/bin/cdmath/postprocessing:$CDMATH_INSTALL/$PV_PYTHON_DIR:$MEDCOUPLING_LIBRARIES:${MEDFILE_ROOT_DIR}/lib:$MEDFILE_LIBRARIES:$PETSC_LIBRARIES:${MEDFILE_C_LIBRARIES}:${PETSC_DIR}/${PETSC_ARCH}/lib:${PYTHONPATH}
 

diff --git a/env_SOLVERLAB.sh b/env_SOLVERLAB.sh
index 37d9fb87f966e04c174ef84e5cf5c081a56b4b8d..b044bcb8879ede7461a8dfc4a3221f5dd4c86c72 100644 (file)
--- a/env_SOLVERLAB.sh
+++ b/env_SOLVERLAB.sh
@@ -15,12 +15,7 @@ export MEDCOUPLING_LIBRARIES=@MEDCOUPLING_LIBRARIES@
 export PV_LIB_DIR=@PV_LIB_DIR@
 export PV_PYTHON_DIR=@PV_PYTHON_DIR@
 
-#CDMATH paths
-export LD_LIBRARY_PATH=$CDMATH_INSTALL/lib:$MEDCOUPLING_LIBRARIES:$MEDFILE_LIBRARIES:$PETSC_LIBRARIES:${PETSC_DIR}/${PETSC_ARCH}/lib:$PV_LIB_DIR:${LD_LIBRARY_PATH}
-export PYTHONPATH=$CDMATH_INSTALL/lib/cdmath:$CDMATH_INSTALL/bin/cdmath:$CDMATH_INSTALL/bin/cdmath/postprocessing:$CDMATH_INSTALL/$PV_PYTHON_DIR:$MEDCOUPLING_LIBRARIES:$MEDFILE_LIBRARIES:$PETSC_LIBRARIES:${PETSC_DIR}/${PETSC_ARCH}/lib:${PYTHONPATH}
-
-#CoreFlows paths
-export CoreFlows=$CoreFlows_INSTALL/bin/Executable/CoreFlowsMainExe
-export LD_LIBRARY_PATH=$CoreFlows_INSTALL/lib:$CDMATH_DIR/lib:${PETSC_DIR}/${PETSC_ARCH}/lib:${MEDCOUPLING_LIBRARIES}:${MEDFILE_C_LIBRARIES}:${LD_LIBRARY_PATH}
-export PYTHONPATH=$CoreFlows_INSTALL/lib:$CoreFlows_INSTALL/lib/CoreFlows_Python:$CoreFlows_INSTALL/bin/CoreFlows_Python:$CoreFlows_INSTALL/lib/python2.7/site-packages/salome:$CDMATH_DIR/lib/cdmath:$CDMATH_DIR/bin/cdmath:$CDMATH_DIR/bin/cdmath/postprocessing:${PETSC_DIR}/${PETSC_ARCH}/lib:${MEDCOUPLING_LIBRARIES}:${MEDFILE_C_LIBRARIES}:${PYTHONPATH}
-export CoreFlowsGUI=$CoreFlows_INSTALL/bin/salome/CoreFlows_Standalone.py
+export COREFLOWS=$COREFLOWS_INSTALL/bin/Executable/COREFLOWSMainExe
+export LD_LIBRARY_PATH=$COREFLOWS_INSTALL/lib:$CDMATH_INSTALL/lib:${PETSC_DIR}/${PETSC_ARCH}/lib:$PETSC_LIBRARIES:${MEDCOUPLING_LIBRARIES}:${MEDFILE_ROOT_DIR}/lib:$MEDFILE_LIBRARIES:${MEDFILE_C_LIBRARIES}:$PV_LIB_DIR:${LD_LIBRARY_PATH}
+export PYTHONPATH=$COREFLOWS_INSTALL/lib:$COREFLOWS_INSTALL/lib/coreflows:$COREFLOWS_INSTALL/bin/coreflows:$COREFLOWS_INSTALL/lib/python2.7/site-packages/salome:$CDMATH_INSTALL/lib/cdmath:$CDMATH_INSTALL/bin/cdmath:$CDMATH_INSTALL/bin/cdmath/postprocessing:$CDMATH_INSTALL/$PV_PYTHON_DIR:${PETSC_DIR}/${PETSC_ARCH}/lib:$PETSC_LIBRARIES:${MEDCOUPLING_LIBRARIES}:${MEDFILE_ROOT_DIR}/lib:$MEDFILE_LIBRARIES:${MEDFILE_C_LIBRARIES}:${PYTHONPATH}
+export COREFLOWSGUI=$COREFLOWS_INSTALL/bin/salome/COREFLOWS_Standalone.py