From 7b8b64c1f9c8a16bb567c7bd8fd8a1194d991eb8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bernard=20S=C3=A9cher=C3=83?= <bernard.secher@cea.fr>
Date: Fri, 16 Apr 2021 16:12:37 +0200
Subject: [PATCH] upgrade to pestc 3.15

---
 applications/SOLVERLAB-master-MPI.pyconf |  3 +-
 applications/SOLVERLAB-master.pyconf     |  3 +-
 products/compil_scripts/SOLVERLAB.sh     |  3 +-
 products/compil_scripts/petsc-3.15.0.sh  | 62 ++++++++++++++++++++++++
 products/petsc.pyconf                    | 17 +++++++
 5 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100755 products/compil_scripts/petsc-3.15.0.sh

diff --git a/applications/SOLVERLAB-master-MPI.pyconf b/applications/SOLVERLAB-master-MPI.pyconf
index ee44b56..5667cba 100644
--- a/applications/SOLVERLAB-master-MPI.pyconf
+++ b/applications/SOLVERLAB-master-MPI.pyconf
@@ -61,8 +61,9 @@ APPLICATION :
         omniORBpy : '4.2.2'
         packaging : '17.1'
         ParaView : {tag : '5.8.0', hpc : 'yes', section: 'version_5_8_0_MPI'}
-        petsc : '3.14.0'
+        petsc : {tag : '3.15.0', section: 'version_3_15_0'}
         pockets : '0.6.2'
+        psutil : '5.7.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.9'
diff --git a/applications/SOLVERLAB-master.pyconf b/applications/SOLVERLAB-master.pyconf
index 5f1e7d1..49dd853 100644
--- a/applications/SOLVERLAB-master.pyconf
+++ b/applications/SOLVERLAB-master.pyconf
@@ -60,8 +60,9 @@ APPLICATION :
         omniORBpy : '4.2.2'
         packaging : '17.1'
         ParaView : '5.8.0'
-        petsc : '3.14.0'
+        petsc : {tag : '3.15.0', section: 'version_3_15_0'}
         pockets : '0.6.2'
+        psutil : '5.7.2'
         Pygments : '2.0.2'
         pyparsing : '2.0.3'
         PyQt : '5.9'
diff --git a/products/compil_scripts/SOLVERLAB.sh b/products/compil_scripts/SOLVERLAB.sh
index e7dc566..bdaf756 100755
--- a/products/compil_scripts/SOLVERLAB.sh
+++ b/products/compil_scripts/SOLVERLAB.sh
@@ -5,7 +5,8 @@ echo "SOLVERLAB" $VERSION
 echo "##########################################################################"
 
 
-CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_ROOT_DIR=${PYTHON_ROOT_DIR}"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPython_ROOT_DIR=${PYTHON_ROOT_DIR}"
+CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPython_EXECUTABLE=${PYTHONBIN}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYTHON_EXECUTABLE=${PYTHONBIN}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DPYQT5_ROOT_DIR=${PYQT5_ROOT_DIR}"
 CMAKE_OPTIONS=$CMAKE_OPTIONS" -DMATPLOTLIB_ROOT_DIR=${MATPLOTLIB_ROOT_DIR}"
diff --git a/products/compil_scripts/petsc-3.15.0.sh b/products/compil_scripts/petsc-3.15.0.sh
new file mode 100755
index 0000000..7a9d7d0
--- /dev/null
+++ b/products/compil_scripts/petsc-3.15.0.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+echo "##########################################################################"
+echo "Petsc" $VERSION
+echo "##########################################################################"
+
+
+
+cp -r $SOURCE_DIR/* .
+
+CONFIGURE_FLAGS=''
+CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-f2cblaslapack=ext/f2cblaslapack-3.4.2.q4.tar.gz"
+CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-slepc=ext/slepc-3.15.0.tar.gz"
+CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --with-hdf5-dir=${HDF5_ROOT_DIR}"
+CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-metis=ext/metis-5.1.0-p10.tar.gz"
+CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --with-debugging=0" # by default Petsc is build in debug mode
+echo
+if [ -n "${MPI_ROOT_DIR}" ]
+then
+  echo "*** configure with mpi"
+  CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-hypre=ext/hypre-2.20.0.tar.gz"
+  CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-parms=ext/parms-3.2-p5.tar.gz"
+  CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-parmetis=ext/parmetis-4.0.3-p6.tar.gz"
+  CONFIGURE_FLAGS=$CONFIGURE_FLAGS" --download-ptscotch=ext/scotch_6.1.0.tar.gz"
+  ./configure --prefix=${PRODUCT_INSTALL} --with-mpi-dir=${MPI_ROOT_DIR} ${CONFIGURE_FLAGS}
+else
+  echo "*** configure without mpi"
+  ./configure --prefix=${PRODUCT_INSTALL} --with-mpi=0 ${CONFIGURE_FLAGS}
+fi
+
+if [ $? -ne 0 ]
+then
+    echo "ERROR on configure"
+    exit 1
+fi
+
+MAKE_OPTIONS="PETSC_DIR=${BUILD_DIR}"
+
+echo
+echo "*** make" $MAKE_OPTIONS
+make $MAKE_OPTIONS
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make"
+    exit 2
+fi
+
+# CentOS 6 automatically set PETSC_ARCH to arch-linux2-c-debug : remove arch specification
+# MAKE_OPTIONS=$MAKE_OPTIONS" PETSC_ARCH=arch-linux-c-debug"
+
+echo
+echo "*** make install"
+make $MAKE_OPTIONS install
+if [ $? -ne 0 ]
+then
+    echo "ERROR on make install"
+    exit 3
+fi
+
+echo
+echo "########## END"
+
diff --git a/products/petsc.pyconf b/products/petsc.pyconf
index bfe320d..778d7af 100644
--- a/products/petsc.pyconf
+++ b/products/petsc.pyconf
@@ -14,3 +14,20 @@ default :
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     install_dir : 'base'
 }
+
+version_3_15_0 :
+{
+    name : "petsc"
+    build_source : "script"
+    compil_script :  $name + "-3.15.0.sh"
+    get_source : "archive"
+    environ :
+    {
+       env_script : $name + ".py"
+    }
+    depend : ["hdf5"]
+    opt_depend : ["openmpi"]
+    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+    install_dir : 'base'
+}
-- 
2.39.2