From: Quentin Cozette <quentin.cozette@cea.fr>
Date: Wed, 21 Apr 2021 17:18:20 +0000 (+0200)
Subject: Merge master branch to integrate new petsc 3.15 use
X-Git-Tag: V9_7_0~63^2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6360be035412906808775cd7095b76398c954820;p=tools%2Fsat_salome.git

Merge master branch to integrate new petsc 3.15 use
---

6360be035412906808775cd7095b76398c954820
diff --cc applications/SALOME-master-MPI.pyconf
index 1f8e387,0f9b510..443f351
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@@ -72,12 -72,11 +72,12 @@@ APPLICATION 
          opencv : '3.2.0'
          openmpi : '3.1.6'
          openssl : "native"
 -#        openturns: '1.16'
 -        ospray : '1.8.4'
 +        openturns: '1.16'
 +        openVKL: '0.11.0'
 +        ospray : '2.4.0'
          packaging : '17.1'
 -        ParaView : {tag : '5.8.0', hpc : 'yes', section: 'version_5_8_0_MPI'}
 +        ParaView : {tag : '5.9.0', hpc : 'yes', section: 'version_5_9_0_MPI'}
-         petsc : '3.14.0'
+         petsc : {tag : '3.15.0', section: 'version_3_15_0'}
          Pillow : '7.1.1'
          planegcs : '0.18-3cb6890'
          psutil : '5.7.2'
diff --cc applications/SALOME-master-native.pyconf
index 6574517,7f5cf93..338b89d
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@@ -71,15 -69,14 +71,15 @@@ APPLICATION 
          netgen : '5.3.1_with_CAS_7.2'
          nlopt : '2.4.2'
          numpy : 'native'
 -        omniORB : '4.2.2'
 -        omniORBpy : '4.2.2'
 +        omniORB : '4.2.3'
 +        omniORBpy : '4.2.3'
          opencv : 'native'
 +        openVKL : '0.11.0'
          openturns: '1.16'
 -        ospray : '1.8.4'
 +        ospray : '2.4.0'
          packaging : 'native'
 -        ParaView : '5.8.0'
 +        ParaView : '5.9.0'
-         petsc : '3.14.0'
+         petsc : {tag : '3.15.0', section: 'version_3_15_0'}
          Pillow : 'native'
          # 'native' not exists : freeCAD part but not delivered with it from package handler
          planegcs : '0.18-3cb6890'
diff --cc applications/SALOME-master.pyconf
index 3fbd867,e0d1ef7..e6a4b54
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@@ -70,12 -71,11 +70,12 @@@ APPLICATION 
          omniORBpy : '4.2.2'
          opencv : '3.2.0'
          openssl : "native"
 -#        openturns: '1.16'
 -        ospray : '1.8.4'
 +        openturns: '1.16'
 +        openVKL: '0.11.0'
 +        ospray : '2.4.0'
          packaging : '17.1'
 -        ParaView : '5.8.0'
 +        ParaView : '5.9.0'
-         petsc : '3.14.0'
+         petsc : {tag : '3.15.0', section: 'version_3_15_0'}
          Pillow : '7.1.1'
          planegcs : '0.18-3cb6890'
          psutil : '5.7.2'