spns #32377: SALOME-9.10.0-MPI compilation fix - gmsh

diff --git a/applications/SALOME-9.10.0-MPI.pyconf b/applications/SALOME-9.10.0-MPI.pyconf
index 9897204669fe8b281d1004b8f5a1917e1e203f94..f29055267247686fb39861a34320644300e5d237 100644 (file)
--- a/applications/SALOME-9.10.0-MPI.pyconf
+++ b/applications/SALOME-9.10.0-MPI.pyconf
@@ -61,8 +61,8 @@ APPLICATION :
         mpc : 'native'
         gmp : 'native'
         mpfr : 'native'
-        gdal :  {tag : '2.4.0', hpc : 'yes'}
-        gmsh : '4.10.3'
+        gdal :  {tag : '2.4.0',  hpc : 'yes'}
+        gmsh :  {tag : '4.10.3', section :  'version_4_10_3_MPI', hpc : 'yes', base : 'no'}
         graphviz : '2.38.0'
         hdf5 : {tag : '1.10.3', hpc : 'yes'}
         idna : '2.7'

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 93fbc1868e0554dd58fc7573e06f74cb227d776a..c3251102f9f7adb6cbcd55e79c5a3a37bb60033a 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -61,8 +61,8 @@ APPLICATION :
         mpc : 'native'
         gmp : 'native'
         mpfr : 'native'
-        gdal :  {tag : '2.4.0', hpc : 'yes'}
-        gmsh : '4.10.3'
+        gdal :  {tag : '2.4.0',  hpc : 'yes'}
+        gmsh :  {tag : '4.10.3', section :  'version_4_10_3_MPI', hpc : 'yes', base : 'no'}
         graphviz : '2.38.0'
         hdf5 : {tag : '1.10.3', hpc : 'yes'}
         idna : '2.7'

diff --git a/products/compil_scripts/gmsh-4.10.3.sh b/products/compil_scripts/gmsh-4.10.3.sh
index c15d4085a3ab544734f8fad8755615080811422c..97a7af73e84cdef7828881d0bf5899e74ababefc 100755 (executable)
--- a/products/compil_scripts/gmsh-4.10.3.sh
+++ b/products/compil_scripts/gmsh-4.10.3.sh
@@ -33,6 +33,13 @@ if [[ $DIST_NAME == "FD" && $DIST_VERSION == "32" ]]
 then
     CMAKE_OPTIONS="${CMAKE_OPTIONS} -DENABLE_MMG3D=OFF" # removed anyhow in GMS 4.6
 fi
+if [ -n "$SAT_HPC" ]
+then
+    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 "*** cmake" $CMAKE_OPTIONS
 cmake $CMAKE_OPTIONS $SOURCE_DIR

diff --git a/products/gmsh.pyconf b/products/gmsh.pyconf
index 33b8c5f4513bc24501589968a7acc41316154682..903dc7d51a7597890a19e3834f7171e3a0bc0217 100644 (file)
--- a/products/gmsh.pyconf
+++ b/products/gmsh.pyconf
@@ -43,6 +43,12 @@ version_4_10_3_win:
   depend : ["CAS","lapack","hdf5","medfile", "cgns"]
 }
 
+version_4_10_3_MPI:
+{
+  compil_script : "gmsh-4.10.3.sh"
+  depend : ["CAS","lapack","hdf5","medfile", "cgns", "openmpi"]
+}
+
 version_4_10_3_win_dbg:
 {
   depend : ["CAS","lapack","hdf5","medfile", "cgns"]