From c43af33f8d7e22333d150ab14de36171cc675ef0 Mon Sep 17 00:00:00 2001
From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Wed, 5 Jan 2022 11:51:08 +0100
Subject: [PATCH] spns #26899: move to MeshGems 2.14-1

---
 applications/SALOME-master-MPI.pyconf     |  2 +-
 applications/SALOME-master-int32.pyconf   | 35 ++++++++++++-----------
 applications/SALOME-master-native.pyconf  |  2 +-
 applications/SALOME-master-windows.pyconf |  2 +-
 applications/SALOME-master.pyconf         |  2 +-
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index ee8517e..298bc9d 100644
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -68,7 +68,7 @@ APPLICATION :
         matplotlib : '3.0.3'
         medfile : {tag : '4.1.1', hpc : 'yes', section : 'default_Autotools' }
         mesa : '19.0.8'
-        MeshGems : {tag : '2.13-1', hpc : 'yes'}
+        MeshGems : {tag : '2.14-1', hpc : 'yes'}
         mpi4py: '3.0.3'
         ParMetis : '3.1.1'
         netgen : '6.2.2101'
diff --git a/applications/SALOME-master-int32.pyconf b/applications/SALOME-master-int32.pyconf
index afbaadc..dba392f 100644
--- a/applications/SALOME-master-int32.pyconf
+++ b/applications/SALOME-master-int32.pyconf
@@ -66,7 +66,7 @@ APPLICATION :
         matplotlib : '3.0.3'
         medfile : {section: 'default_Autotools', tag: '4.1.1'}
         mesa : '19.0.8'
-        MeshGems : '2.13-1'
+        MeshGems : '2.14-1'
         metis : '5.1.0'
         netgen : '6.2.2101'
         nlopt : '2.5.0'
@@ -158,8 +158,9 @@ APPLICATION :
         'ADAO'
         'ADAO_INTERFACE'
         'PARAVISADDONS'
-        'TESTBASE'
-        'CEATESTBASE' : {tag: 'SalomeV9'}
+        'YDEFX'
+        'TESTBASE': {tag: 'master'}
+        'CEATESTBASE' : {tag: 'SSL'}
     }
     profile :
     {
@@ -186,18 +187,18 @@ APPLICATION :
 }
 __overwrite__ :
 [
-  {
-   __condition__ : "VARS.dist in ['FD32']"
-   # https://github.com/scipy/scipy/issues/11611
-   'APPLICATION.products.scipy' : '1.5.2'
-  }
-  {
-   __condition__ : "VARS.dist in ['FD30']"
-   # https://github.com/scipy/scipy/issues/11611
-   'APPLICATION.products.gcc' : '9.3.0'
-  }
-  {
-   __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']"
-   'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
-  }
+    {
+        __condition__ : "VARS.dist in ['FD32']"
+        # https://github.com/scipy/scipy/issues/11611
+        'APPLICATION.products.scipy' : '1.5.2'
+    }
+    {
+        __condition__ : "VARS.dist in ['FD30']"
+        # https://github.com/scipy/scipy/issues/11611
+        'APPLICATION.products.gcc' : '9.3.0'
+    }
+    {
+        __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']"
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+    }
 ]
diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 02588e6..14e29dc 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -70,7 +70,7 @@ APPLICATION :
         matplotlib : 'native'
         medfile : {section: 'default_Autotools', tag: '4.1.1'}
         mesa : 'native'
-        MeshGems : '2.13-1'
+        MeshGems : '2.14-1'
         metis : 'native'
         netgen : '6.2.2101'
         nlopt : '2.4.2'
diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index 2e5742c..2f2548c 100644
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -72,7 +72,7 @@ APPLICATION :
         matplotlib : '3.1.0'
         medfile : '4.1.1'
         mesa : '19.2.3'
-        MeshGems : '2.13-1'
+        MeshGems : '2.14-1'
         metis : '5.1.0'
         msvc : '2017'
         netgen : '6.2.2101'
diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index de09443..5c61be4 100644
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -68,7 +68,7 @@ APPLICATION :
         matplotlib : '3.0.3'
         medfile : {section: 'default_Autotools', tag: '4.1.1'}
         mesa : '19.0.8'
-        MeshGems : '2.13-1'
+        MeshGems : '2.14-1'
         metis : '5.1.0'
         netgen : '6.2.2101'
         nlopt : '2.5.0'
-- 
2.39.2