From 1cdd47dc34ce0eccce5f65638fb7470f3769a618 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 28 Oct 2020 11:23:48 +0100
Subject: [PATCH] SALOME 9.6.0 + MPI - SOLVERLAB compilation issue

---
 applications/SALOME-9.6.0-MPI.pyconf |  2 +-
 products/SOLVERLAB.pyconf            | 21 +++++++++++++++++++++
 products/compil_scripts/SOLVERLAB.sh |  6 ++++++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/applications/SALOME-9.6.0-MPI.pyconf b/applications/SALOME-9.6.0-MPI.pyconf
index a622a51..729a54c 100644
--- a/applications/SALOME-9.6.0-MPI.pyconf
+++ b/applications/SALOME-9.6.0-MPI.pyconf
@@ -132,7 +132,7 @@ APPLICATION :
         'JOBMANAGER' : {section : "default_MPI", verbose: 'yes'}
         'YACS'
         'YACSGEN'
-        'SOLVERLAB'
+        'SOLVERLAB' : {section : 'default_MPI', hpc: 'yes'}
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
diff --git a/products/SOLVERLAB.pyconf b/products/SOLVERLAB.pyconf
index b4d62f0..2aec479 100644
--- a/products/SOLVERLAB.pyconf
+++ b/products/SOLVERLAB.pyconf
@@ -29,4 +29,25 @@ default :
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     nb_proc : 1
+    properties:
+    {
+        is_SALOME_module : "yes"
+        incremental : "yes"
+    }
 }
+
+default_MPI :
+{
+    depend :
+    [
+        'hdf5',
+        'matplotlib',
+        'medfile',
+        'numpy',
+        'ParaView',
+        'petsc',
+        'Python',
+        'MEDCOUPLING',
+        'openmpi'
+    ]
+}
\ No newline at end of file
diff --git a/products/compil_scripts/SOLVERLAB.sh b/products/compil_scripts/SOLVERLAB.sh
index e297f23..7988099 100755
--- a/products/compil_scripts/SOLVERLAB.sh
+++ b/products/compil_scripts/SOLVERLAB.sh
@@ -18,6 +18,12 @@ CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPETSC_DIR=${PETSC_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMEDCOUPLING_ROOT_DIR=${MEDCOUPLING_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DCMAKE_INSTALL_PREFIX=${PRODUCT_INSTALL}"
 
+if [ -n "$SAT_HPC" ]
+then
+    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"
+fi
+
 echo
 echo "*** cmake "$CMAKE_OPTIONS
 cmake $CMAKE_OPTIONS $SOURCE_DIR
-- 
2.39.2