From cabaa50d8520faea40832c280901ec9dfe555eab Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Mon, 16 May 2022 20:35:57 +0200
Subject: [PATCH] SALOME 9.9.0-MPI final fixes

---
 applications/SALOME-9.9.0-MPI.pyconf  |  6 +++---
 applications/SALOME-master-MPI.pyconf | 16 ++++++++--------
 products/HOMARD.pyconf                | 12 ++++++++++++
 products/compil_scripts/gdal-2.4.0.sh |  2 +-
 products/compil_scripts/med-4.1.1.sh  |  3 +++
 products/medfile.pyconf               |  2 +-
 6 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/applications/SALOME-9.9.0-MPI.pyconf b/applications/SALOME-9.9.0-MPI.pyconf
index 8e76a46..d8a9872 100644
--- a/applications/SALOME-9.9.0-MPI.pyconf
+++ b/applications/SALOME-9.9.0-MPI.pyconf
@@ -155,10 +155,10 @@ APPLICATION :
         'GMSHPLUGIN'
         'HEXABLOCK' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
         'HEXABLOCKPLUGIN'
-        'HOMARD'
-        'FIELDS' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME
+        'HOMARD' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
+        'FIELDS' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
         'OPENTURNS_SALOME': 'master' # FIXME
-        'PARAVIS' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME
+        'PARAVIS' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME
         'JOBMANAGER' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME
         'YACS'
         'YACSGEN'
diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 46ad914..d9f0450 100644
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -141,8 +141,8 @@ APPLICATION :
         'SHAPERSTUDY'
         'RESTRICTED'
         'LIBBATCH' : {tag : 'V2_4_5'}
-        'KERNEL' : {section : 'default_MPI', verbose : 'yes'}
-        'MEDCOUPLING' : {section : 'default_MPI', verbose : 'yes'}
+        'KERNEL'      : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'}
+        'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'}
         'GUI' : {verbose : 'yes'}
         'GEOM'
         'SMESH'
@@ -153,15 +153,15 @@ APPLICATION :
         'HYBRIDPLUGIN'
         'HexoticPLUGIN'
         'GMSHPLUGIN'
-        'HEXABLOCK' : {section : "default_MPI", verbose: 'yes'}
+        'HEXABLOCK' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'}
         'HEXABLOCKPLUGIN'
-        'HOMARD'
-        'FIELDS' : {section : "default_MPI", verbose: 'yes'}
-        'PARAVIS' : {section : "default_MPI", verbose: 'yes'}
-        'JOBMANAGER' : {section : "default_MPI", verbose: 'yes'}
+        'HOMARD'    : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'FIELDS'    : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'PARAVIS'   : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'JOBMANAGER': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'YACS'
         'YACSGEN'
-        'SOLVERLAB' : {section : "default_MPI", hpc: 'yes'}
+        'SOLVERLAB': {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
diff --git a/products/HOMARD.pyconf b/products/HOMARD.pyconf
index 62505ad..b5e48e2 100644
--- a/products/HOMARD.pyconf
+++ b/products/HOMARD.pyconf
@@ -34,6 +34,18 @@ default_win:
     depend : [ "SMESH", "boost", "hdf5", "medfile", "pthreads"]
 }
 
+default_MPI :
+{
+  cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSALOME_USE_MPI=ON "
+  opt_depend : ['openmpi']
+}
+
+version_V9_9_0_MPI :
+{
+  cmake_options : "-DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_CXX_COMPILER:STRING=${MPI_CXX_COMPILER} -DCMAKE_C_COMPILER:STRING=${MPI_C_COMPILER} -DSALOME_USE_MPI=ON "
+  opt_depend : ['openmpi']
+}
+
 version_gn_evol_01 :
 {
     patches : ['HOMARD_SMESH_SSL_support.patch']
diff --git a/products/compil_scripts/gdal-2.4.0.sh b/products/compil_scripts/gdal-2.4.0.sh
index 3a1cd6d..1c2fd54 100755
--- a/products/compil_scripts/gdal-2.4.0.sh
+++ b/products/compil_scripts/gdal-2.4.0.sh
@@ -7,7 +7,7 @@ echo "##########################################################################
 if [ -n "$SAT_HPC" ]  && [ -n "$MPI_ROOT_DIR" ]; then
    echo "WARNING: setting CC and CXX environment variables and target MPI wrapper"
    export CXX=${MPI_CXX_COMPILER}
-   export C=${MPI_C_COMPILER}
+   export CC=${MPI_C_COMPILER}
 fi
 
 CONFIGURE_FLAGS=
diff --git a/products/compil_scripts/med-4.1.1.sh b/products/compil_scripts/med-4.1.1.sh
index c91dfef..80e4f96 100755
--- a/products/compil_scripts/med-4.1.1.sh
+++ b/products/compil_scripts/med-4.1.1.sh
@@ -10,6 +10,9 @@ CONFIGURE_FLAGS+=' --enable-python=yes'
 CONFIGURE_FLAGS+=' --enable-mesgerr'
 if [ -n "$SAT_HPC" ]
 then
+    export CXX=${MPI_CXX_COMPILER}
+    export CC=${MPI_C_COMPILER}
+    CONFIGURE_FLAGS+=' --with-swig=yes'
     CONFIGURE_FLAGS+=' --enable-parallel'
 else
     export F77=gfortran
diff --git a/products/medfile.pyconf b/products/medfile.pyconf
index a4e321b..ed7a18e 100644
--- a/products/medfile.pyconf
+++ b/products/medfile.pyconf
@@ -36,7 +36,7 @@ version_4_1_1 :
 {
     compil_script : 'med-4.1.1.sh'
     test_build : "make check"
-    build_depend : []
+    build_depend : ['swig']
 }
 
 version_4_1_1_win :
-- 
2.39.2