From 2e5512ef1d52b8e793301e1afe8051d8dce8d38c Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 10 Jul 2024 11:10:02 +0200 Subject: [PATCH] bos #41859: OCCT use tag SALOME_9_13_V7_8_0 --- applications/SALOME-9.13.0-MPI.pyconf | 24 +++++++++++------------ applications/SALOME-9.13.0-int32.pyconf | 20 +++++++++---------- applications/SALOME-9.13.0-native.pyconf | 2 +- applications/SALOME-9.13.0-windows.pyconf | 2 +- applications/SALOME-9.13.0.pyconf | 2 +- products/gmsh.pyconf | 9 +++++++++ 6 files changed, 34 insertions(+), 25 deletions(-) diff --git a/applications/SALOME-9.13.0-MPI.pyconf b/applications/SALOME-9.13.0-MPI.pyconf index 6de74ee..c06ca74 100644 --- a/applications/SALOME-9.13.0-MPI.pyconf +++ b/applications/SALOME-9.13.0-MPI.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.13.0-MPI' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_13_0b1' + tag : 'V9_13_BR' dev : 'no' verbose : 'no' debug : 'no' @@ -39,7 +39,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.14.0' boost : '1.71.0' - CAS : {tag : 'V7_5_3p5', section: 'version_CR753_SALOME_PATCH', base: 'no'} + CAS : {tag : 'SALOME_9_13_V7_8_0', section: 'version_CR780_SALOME_PATCH', base: 'no'} catalyst: '2.0' C3PO: 'v2.3' certifi : '2018.8.24' @@ -67,7 +67,7 @@ APPLICATION : gmp : 'native' mpfr : 'native' gdal : {tag : '2.4.0', hpc : 'yes'} - gmsh : {tag : '4.10.3', section : 'version_4_10_3_MPI', hpc : 'yes', base : 'no'} + gmsh : {tag : '4.10.3', section : 'version_4_10_3_with_CAS_7_8_MPI', hpc : 'yes', base : 'no'} graphviz : '2.38.0' hdf5 : {tag : '1.10.3', hpc : 'yes'} idna : '2.7' @@ -87,7 +87,7 @@ APPLICATION : MeshGems : {tag : '2.15-1', hpc : 'yes'} mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} ParMetis : '4.0.3-p6' - netgen : '5.3.1_with_CAS_7.2' + netgen : '5.3.1_with_CAS_7.8' # comment out line above and uncomment the line below to use Netgen 6. #netgen : '6.2.2101' netcdf : {tag : '4.6.2', hpc : 'yes'} @@ -163,8 +163,8 @@ APPLICATION : 'SHAPERSTUDY' 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' - 'KERNEL' : {tag:'V9_13_0b1', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} - 'MEDCOUPLING' : {tag:'V9_13_0b1', base: 'no', section: 'default_MPI_STD', hpc: 'yes', verbose: 'yes'} + 'KERNEL' : {tag:'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} + 'MEDCOUPLING' : {tag:'V9_13_BR', base: 'no', section: 'default_MPI_STD', hpc: 'yes', verbose: 'yes'} 'GUI' : {verbose : 'yes'} 'GEOM' 'SMESH' @@ -174,12 +174,12 @@ APPLICATION : 'HYBRIDPLUGIN' 'HexoticPLUGIN' 'GMSHPLUGIN' - 'HEXABLOCK' : {tag:'V9_13_0b1', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} + 'HEXABLOCK' : {tag:'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes', verbose: 'yes'} 'HEXABLOCKPLUGIN' - 'HOMARD' : {tag:'V9_13_0b1', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'FIELDS' : {tag:'V9_13_0b1', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'PARAVIS' : {tag:'V9_13_0b1', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'JOBMANAGER': {tag:'V9_13_0b1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'HOMARD' : {tag:'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'FIELDS' : {tag:'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'JOBMANAGER': {tag:'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'YACS' 'YACSGEN' 'DOCUMENTATION' @@ -199,7 +199,7 @@ APPLICATION : 'YDEFX' 'pmml' 'SALOMEBOOTSTRAP' - 'SOLVERLAB' : {tag: 'V9_13_0b1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag: 'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' diff --git a/applications/SALOME-9.13.0-int32.pyconf b/applications/SALOME-9.13.0-int32.pyconf index 85fdf11..e611619 100644 --- a/applications/SALOME-9.13.0-int32.pyconf +++ b/applications/SALOME-9.13.0-int32.pyconf @@ -5,7 +5,7 @@ APPLICATION : { name : 'SALOME-9.13.0-int32' workdir : $LOCAL.workdir + $VARS.sep + $APPLICATION.name + '-' + $VARS.dist - tag : 'V9_13_0b1' + tag : 'V9_13_BR' dev : 'no' verbose : 'no' debug : 'no' @@ -38,7 +38,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.14.0' boost : '1.71.0' - CAS : {tag : 'CR780-SALOME-PATCH', section: 'version_CR780_SALOME_PATCH', base: 'no'} + CAS : {tag : 'SALOME_9_13_V7_8_0', section: 'version_CR780_SALOME_PATCH', base: 'no'} catalyst: '2.0' C3PO: 'v2.3' certifi : '2018.8.24' @@ -169,8 +169,8 @@ APPLICATION : 'SHAPERSTUDY' 'RESTRICTED' 'LIBBATCH' : 'V2_5_0' - 'KERNEL' : {tag:'V9_13_0b1', base: 'no', section: 'default_32BIT_IDS', hpc: 'no' } - 'MEDCOUPLING' : {tag:'V9_13_0b1', base: 'no', section: 'default_32BIT_IDS_MPI_STD', hpc: 'yes'} + 'KERNEL' : {tag:'V9_13_BR', base: 'no', section: 'default_32BIT_IDS', hpc: 'no' } + 'MEDCOUPLING' : {tag:'V9_13_BR', base: 'no', section: 'default_32BIT_IDS_MPI_STD', hpc: 'yes'} 'GUI' 'GEOM' 'SMESH' @@ -184,7 +184,7 @@ APPLICATION : 'HEXABLOCKPLUGIN' 'HOMARD' 'FIELDS' - 'PARAVIS' : {tag:'V9_13_0b1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'PARAVIS' : {tag:'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'JOBMANAGER' 'YACS' 'YACSGEN' @@ -195,17 +195,17 @@ APPLICATION : 'CALCULATOR' 'HELLO' 'PYHELLO' - 'EFICAS' : 'V9_13_BR' - 'EFICAS_TOOLS' : 'V9_13_BR' + 'EFICAS' + 'EFICAS_TOOLS' 'PY2CPP' - 'ADAO' : 'V9_13_BR' - 'ADAO_INTERFACE' : 'V9_13_BR' + 'ADAO' + 'ADAO_INTERFACE' 'PARAVISADDONS' 'OPENTURNS_SALOME' 'YDEFX' 'pmml' 'SALOMEBOOTSTRAP' - 'SOLVERLAB' : {tag: 'V9_13_0b1', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag: 'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' diff --git a/applications/SALOME-9.13.0-native.pyconf b/applications/SALOME-9.13.0-native.pyconf index e55da80..d4c3e13 100644 --- a/applications/SALOME-9.13.0-native.pyconf +++ b/applications/SALOME-9.13.0-native.pyconf @@ -38,7 +38,7 @@ APPLICATION : alabaster : 'native' Babel : 'native' boost : 'native' - CAS : {tag : 'CR780-SALOME-PATCH', section: 'version_CR780_SALOME_PATCH', base: 'no'} + CAS : {tag : 'SALOME_9_13_V7_8_0', section: 'version_CR780_SALOME_PATCH', base: 'no'} catalyst: '2.0' C3PO: 'v2.3' certifi : 'native' diff --git a/applications/SALOME-9.13.0-windows.pyconf b/applications/SALOME-9.13.0-windows.pyconf index fab7084..f8155c5 100644 --- a/applications/SALOME-9.13.0-windows.pyconf +++ b/applications/SALOME-9.13.0-windows.pyconf @@ -43,7 +43,7 @@ APPLICATION : alabaster : '0.7.16' Babel : '2.7.0' boost : '1.67.0' - CAS : {tag:'CR780-SALOME-PATCH', section:'version_CR780_SALOME_PATCH_win', base: 'no'} + CAS : {tag:'SALOME_9_13_V7_8_0', section:'version_CR780_SALOME_PATCH_win', base: 'no'} certifi : '2019.6.16' cftime : '1.6.3' cgns : '4.2.0' diff --git a/applications/SALOME-9.13.0.pyconf b/applications/SALOME-9.13.0.pyconf index b8fbd88..1fee859 100644 --- a/applications/SALOME-9.13.0.pyconf +++ b/applications/SALOME-9.13.0.pyconf @@ -39,7 +39,7 @@ APPLICATION : alabaster : '0.7.6' Babel : '2.14.0' boost : '1.71.0' - CAS : {tag : 'CR780-SALOME-PATCH', section: 'version_CR780_SALOME_PATCH', base: 'no'} + CAS : {tag : 'SALOME_9_13_V7_8_0', section: 'version_CR780_SALOME_PATCH', base: 'no'} catalyst: '2.0' C3PO: 'v2.3' certifi : '2018.8.24' diff --git a/products/gmsh.pyconf b/products/gmsh.pyconf index f92981d..5699d9e 100644 --- a/products/gmsh.pyconf +++ b/products/gmsh.pyconf @@ -55,6 +55,15 @@ version_4_10_3_with_CAS_7_8_win: patches : ['gmsh-4.10.3-occt780-win.patch'] } +version_4_10_3_with_CAS_7_8_MPI: +{ + archive_info : {archive_name : "gmsh-4.10.3.tar.gz"} + compil_script : "gmsh-4.10.3.sh" + depend : ["CAS","lapack","hdf5","medfile", "cgns", "openmpi"] + patches : ['gmsh-4.10.3-occt780.patch'] +} + + version_4_10_3: { compil_script : "gmsh-4.10.3.sh" -- 2.39.2