From 7a184507a961ebbd53b1f1682b3f03b72dcab205 Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Fri, 10 Feb 2023 10:05:21 +0100 Subject: [PATCH] spns #33457: SOLVERLAB move back to branch: master --- applications/SALOME-master-MPI.pyconf | 2 +- applications/SALOME-master-int32.pyconf | 4 +++- applications/SALOME-master-native.pyconf | 2 +- applications/SALOME-master.pyconf | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf index 7a45b9c..45e689e 100644 --- a/applications/SALOME-master-MPI.pyconf +++ b/applications/SALOME-master-MPI.pyconf @@ -182,7 +182,7 @@ APPLICATION : 'OPENTURNS_SALOME' 'YDEFX' 'pmml' - 'SOLVERLAB' : {tag:'bsr_newgui', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf index b802309..042766d 100644 --- a/applications/SALOME-master-int32.pyconf +++ b/applications/SALOME-master-int32.pyconf @@ -95,6 +95,7 @@ APPLICATION : openVKL: '0.11.0' ospray : '2.4.0' packaging : '17.1' + packagespy : '74152cd' pandas : '0.25.2' patsy : '0.5.2' ParaView : {tag:'5.11.0', base: 'no', section: 'version_5_11_0_MPI', hpc: 'yes'} @@ -180,7 +181,8 @@ APPLICATION : 'OPENTURNS_SALOME' 'YDEFX' 'pmml' - 'SOLVERLAB' : {tag:'master', base: 'no', section: 'default_MPI', hpc: 'yes'} + '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 09ca19c..6cdedd2 100644 --- a/applications/SALOME-master-native.pyconf +++ b/applications/SALOME-master-native.pyconf @@ -179,7 +179,7 @@ APPLICATION : 'OPENTURNS_SALOME' 'YDEFX' 'pmml' - 'SOLVERLAB' : 'bsr_newgui' + 'SOLVERLAB' 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf index 08a6f54..5e51f85 100644 --- a/applications/SALOME-master.pyconf +++ b/applications/SALOME-master.pyconf @@ -182,7 +182,7 @@ APPLICATION : 'OPENTURNS_SALOME' 'YDEFX' 'pmml' - 'SOLVERLAB' : {tag: 'bsr_newgui', base: 'no', section: 'default_MPI', hpc: 'yes'} + 'SOLVERLAB' : {tag: 'master', base: 'no', section: 'default_MPI', hpc: 'yes'} 'SOLVERLABGUI' 'TopIIVolMesh' #'TESTBASE' -- 2.39.2