Fix path to mpicc and mpicxx

diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf
index f66992896a36dd6fb1fa621d189a95ee28c63240..e01dfe8514c0e7ad459adbe201a27f26a8ee943b 100644 (file)
--- a/products/MEDCOUPLING.pyconf
+++ b/products/MEDCOUPLING.pyconf
@@ -67,7 +67,7 @@ default_win :
 
 default_MPI :
 {
-    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER=${MPI_ROOT_DIR}/bin/mpicxx -DCMAKE_CC_COMPILER=${MPI_ROOT_DIR}/bin/mpicc"
+    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON"
     depend : [
               "boost",
               "cppunit",
@@ -103,7 +103,7 @@ default_32BIT_IDS_win:
 
 default_32BIT_IDS_MPI :
 {
-    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=OFF -DCMAKE_CXX_COMPILER=${MPI_ROOT_DIR}/bin/mpicxx -DCMAKE_CC_COMPILER=${MPI_ROOT_DIR}/bin/mpicc"
+    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=OFF"
     depend : [
               "boost",
               "cppunit",

diff --git a/products/compil_scripts/ParaView-4.2.0.sh b/products/compil_scripts/ParaView-4.2.0.sh
index 1c7af67077c5bee45b5bdbc289e8e5e9cc18c075..2524a470c1d745236d6de0053b92366d1b0df64c 100755 (executable)
--- a/products/compil_scripts/ParaView-4.2.0.sh
+++ b/products/compil_scripts/ParaView-4.2.0.sh
@@ -35,8 +35,8 @@ CMAKE_OPTIONS+=" -DPARAVIEW_USE_VISITBRIDGE=ON"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 else
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
     CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"

diff --git a/products/compil_scripts/ParaView-5.0.sh b/products/compil_scripts/ParaView-5.0.sh
index 12f4dd0a41dc041cdfcee5c2137fea76c8f6791d..367e46cc4eec46bbb50d1f34626ddd252ca9b0c7 100755 (executable)
--- a/products/compil_scripts/ParaView-5.0.sh
+++ b/products/compil_scripts/ParaView-5.0.sh
@@ -36,8 +36,8 @@ CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 else
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
     CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"

diff --git a/products/compil_scripts/ParaView-5.1-820-offscreen_rendering.sh b/products/compil_scripts/ParaView-5.1-820-offscreen_rendering.sh
index 56737efd551707555016258cb9d2e1aa9158fd46..300de9c206f729f77dd2285656a88442b2798fcc 100755 (executable)
--- a/products/compil_scripts/ParaView-5.1-820-offscreen_rendering.sh
+++ b/products/compil_scripts/ParaView-5.1-820-offscreen_rendering.sh
@@ -36,8 +36,8 @@ CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 else
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
     CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"

diff --git a/products/compil_scripts/ParaView-5.1-820.sh b/products/compil_scripts/ParaView-5.1-820.sh
index 9bd7472221979f594b7eab20f5ae9dae568ae43e..cf554a64d66b9d38539307e6782b9ced6ec33ece 100755 (executable)
--- a/products/compil_scripts/ParaView-5.1-820.sh
+++ b/products/compil_scripts/ParaView-5.1-820.sh
@@ -36,8 +36,8 @@ CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
     CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
     CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
 else

diff --git a/products/compil_scripts/ParaView-5.1.sh b/products/compil_scripts/ParaView-5.1.sh
index faadba590fa54be3aabfde0cab3b03f86288a18b..2f1e8956167e6682dc7e639805c29c9578503f27 100755 (executable)
--- a/products/compil_scripts/ParaView-5.1.sh
+++ b/products/compil_scripts/ParaView-5.1.sh
@@ -39,8 +39,8 @@ CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 else
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=OFF"
     CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=`which g++`"

diff --git a/products/compil_scripts/ParaView-5.10.0.sh b/products/compil_scripts/ParaView-5.10.0.sh
index f782c2ddda2334abbaffd81b63b5de4a02e44034..d5d79ae052bdb08665801b013e0e29943b918926 100755 (executable)
--- a/products/compil_scripts/ParaView-5.10.0.sh
+++ b/products/compil_scripts/ParaView-5.10.0.sh
@@ -116,8 +116,8 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_JAVA:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP=ON"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_FiltersParallelMPI=YES"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_ParallelMPI=YES"

diff --git a/products/compil_scripts/ParaView-5.4-b5c4c89.sh b/products/compil_scripts/ParaView-5.4-b5c4c89.sh
index 3a6dd3d1f36d87a6c9e83fbf96847289ee936429..46996f5877277f15a1707cffc758428224d6a01c 100755 (executable)
--- a/products/compil_scripts/ParaView-5.4-b5c4c89.sh
+++ b/products/compil_scripts/ParaView-5.4-b5c4c89.sh
@@ -36,8 +36,8 @@ CMAKE_OPTIONS+=" -DBUILD_TESTING:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
     CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
     CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"
 else

diff --git a/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh b/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh
index 39a7fef6938582004d8bee94eed5f7919c62f36a..c651e60986eb6a357751ddcf98ec84bec7503811 100755 (executable)
--- a/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh
+++ b/products/compil_scripts/ParaView-5.4.1_b5c4c89.sh
@@ -43,8 +43,10 @@ CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    if [ -n "$MPI4PY_ROOT_DIR" ]; then
+       CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+       CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+    fi
     CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
     # OP 11/04/2018 Option not used
     #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"

diff --git a/products/compil_scripts/ParaView-5.5.2p2_7591431.sh b/products/compil_scripts/ParaView-5.5.2p2_7591431.sh
index e5e2497b77f628b4761913b1dee0fd62c6bd71f4..cb5578969caa9155483f6e24c4f29bdd64a47e94 100755 (executable)
--- a/products/compil_scripts/ParaView-5.5.2p2_7591431.sh
+++ b/products/compil_scripts/ParaView-5.5.2p2_7591431.sh
@@ -38,8 +38,10 @@ CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    if [ -n "$MPI_ROOT_DIR" ]; then
+       CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+       CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+    fi
     CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
     # OP 11/04/2018 Option not used
     #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"

diff --git a/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh b/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh
index ed07de1e05ec0a2bc323bc474eedf0d5773fc693..c9978b9ef9deb9d52ffd062217b80f5e6c254e51 100755 (executable)
--- a/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh
+++ b/products/compil_scripts/ParaView-5.6.0_bfaf7b8.sh
@@ -43,8 +43,8 @@ CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
     CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
     # OP 11/04/2018 Option not used
     #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"

diff --git a/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh b/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh
index 7a0611896c98b80f013bf83d1b49d652515f2d71..f709a1443873ad320f87bf1d886568c194d16dd4 100755 (executable)
--- a/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh
+++ b/products/compil_scripts/ParaView-5.6.0p1_7bafc2b.sh
@@ -43,8 +43,10 @@ CMAKE_OPTIONS+=" -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS+=" -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    if [ -n "$MPI_ROOT_DIR" ]; then
+       CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+       CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+    fi
     CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST:BOOL=ON"
     # OP 11/04/2018 Option not used
     #    CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_PLUGIN_CoProcessingScriptGenerator:BOOL=ON"

diff --git a/products/compil_scripts/ParaView-5.8.0.sh b/products/compil_scripts/ParaView-5.8.0.sh
index 61a5db63717deafb39c571104cf29cf6b0f73039..7fa8a19cdb797070655f7384adb1a1eda41e0a7a 100755 (executable)
--- a/products/compil_scripts/ParaView-5.8.0.sh
+++ b/products/compil_scripts/ParaView-5.8.0.sh
@@ -118,8 +118,8 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_JAVA:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP=ON"
 elif [ -n "$VTK_SMP_IMPLEMENTATION_TYPE" ]
 then

diff --git a/products/compil_scripts/ParaView-5.9.0.sh b/products/compil_scripts/ParaView-5.9.0.sh
index 22e9b9cc2d76a6e96a0a3820e04e98eb4846ba76..db729b8436415bfe5328a6acef51a9fae8fa3d33 100755 (executable)
--- a/products/compil_scripts/ParaView-5.9.0.sh
+++ b/products/compil_scripts/ParaView-5.9.0.sh
@@ -116,8 +116,10 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_JAVA:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    if [ -n "$MPI_ROOT_DIR" ]; then
+       CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+       CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+    fi
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP=ON"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_FiltersParallelMPI=YES"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_ParallelMPI=YES"

diff --git a/products/compil_scripts/ParaView-5.9.1.sh b/products/compil_scripts/ParaView-5.9.1.sh
index 0e8b7f37140ffe3ab04263c4d48a9a6c879c4089..99593ed9acf8b1c7f15b00e390bd031da2189dc9 100755 (executable)
--- a/products/compil_scripts/ParaView-5.9.1.sh
+++ b/products/compil_scripts/ParaView-5.9.1.sh
@@ -119,8 +119,10 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_JAVA:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    if [ -n "$MPI_ROOT_DIR" ]; then
+       CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+       CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+    fi
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP=ON"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_FiltersParallelMPI=YES"
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_MODULE_ENABLE_VTK_ParallelMPI=YES"

diff --git a/products/compil_scripts/ParaView.sh b/products/compil_scripts/ParaView.sh
index c71136c2fb23dbb58e4b3ce74903f2f4ca367f94..94d3fa2207f271e378e806d84842482892123507 100755 (executable)
--- a/products/compil_scripts/ParaView.sh
+++ b/products/compil_scripts/ParaView.sh
@@ -116,8 +116,10 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_WRAP_JAVA:BOOL=OFF"
 if [ -n "$SAT_HPC" ]
 then
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DPARAVIEW_USE_MPI:BOOL=ON"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    if [ -n "$MPI_ROOT_DIR" ]; then
+       CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+       CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+    fi
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP -DVTKm_ENABLE_OPENMP=ON"
 elif [ -n "$VTK_SMP_IMPLEMENTATION_TYPE" ]
 then

diff --git a/products/compil_scripts/SOLVERLAB.sh b/products/compil_scripts/SOLVERLAB.sh
index baab925e597199758feb9bb5e2bf3a4f3fd7f138..df0e932b3c03cfff40816313ae5619a15e7ab95f 100755 (executable)
--- a/products/compil_scripts/SOLVERLAB.sh
+++ b/products/compil_scripts/SOLVERLAB.sh
@@ -9,8 +9,7 @@ CMAKE_OPTIONS+=" -DPython_ROOT_DIR=${PYTHON_ROOT_DIR}"
 CMAKE_OPTIONS+=" -DPython_EXECUTABLE=${PYTHONBIN}"
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
 
-if [ $VERSION == "V9_6_0" ]
-then
+if [ $VERSION == "V9_6_0" ]; then
     # GUI was ported after 9.6.0
     CMAKE_OPTIONS+=" -DCOREFLOWS_WITH_GUI=OFF"
     # following variables are automatically detected in environment after 9.6.0
@@ -30,19 +29,18 @@ else
     CMAKE_OPTIONS+=" -DCOREFLOWS_WITH_GUI=ON"
 fi
 
-if [ -n "$SAT_HPC" ]
-then
-    if [ $VERSION == "V9_6_0" ]
-    then
+if [ -n "$SAT_HPC" ]; then
+    if [ $VERSION == "V9_6_0" ] && [ -n "$MPI_ROOT_DIR" ]; then
         # following variable is automatically detected in environment after 9.6.0
         CMAKE_OPTIONS+=" -DMPI_HOME=${MPI_ROOT_DIR}"
     fi
     CMAKE_OPTIONS+=" -DMPI_ROOT_DIR=${MPI_ROOT_DIR}"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
     CMAKE_OPTIONS+=" -DSOLVERLAB_WITH_MPI=ON"
-    if [ -n "$MPI4PY_ROOT_DIR" ]
-    then
+    if [ -n "$MPI_ROOT_DIR" ]; then
+       CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+       CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
+    fi
+    if [ -n "$MPI4PY_ROOT_DIR" ]; then
        CMAKE_OPTIONS+=" -DMPI4PY_ROOT_DIR:PATH=${MPI4PY_ROOT_DIR}"
     else
         echo "WARNING: mpi4py environment variable not detected"
@@ -52,8 +50,7 @@ fi
 echo
 echo "*** cmake "$CMAKE_OPTIONS
 cmake $CMAKE_OPTIONS $SOURCE_DIR
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on cmake"
     exit 1
 fi
@@ -62,8 +59,7 @@ fi
 echo
 echo "*** make" $MAKE_OPTIONS
 make $MAKE_OPTIONS
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on make"
     exit 2
 fi
@@ -71,8 +67,7 @@ fi
 echo
 echo "*** make doc install"
 make docCDMATH docCoreFlows install
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on make install"
     exit 3
 fi

diff --git a/products/compil_scripts/cgns.sh b/products/compil_scripts/cgns.sh
index f0b1ceede9387fb27808e46a8e5758d00e5f3e7d..4dd814f5ae9a6a0f492e068a94aac7880e371826 100755 (executable)
--- a/products/compil_scripts/cgns.sh
+++ b/products/compil_scripts/cgns.sh
@@ -28,8 +28,10 @@ if [ -n "$SAT_HPC" ]
 then
     echo "HPC mode, activate -DHDF5_NEEDS_MPI:BOOL=ON option"
     CMAKE_OPTIONS+=" -DHDF5_NEEDS_MPI:BOOL=ON"
-    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++"
-    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
+    if [ -n "$MPI_ROOT_DIR" ]; then
+       CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=$(which mpic++)"
+       CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=$(which mpicc)"
+    fi
 fi
 
 echo

diff --git a/products/compil_scripts/cminpack-1.3.6.sh b/products/compil_scripts/cminpack-1.3.6.sh
index 4784e5a287f6851937033d169a83ab1159c79a4f..af16646dbd130afbfaacfcecacd1add67add6d3d 100755 (executable)
--- a/products/compil_scripts/cminpack-1.3.6.sh
+++ b/products/compil_scripts/cminpack-1.3.6.sh
@@ -4,20 +4,19 @@ echo "##########################################################################
 echo "Cminpack " $VERSION
 echo "##########################################################################"
 
-if [ -n "$MPI_ROOT_DIR" ]
-then
+CMAKE_OPTIONS=""
+
+if [-n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then
     echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
-    export CC=${MPI_ROOT_DIR}/bin/mpicc
-    export CXX=${MPI_ROOT_DIR}/bin/mpicxx
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 fi
 
-CMAKE_OPTIONS=""
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
 CMAKE_OPTIONS+=" -DUSE_BLAS=ON"
 CMAKE_OPTIONS+=" -DUSE_FPIC=ON"
 CMAKE_OPTIONS+=" -DBUILD_EXAMPLES=OFF"
-###CMAKE_OPTIONS+=" -DBUILD_SHARED_LIBS=ON"
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_LIBDIR:STRING=lib"
 # strangely on CentOS 8 - CMake fails to find CBLAS include directory
 if [[ $DIST_NAME == "CO" && $DIST_VERSION == "8" && $APPLICATION_NAME =~ native && -d /usr/include/cblas ]]; then

diff --git a/products/compil_scripts/hdf5Autotools.sh b/products/compil_scripts/hdf5Autotools.sh
index d699c3f487a88f995665a5718e349fa1af79d878..71feeddc0780f4ef8bc463023c2cb499a325f75e 100755 (executable)
--- a/products/compil_scripts/hdf5Autotools.sh
+++ b/products/compil_scripts/hdf5Autotools.sh
@@ -19,7 +19,7 @@ then
     CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --enable-parallel"
 #    export FC=mpif90
 #    export CXX=mpicxx
-#    export CC=${MPI_ROOT_DIR}/bin/mpiCC
+#    export CC=mpiCC
 else
     CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --enable-threadsafe"
     CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --enable-cxx"  # not compatible with --enable-parallel

diff --git a/products/compil_scripts/netcdf-4.6.2.sh b/products/compil_scripts/netcdf-4.6.2.sh
index 4f548238b4b1943f8720f46bccee72cbecdcf473..cf54ca31e279ef48f9f237522fd88df77403f216 100755 (executable)
--- a/products/compil_scripts/netcdf-4.6.2.sh
+++ b/products/compil_scripts/netcdf-4.6.2.sh
@@ -4,14 +4,13 @@ echo "##########################################################################
 echo "netcdf" $VERSION
 echo "##########################################################################"
 
-if [ -n "$MPI_ROOT_DIR" ]
-then
+CMAKE_OPTIONS=""
+if [ -n "$SAT_HPC" ]  && [ -n "$MPI_ROOT_DIR" ]; then
     echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
-    export CC=${MPI_ROOT_DIR}/bin/mpicc
-    export CXX=${MPI_ROOT_DIR}/bin/mpicxx
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 fi
 
-CMAKE_OPTIONS=""
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS+=" -DENABLE_NETCDF_4=ON"
 CMAKE_OPTIONS+=" -DENABLE_DAP=ON"

diff --git a/products/compil_scripts/openturns-1.16.sh b/products/compil_scripts/openturns-1.16.sh
index 927bcc9418f0afbde0760b55d7a23a64df7082a2..863adb32e5efd9d28b27c6b978c6fcc96e6a5551 100755 (executable)
--- a/products/compil_scripts/openturns-1.16.sh
+++ b/products/compil_scripts/openturns-1.16.sh
@@ -4,14 +4,12 @@ echo "##########################################################################
 echo "openturns" $VERSION
 echo "##########################################################################"
 
-if [ -n "$MPI_ROOT_DIR" ]
-then
+CMAKE_OPTIONS=""
+if [-n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then
     echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
-    export CC=${MPI_ROOT_DIR}/bin/mpicc
-    export CXX=${MPI_ROOT_DIR}/bin/mpicxx
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 fi
-
-CMAKE_OPTIONS=""
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
 CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
@@ -20,8 +18,7 @@ CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
 echo
 echo "*** cmake" $CMAKE_OPTIONS
 cmake $CMAKE_OPTIONS $SOURCE_DIR
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on cmake"
     exit 1
 fi
@@ -29,8 +26,7 @@ fi
 echo
 echo "*** make" $MAKE_OPTIONS
 make $MAKE_OPTIONS
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on make"
     exit 2
 fi
@@ -38,8 +34,7 @@ fi
 echo
 echo "*** make install"
 make install
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on make install"
     exit 3
 fi
@@ -47,8 +42,7 @@ fi
 echo
 echo "*** check installation"
 
-if [ -d "${PRODUCT_INSTALL}/lib64" ]
-then
+if [ -d "${PRODUCT_INSTALL}/lib64" ]; then
     mv ${PRODUCT_INSTALL}/lib64/* ${PRODUCT_INSTALL}/lib
     rmdir ${PRODUCT_INSTALL}/lib64
 fi
@@ -57,8 +51,7 @@ export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$
 export LD_LIBRARY_PATH=${PRODUCT_INSTALL}/lib:${LD_LIBRARY_PATH}
 chmod +x ${SOURCE_DIR}/python/test/t_features.py
 ${SOURCE_DIR}/python/test/t_features.py
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR  testing Openturns features...."
     exit 4
 fi

diff --git a/products/compil_scripts/openturns-1.17.sh b/products/compil_scripts/openturns-1.17.sh
index 38d1e264fce10cc13fda214e392d3df52a0ec52a..42e20172254983d9ec9d82c6e3fbf7c695eb3b3f 100755 (executable)
--- a/products/compil_scripts/openturns-1.17.sh
+++ b/products/compil_scripts/openturns-1.17.sh
@@ -10,14 +10,13 @@ export PATH=$(pwd)/bin:$PATH
 export PYTHONPATH=$(pwd):$PYTHONPATH
 export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION:0:3}/site-packages:$PYTHONPATH
 
-if [ -n "$MPI_ROOT_DIR" ]
-then
+CMAKE_OPTIONS=""
+if [-n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then
     echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
-    export CC=${MPI_ROOT_DIR}/bin/mpicc
-    export CXX=${MPI_ROOT_DIR}/bin/mpicxx
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 fi
 
-CMAKE_OPTIONS=""
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
 CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}"

diff --git a/products/compil_scripts/openturns.sh b/products/compil_scripts/openturns.sh
index 927bcc9418f0afbde0760b55d7a23a64df7082a2..aa97aa9fcdd6ad9753146d87eedc36e90d92b8d6 100755 (executable)
--- a/products/compil_scripts/openturns.sh
+++ b/products/compil_scripts/openturns.sh
@@ -4,14 +4,13 @@ echo "##########################################################################
 echo "openturns" $VERSION
 echo "##########################################################################"
 
-if [ -n "$MPI_ROOT_DIR" ]
-then
+CMAKE_OPTIONS=""
+if [-n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then
     echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
-    export CC=${MPI_ROOT_DIR}/bin/mpicc
-    export CXX=${MPI_ROOT_DIR}/bin/mpicxx
+    CMAKE_OPTIONS+=" -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER}"
+    CMAKE_OPTIONS+=" -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER}"
 fi
 
-CMAKE_OPTIONS=""
 CMAKE_OPTIONS+=" -DCMAKE_INSTALL_PREFIX:STRING=${PRODUCT_INSTALL}"
 CMAKE_OPTIONS+=" -DCMAKE_BUILD_TYPE:STRING=Release"
 CMAKE_OPTIONS+=" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
@@ -20,8 +19,7 @@ CMAKE_OPTIONS+=" -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
 echo
 echo "*** cmake" $CMAKE_OPTIONS
 cmake $CMAKE_OPTIONS $SOURCE_DIR
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on cmake"
     exit 1
 fi
@@ -29,8 +27,7 @@ fi
 echo
 echo "*** make" $MAKE_OPTIONS
 make $MAKE_OPTIONS
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on make"
     exit 2
 fi
@@ -38,8 +35,7 @@ fi
 echo
 echo "*** make install"
 make install
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on make install"
     exit 3
 fi
@@ -47,8 +43,7 @@ fi
 echo
 echo "*** check installation"
 
-if [ -d "${PRODUCT_INSTALL}/lib64" ]
-then
+if [ -d "${PRODUCT_INSTALL}/lib64" ]; then
     mv ${PRODUCT_INSTALL}/lib64/* ${PRODUCT_INSTALL}/lib
     rmdir ${PRODUCT_INSTALL}/lib64
 fi
@@ -57,8 +52,7 @@ export PYTHONPATH=${PRODUCT_INSTALL}/lib/python${PYTHON_VERSION}/site-packages:$
 export LD_LIBRARY_PATH=${PRODUCT_INSTALL}/lib:${LD_LIBRARY_PATH}
 chmod +x ${SOURCE_DIR}/python/test/t_features.py
 ${SOURCE_DIR}/python/test/t_features.py
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR  testing Openturns features...."
     exit 4
 fi

diff --git a/products/compil_scripts/petsc-3.15.0.sh b/products/compil_scripts/petsc-3.15.0.sh
index 7a9d7d000c05a7e6f5b500a22cd9f3260e3e3e5c..ca61a60051257fefed0c5cbe778177f9c681f3a4 100755 (executable)
--- a/products/compil_scripts/petsc-3.15.0.sh
+++ b/products/compil_scripts/petsc-3.15.0.sh
@@ -15,8 +15,7 @@ CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --with-hdf5-dir=${HDF5_ROOT_DIR}"
 CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-metis=ext/metis-5.1.0-p10.tar.gz"
 CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --with-debugging=0" # by default Petsc is build in debug mode
 echo
-if [ -n "${MPI_ROOT_DIR}" ]
-then
+if [-n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then
   echo "*** configure with mpi"
   CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-hypre=ext/hypre-2.20.0.tar.gz"
   CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-parms=ext/parms-3.2-p5.tar.gz"

diff --git a/products/compil_scripts/petsc.sh b/products/compil_scripts/petsc.sh
index a89500b62e6120c7044c427989403a0c10d63020..822f695d227ffce3d5676b19ce371df9ca7b1d20 100755 (executable)
--- a/products/compil_scripts/petsc.sh
+++ b/products/compil_scripts/petsc.sh
@@ -13,8 +13,7 @@ CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-f2cblaslapack=ext/f2cblaslapack-3.4
 CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-slepc=ext/slepc-3.14.0"
 CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --with-debugging=0" # by default Petsc is build in debug mode
 echo
-if [ -n "${MPI_ROOT_DIR}" ]
-then
+if [-n "$SAT_HPC" ] && [ -n "$MPI_ROOT_DIR" ]; then
   echo "*** configure with mpi"
   CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-hypre=ext/hypre-2.20.0"
   ./configure --prefix=${PRODUCT_INSTALL} --with-mpi-dir=${MPI_ROOT_DIR} ${CONFIGURE_FLAGS}
@@ -23,8 +22,7 @@ else
   ./configure --prefix=${PRODUCT_INSTALL} --with-mpi=0 ${CONFIGURE_FLAGS}
 fi
 
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on configure"
     exit 1
 fi
@@ -34,20 +32,15 @@ MAKE_OPTIONS="PETSC_DIR=${BUILD_DIR}"
 echo
 echo "*** make" $MAKE_OPTIONS
 make $MAKE_OPTIONS
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on make"
     exit 2
 fi
 
-# CentOS 6 automatically set PETSC_ARCH to arch-linux2-c-debug : remove arch specification
-# MAKE_OPTIONS=$MAKE_OPTIONS" PETSC_ARCH=arch-linux-c-debug"
-
 echo
 echo "*** make install"
 make $MAKE_OPTIONS install
-if [ $? -ne 0 ]
-then
+if [ $? -ne 0 ]; then
     echo "ERROR on make install"
     exit 3
 fi

diff --git a/products/env_scripts/openmpi.py b/products/env_scripts/openmpi.py
index 5698ce15b10a5b0e8d57b3813c68d756bf433b4c..17b6b1475ec87b2970e46cd63cbe86f7ca78d6f1 100644 (file)
--- a/products/env_scripts/openmpi.py
+++ b/products/env_scripts/openmpi.py
@@ -33,6 +33,8 @@ def set_nativ_env(env):
     env.set('MPI_ROOT_DIR', prereq_dir)
     env.set('OPENMPIDIR', prereq_dir)
     env.set('MPI_ROOT', prereq_dir)
+    env.set('MPI_C_COMPILER', os.path.join(mpibin_dir,'mpicc'))
+    env.set('MPI_CXX_COMPILER', os.path.join(mpibin_dir,'mpicxx'))
     env.set('MPI_C_FOUND', os.path.join(prereq_dir,'lib','libmpi.so'))
     env.prepend('PATH', mpibin_dir)
     env.prepend('LD_LIBRARY_PATH', os.path.join(prereq_dir,'lib'))