spns #19079 integration done

[tools/sat_salome.git] / applications / SALOME-master.pyconf

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index bcc4c645679a99b3234cebbc87ca90d5ce10caca..34fee6f346a7c3facf1b2c03132a8ae6370ffafb 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -120,7 +120,7 @@ APPLICATION :
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-        topo2volmesh: 'develop'
+        TopIIVolMesh: 'develop'
         urllib3 : '1.23'
         URANIE : '4.5.0'
         # SALOME MODULES :
@@ -134,7 +134,7 @@ APPLICATION :
         'MEDCOUPLING'
         'GUI'
         'GEOM'
-        'SMESH': {tag: 'master', base: 'no', section: 'version_topo2volmesh'}
+        'SMESH'
         'NETGENPLUGIN'
         'BLSURFPLUGIN'
         'GHS3DPLUGIN'
@@ -196,21 +196,30 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['FD30']"
         'APPLICATION.products.gcc' : '9.3.0'
-        'APPLICATION.rm_products' : ['openmpi', 'mpi4py']
+        'APPLICATION.products.ParaView'    : {tag:'5.9.0',  base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
+        'APPLICATION.products.PARAVIS'     : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
+        'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['FD32']"
         # https://github.com/scipy/scipy/issues/11611
         'APPLICATION.products.scipy' : '1.5.2'
-        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr', 'openmpi', 'mpi4py']
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.ParaView'    : {tag:'5.9.0',  base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
+        'APPLICATION.products.PARAVIS'     : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
+        'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['CO7']"
-        'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.ParaView'    : {tag:'5.9.0',  base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.rm_products' : ['openmpi', 'mpi4py', 'gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.ParaView'    : {tag:'5.9.0',  base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
+        'APPLICATION.products.PARAVIS'     : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
+        'APPLICATION.products.MEDCOUPLING' : {tag:'master', base: 'no',  section: 'default_MPI',       hpc: 'yes'}
     }
     {
         __condition__ : "VARS.dist in ['DB09']"