From 05ad4ea45241ecd6307614e2022ecfedf5cb2fa2 Mon Sep 17 00:00:00 2001
From: Guytri KASTANE <guytri.kastane@cea.fr>
Date: Thu, 31 Oct 2024 11:55:06 +0100
Subject: [PATCH] spns #43007: compile petsc and SOLVERLAB without mpi

---
 applications/SALOME-master-native.pyconf |  4 ++--
 applications/SALOME-master.pyconf        |  4 ++--
 products/compil_scripts/petsc-3.20.5.sh  | 14 ++++++++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index e6de32c..d38412c 100644
--- 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 : {tag : '3.20.5', base: 'no', section: 'version_3_20_5', hpc: 'yes'}
+        petsc : '3.20.5'
         Pillow : 'native'
         planegcs : '0.18-3cb6890'
         psutil : 'native'
@@ -203,7 +203,7 @@ APPLICATION :
         'YDEFX'
         'pmml'
         'SALOMEBOOTSTRAP'
-        'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'SOLVERLAB'
         'TopIIVolMesh'
         #'TESTBASE'
         'CEATESTBASE' : 'SalomeV9'
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index e1f6783..20c6407 100644
--- 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 : {tag : '3.20.5', base: 'no', section: 'version_3_20_5', hpc: 'yes'}
+        petsc : '3.20.5'
         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' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'SOLVERLAB'
         '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 1c3fd78..042f67b 100755
--- a/products/compil_scripts/petsc-3.20.5.sh
+++ b/products/compil_scripts/petsc-3.20.5.sh
@@ -29,8 +29,18 @@ else
    CONFIGURE_FLAGS+=" --download-f2cblaslapack=ext/f2cblaslapack-3.8.0.q2.tar.gz"
 fi
 
-CONFIGURE_FLAGS+=" --with-python-dir=${PYTHON_ROOT_DIR}"
-CONFIGURE_FLAGS+=" --with-hdf5-dir=${HDF5_ROOT_DIR}"
+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
 
 if [ -f "${NATIVE_PATH}/libfftw3.a" ] && [ "${SAT_fftw_IS_NATIVE}" == "1" ]; then
    CONFIGURE_FLAGS+=" --with-fftw=1"
-- 
2.39.2