From 89ee517da5b9bb7ffbab451d813b58a20fd9378d Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Wed, 10 Jul 2024 11:43:56 +0200 Subject: [PATCH] [COTECH #160.2] Remove SOLVERLABGUI from interface --- applications/SALOME-9.13.0-MPI.pyconf | 3 --- applications/SALOME-9.13.0-int32.pyconf | 3 --- applications/SALOME-9.13.0-native.pyconf | 3 --- applications/SALOME-9.13.0-windows.pyconf | 8 +++----- applications/SALOME-9.13.0.pyconf | 3 --- applications/SALOME-master-MPI.pyconf | 9 +++------ applications/SALOME-master-int32.pyconf | 3 --- applications/SALOME-master-native.pyconf | 3 --- applications/SALOME-master-windows.pyconf | 2 -- applications/SALOME-master.pyconf | 3 --- 10 files changed, 6 insertions(+), 34 deletions(-) diff --git a/applications/SALOME-9.13.0-MPI.pyconf b/applications/SALOME-9.13.0-MPI.pyconf index c06ca74..d620e86 100644 --- a/applications/SALOME-9.13.0-MPI.pyconf +++ b/applications/SALOME-9.13.0-MPI.pyconf @@ -88,8 +88,6 @@ APPLICATION : 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.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'} nlopt : '2.5.0' nose: '1.3.7' @@ -200,7 +198,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' : {tag: 'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/applications/SALOME-9.13.0-int32.pyconf b/applications/SALOME-9.13.0-int32.pyconf index e611619..1a2eec3 100644 --- a/applications/SALOME-9.13.0-int32.pyconf +++ b/applications/SALOME-9.13.0-int32.pyconf @@ -92,8 +92,6 @@ APPLICATION : mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} metis : '5.1.0' 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 : '4.6.2' netCDF4 : '1.6.5' nlopt : '2.5.0' @@ -206,7 +204,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' : {tag: 'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/applications/SALOME-9.13.0-native.pyconf b/applications/SALOME-9.13.0-native.pyconf index d4c3e13..37d4212 100644 --- a/applications/SALOME-9.13.0-native.pyconf +++ b/applications/SALOME-9.13.0-native.pyconf @@ -87,8 +87,6 @@ APPLICATION : mmg : '5.6.0' mmgplugin: 'main' 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 : 'native' netCDF4: 'native' nlopt : 'native' @@ -190,7 +188,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/applications/SALOME-9.13.0-windows.pyconf b/applications/SALOME-9.13.0-windows.pyconf index f8155c5..322118c 100644 --- a/applications/SALOME-9.13.0-windows.pyconf +++ b/applications/SALOME-9.13.0-windows.pyconf @@ -96,8 +96,6 @@ APPLICATION : netcdf : '4.6.2' netCDF4: '1.6.5' netgen : {tag:'5.3.1', base: 'no', section: 'version_5_3_1_with_CAS_7_8_win'} - # comment out line above and uncomment the line below to use Netgen 6. - #netgen : '6.2.2101' nlopt : '2.5.0' numpy : '1.21.6' omniORB : '4.2.3' @@ -189,9 +187,9 @@ APPLICATION : 'CALCULATOR' 'HELLO' 'PYHELLO' - 'EFICAS' : 'V9_13_BR' - 'EFICAS_TOOLS' : 'V9_13_BR' - 'ADAO' : 'V9_13_BR' + 'EFICAS' + 'EFICAS_TOOLS' + 'ADAO' 'PARAVISADDONS' 'PY2CPP' 'OPENTURNS_SALOME' diff --git a/applications/SALOME-9.13.0.pyconf b/applications/SALOME-9.13.0.pyconf index 1fee859..1a3aff6 100644 --- a/applications/SALOME-9.13.0.pyconf +++ b/applications/SALOME-9.13.0.pyconf @@ -95,8 +95,6 @@ APPLICATION : mpi4py : {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} metis : '5.1.0' 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 : '4.6.2' netCDF4 : '1.6.5' nlopt : '2.5.0' @@ -209,7 +207,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' : {tag: 'V9_13_BR', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 3f61f4d..447e58e 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -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,9 +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' - # comment out line above and uncomment the line below to use Netgen 6. - #netgen : '6.2.2101' + netgen : '5.3.1_with_CAS_7.8' netcdf : {tag : '4.6.2', hpc : 'yes'} nlopt : '2.5.0' nose: '1.3.7' @@ -200,7 +198,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index 4393da2..6ad1475 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -92,8 +92,6 @@ APPLICATION : mpi4py: {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} metis : '5.1.0' 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 : '4.6.2' netCDF4 : '1.6.5' nlopt : '2.5.0' @@ -206,7 +204,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf index 69a7f7b..1c9df31 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -87,8 +87,6 @@ APPLICATION : mmg : '5.6.0' mmgplugin: 'main' 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 : 'native' netCDF4: 'native' nlopt : 'native' @@ -190,7 +188,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf index eab2b27..445f2bf 100644 --- a/applications/SALOME-master-windows.pyconf +++ b/applications/SALOME-master-windows.pyconf @@ -96,8 +96,6 @@ APPLICATION : netcdf : '4.6.2' netCDF4: '1.6.5' netgen : {tag:'5.3.1', base: 'no', section: 'version_5_3_1_with_CAS_7_8_win'} - # comment out line above and uncomment the line below to use Netgen 6. - #netgen : '6.2.2101' nlopt : '2.5.0' numpy : '1.21.6' omniORB : '4.2.3' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 96ad50f..2a9c82f 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -95,8 +95,6 @@ APPLICATION : mpi4py : {tag: '3.1.0', base: 'no', section : 'version_3_1_0_no_pip'} metis : '5.1.0' 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 : '4.6.2' netCDF4 : '1.6.5' nlopt : '2.5.0' @@ -209,7 +207,6 @@ APPLICATION : 'pmml' 'SALOMEBOOTSTRAP' 'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'} - 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' 'CEATESTBASE' : 'SalomeV9' -- 2.39.2