From 014d90d6ca5cd01d7270770a1e31e6e7ffaf58bd Mon Sep 17 00:00:00 2001 From: Nabil Ghodbane Date: Tue, 5 Apr 2022 15:25:37 +0200 Subject: [PATCH] bos #18709: gmshplugin --- products/GMSHPLUGIN.pyconf | 2 +- products/gmsh.pyconf | 1 + products/patches/GMSHPLUGIN-BOS-18709.patch | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 products/patches/GMSHPLUGIN-BOS-18709.patch diff --git a/products/GMSHPLUGIN.pyconf b/products/GMSHPLUGIN.pyconf index 048d905..ddfe7f3 100644 --- a/products/GMSHPLUGIN.pyconf +++ b/products/GMSHPLUGIN.pyconf @@ -34,7 +34,7 @@ default : default_win : { - patches : ['GMSHPlugin_Mesher-ctx.patch'] + patches : ['GMSHPLUGIN-BOS-18709.patch'] } version_8_1_0_to_9_1_0 : diff --git a/products/gmsh.pyconf b/products/gmsh.pyconf index 2fac5a5..7861eba 100644 --- a/products/gmsh.pyconf +++ b/products/gmsh.pyconf @@ -33,6 +33,7 @@ version_4_8_4: version_4_8_4_win: { compil_script : "gmsh-4.8.4.bat" + patches: ['gmsh-4.8.4-windows.patch'] } version_4_1_4: diff --git a/products/patches/GMSHPLUGIN-BOS-18709.patch b/products/patches/GMSHPLUGIN-BOS-18709.patch new file mode 100644 index 0000000..cfb4d42 --- /dev/null +++ b/products/patches/GMSHPLUGIN-BOS-18709.patch @@ -0,0 +1,15 @@ +diff --git a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx +index 847526e..556c7bb 100644 +--- a/src/GMSHPlugin/GMSHPlugin_Mesher.cxx ++++ b/src/GMSHPlugin/GMSHPlugin_Mesher.cxx +@@ -320,8 +320,10 @@ void GMSHPlugin_Mesher::SetGmshOptions() + ok = GmshSetOption("Mesh", "MaxNumThreads3D" , 0. ) ; // Fine-grain algo threads HXT + ASSERT(ok); + **/ ++ #ifndef WIN32 + ok = GmshSetOption("General", "NumThreads" , _maxThreads ) ; // system default i.e. OMP_NUM_THREADS + ASSERT(ok); ++ #endif WIN32 + #endif + } + -- 2.39.2