fix useless overwrite.

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

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 76d7d524ec1b8abf556438d6321184b9ab290619..64c96637c9c78835d1181bcf415adc03752b6715 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -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
@@ -35,7 +36,8 @@ APPLICATION :
         alabaster : '0.7.6'
         Babel : '2.7.0'
         boost : '1.71.0'
-        CAS : 'V7_5_3p2'
+        #CAS : 'CR753-SALOME-PATCH'
+        CAS : {tag : 'cfcbf4e', section: 'version_CR753_SALOME_PATCH', base: 'no'}
         C3PO: 'v2.0'
         certifi : '2018.8.24'
         cgns : '4.2.0'
@@ -56,7 +58,6 @@ APPLICATION :
         freetype : '2.9.1'
         gcc  :  '8.5.0'
         mpc : 'native'
-        mpi4py: '3.0.3'
         gmp : 'native'
         mpfr : 'native'
         gdal : '2.4.0'
@@ -76,8 +77,11 @@ APPLICATION :
         medfile : '4.1.1'
         mesa : '19.0.8'
         MeshGems : '2.14-4'
+        mpi4py: '3.0.3'
         metis : '5.1.0'
-        netgen : '6.2.2101'
+        netgen : '5.3.1_with_CAS_7.2'
+        # comment out line above and uncomment the line below to use Netgen 6.
+        #netgen : '6.2.2101'
         netcdf : '4.6.2'
         nlopt : '2.5.0'
         nose: '1.3.7'
@@ -95,7 +99,7 @@ APPLICATION :
         patsy : '0.5.2'
         ParaView : {tag:'5.9.0', base: 'no',  section: 'version_5_9_0_MPI', hpc: 'yes'}
         PERSALYS: 'v12.0'
-        petsc : {tag : '3.16.0', section: 'version_3_16_0'}
+        petsc : {tag : '3.16.0', base: 'no', section: 'version_3_16_0', hpc: 'yes'}
         Pillow : '7.1.1'
         planegcs : '0.18-3cb6890'
         psutil : '5.7.2'
@@ -128,7 +132,6 @@ APPLICATION :
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-        TopIIVolMesh: 'develop'
         urllib3 : '1.23'
         zeromq: '4.3.1'
         URANIE : '4.5.0'
@@ -138,7 +141,7 @@ APPLICATION :
         'SHAPER'
         'SHAPERSTUDY'
         'RESTRICTED'
-        'LIBBATCH' : {tag : 'V2_4_5'}
+        'LIBBATCH' : 'V2_4_5'
         'KERNEL'
         'MEDCOUPLING' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'GUI'
@@ -155,12 +158,10 @@ APPLICATION :
         'HEXABLOCKPLUGIN'
         'HOMARD'
         'FIELDS'
-        'OPENTURNS_SALOME'
         'PARAVIS' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -174,20 +175,18 @@ APPLICATION :
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
+        'OPENTURNS_SALOME'
         'YDEFX'
         'pmml'
-        'TESTBASE': {tag: 'master'}
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'SOLVERLAB' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'}
+        'TopIIVolMesh'
+        #'TESTBASE'
+        'CEATESTBASE' : 'SalomeV9'
     }
     profile :
     {
         launcher_name : "salome"
     }
-    virtual_app:
-    {
-        name : "salome"
-        application_name : "APPLI"
-    }
     test_base : 
     {
         name : "SALOME"
@@ -204,6 +203,10 @@ APPLICATION :
 }
 __overwrite__ :
 [
+    {
+        __condition__ : "VARS.dist not in ['DB09','DB10', 'DB11']"
+        'APPLICATION.products.MeshGems' : {tag : '2.13-1', hpc : 'yes', base: 'no'}
+    }
     {
         __condition__ : "VARS.dist in ['FD30']"
         'APPLICATION.products.gcc' : '9.3.0'
@@ -213,6 +216,7 @@ __overwrite__ :
         # https://github.com/scipy/scipy/issues/11611
         'APPLICATION.products.scipy' : '1.5.2'
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_FD32'} # spns #29324
     }
     {
         __condition__ : "VARS.dist in ['CO7']"
@@ -220,11 +224,13 @@ __overwrite__ :
     }
     {
         __condition__ : "VARS.dist in ['CO8']"
-        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.rm_products'  : ['gcc', 'gmp', 'mpc', 'mpfr', 'zeromq']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_CO8'} # spns #29324
     }
     {
         __condition__ : "VARS.dist in ['DB10']"
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_DB10'} # spns #29324
     }
     {
         __condition__ : "VARS.dist in ['UB18.04']"
@@ -233,5 +239,6 @@ __overwrite__ :
     {
         __condition__ : "VARS.dist in ['UB20.04']"
         'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+        'APPLICATION.products.gdal': {tag:'2.4.0',   base: 'no', section: 'version_2_4_0_UB20_04'} # spns #29324
     }
 ]