X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=applications%2FSALOME-9.9.0-MPI.pyconf;h=36e56319696e448ab9b2a3ecbd1a37190f794a81;hb=9c3ab64d177aab5eea569d4b02338ab2710c7a59;hp=74a2fa3319eb09e83fbd9eda38d6460af8888f7c;hpb=05df46629c4ee6e38236f79991e9a39e1a43be03;p=tools%2Fsat_salome.git

diff --git a/applications/SALOME-9.9.0-MPI.pyconf b/applications/SALOME-9.9.0-MPI.pyconf
index 74a2fa3..36e5631 100644
--- a/applications/SALOME-9.9.0-MPI.pyconf
+++ b/applications/SALOME-9.9.0-MPI.pyconf
@@ -5,7 +5,7 @@ APPLICATION :
 {
     name : 'SALOME-9.9.0-MPI'
     workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist
-    tag : 'V9_9_BR'
+    tag : 'V9_9_0'
     dev : 'no'
     verbose :'no'
     debug : 'no'
@@ -25,6 +25,7 @@ APPLICATION :
         {
             PYTHONIOENCODING:"UTF_8",
             SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"
+            ROOT_SALOME_INSTALL: '$PRODUCT_ROOT_DIR'
         }
         SALOME_trace : "local" # local/file:.../with_logger
         SALOME_MODULES : "SHAPER,SHAPERSTUDY,GEOM,SMESH,PARAVIS,YACS,JOBMANAGER"  # specify the first modules to display in gui
@@ -78,7 +79,7 @@ APPLICATION :
         mpi4py: '3.0.3'
         ParMetis : '3.1.1'
         netgen : '5.3.1_with_CAS_7.2'
-        # comment out above line and uncomment the line below to use Netgen 6.
+        # comment out line above and uncomment the line below to use Netgen 6.
         #netgen : '6.2.2101'
         netcdf : {tag : '4.6.2', hpc : 'yes'}
         nlopt : '2.5.0'
@@ -130,7 +131,6 @@ APPLICATION :
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-        TopIIVolMesh : 'V9_9_0b1' # FIXME
         urllib3 : '1.23'
         zeromq: '4.3.1'
         URANIE : '4.5.0'
@@ -140,9 +140,9 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag : 'V2_4_5'}
-        'KERNEL' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
-        'MEDCOUPLING' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
+        'LIBBATCH' : 'V2_4_5'
+        'KERNEL'      : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI',     hpc: 'yes'}
+        'MEDCOUPLING' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI_STD', hpc: 'yes'}
         'GUI'
         'GEOM'
         'SMESH'
@@ -153,16 +153,14 @@ APPLICATION :
         'HYBRIDPLUGIN'
         'HexoticPLUGIN'
         'GMSHPLUGIN'
-        'HEXABLOCK' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
+        'HEXABLOCK'  : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
         'HEXABLOCKPLUGIN'
-        'HOMARD' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
-        'FIELDS' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
-        'OPENTURNS_SALOME': 'master' # FIXME
-        'PARAVIS' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME
-        'JOBMANAGER' : {tag:'V9_9_BR', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME
+        'HOMARD'     : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
+        'FIELDS'     : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
+        'PARAVIS'    : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
+        'JOBMANAGER' : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
         'YACS'
         'YACSGEN'
-        'SOLVERLAB' : {tag:'V9_9_0b1', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'} # FIXME
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -170,15 +168,18 @@ APPLICATION :
         'CALCULATOR'
         'HELLO'
         'PYHELLO'
-        'EFICAS' : 'V9_9_0b1' # FIXME
-        'EFICAS_TOOLS' : 'V9_9_0b1' # FIXME
-        'PY2CPP': 'V9_9_0b1' # FIXME
-        'ADAO' : 'V9_9_0b1' # FIXME
-        'ADAO_INTERFACE': 'master' # FIXME
-        'PARAVISADDONS' : 'V9_9_0b1' # FIXME
-        'YDEFX' : 'master' # FIXME
-        'pmml' : 'V9_9_0b1' # FIXME
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'EFICAS'
+        'EFICAS_TOOLS'
+        'PY2CPP'
+        'ADAO'
+        'ADAO_INTERFACE'
+        'PARAVISADDONS'
+        'OPENTURNS_SALOME'
+        'YDEFX'
+        'pmml'
+        'SOLVERLAB'        : {tag:'V9_9_0', base: 'no', section: 'version_V9_9_0_MPI', hpc: 'yes'}
+        'TopIIVolMesh'
+        'CEATESTBASE'
     }
     profile :
     {
@@ -206,8 +207,9 @@ APPLICATION :
 __overwrite__ :
 [
     {
-        __condition__ : "VARS.dist in ['FD32']"
-        # https://github.com/scipy/scipy/issues/11611
+        __condition__ : "VARS.dist in ['FD32', 'FD34', 'DB11']"
+        # gcc https://github.com/scipy/scipy/issues/11611
+        # either patch numpy to include -fallow-argument-mismatch or move to that version        
         'APPLICATION.products.scipy' : '1.5.2'
     }
     {