Revert "spns #43007: compile petsc and SOLVERLAB without mpi"

This reverts commit a96979ab94afa90c32d6716f50703da649009d4f.

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index d38412c43ea5adcf91401b84183ca30ad93b704c..e6de32c6f82f615921c92ececb5e054c4cb2ded5 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -115,7 +115,7 @@ APPLICATION :
         patsy : 'native'
         ParaView : {tag:'5.11.0', base: 'no',  section: 'version_5_11_0_MPI', hpc: 'yes'}
         PERSALYS : 'v16.0.1'
-        petsc : '3.20.5'
+        petsc : {tag : '3.20.5', base: 'no', section: 'version_3_20_5', hpc: 'yes'}
         Pillow : 'native'
         planegcs : '0.18-3cb6890'
         psutil : 'native'
@@ -203,7 +203,7 @@ APPLICATION :
         'YDEFX'
         'pmml'
         'SALOMEBOOTSTRAP'
-        'SOLVERLAB'
+        'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'TopIIVolMesh'
         #'TESTBASE'
         'CEATESTBASE' : 'SalomeV9'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 20c64074cee8552ec59b84c573ccc6b2ae936c7f..e1f67835e4bdea89cb0ba85662133eb54d0a7372 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -118,7 +118,7 @@ APPLICATION :
         patsy : '0.5.4'
         ParaView : {tag:'5.11.0', base: 'no',  section: 'version_5_11_0_MPI', hpc: 'yes'}
         PERSALYS: 'v16.0.1'
-        petsc : '3.20.5'
+        petsc : {tag : '3.20.5', base: 'no', section: 'version_3_20_5', hpc: 'yes'}
         Pillow : '8.4.0'
         planegcs : '0.18-3cb6890'
         poetry : {tag: '1.8.3', base: 'no', section: 'version_1_8_3_x86_64'    }
@@ -216,7 +216,7 @@ APPLICATION :
         'YDEFX'
         'pmml'
         'SALOMEBOOTSTRAP'
-        'SOLVERLAB'
+        'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'TopIIVolMesh'
         #'TESTBASE'
         'CEATESTBASE' : 'SalomeV9'

diff --git a/products/compil_scripts/petsc-3.20.5.sh b/products/compil_scripts/petsc-3.20.5.sh
index 042f67b0a70e947ae545671fdc56d73f4b13bee0..1c3fd78fc35b3497e63cd205a371a0337f169cf7 100755 (executable)
--- a/products/compil_scripts/petsc-3.20.5.sh
+++ b/products/compil_scripts/petsc-3.20.5.sh
@@ -29,18 +29,8 @@ else
    CONFIGURE_FLAGS+=" --download-f2cblaslapack=ext/f2cblaslapack-3.8.0.q2.tar.gz"
 fi
 
-if [ "${SAT_python_IS_NATIVE}" == "1" ]; then
-    CONFIGURE_FLAGS+=" --with-python=1"
-elif [ -n "${PYTHON_ROOT_DIR}" ]; then
-    CONFIGURE_FLAGS+=" --with-python-dir=${PYTHON_ROOT_DIR}"
-fi
-
-if [ "$SAT_hdf5_IS_NATIVE" == "1" ]; then
-    CONFIGURE_FLAGS+=" --with-hdf5=1"
-    CONFIGURE_FLAGS+=" --with-hdf5-dir=$NATIVE_PATH/hdf5/serial/"
-elif [ -n "${HDF5_ROOT_DIR}" ]; then
-    CONFIGURE_FLAGS+=" --with-hdf5-dir=${HDF5_ROOT_DIR}"
-fi
+CONFIGURE_FLAGS+=" --with-python-dir=${PYTHON_ROOT_DIR}"
+CONFIGURE_FLAGS+=" --with-hdf5-dir=${HDF5_ROOT_DIR}"
 
 if [ -f "${NATIVE_PATH}/libfftw3.a" ] && [ "${SAT_fftw_IS_NATIVE}" == "1" ]; then
    CONFIGURE_FLAGS+=" --with-fftw=1"