From a6fd3362aaefb84dd5f4fd2b05057c48ddeaed4a Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@uliege.be> Date: Mon, 16 May 2022 22:01:33 +0200 Subject: [PATCH] fix recombineMinimumQuality (should be double, not int!) --- CHANGELOG.txt | 2 ++ CMakeLists.txt | 2 +- doc/texinfo/version.texi | 2 +- src/common/Context.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c5c6bc8e18..63f55e85a7 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,5 @@ +(Work-in-progress): small bug fixes. + 4.10.2 (May 13, 2022): fixed regression introduced in 4.9 for recombined meshes with boundary layers; new Geometry.OCCSafeUnbind option to disable boolean optimization introduced in 4.10.0 (for backward compatibility); new HealShapes diff --git a/CMakeLists.txt b/CMakeLists.txt index 912dff4607..8f99dfebe6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,7 @@ opt(ZIPPER "Enable Zip file compression/decompression" OFF) set(GMSH_MAJOR_VERSION 4) set(GMSH_MINOR_VERSION 10) -set(GMSH_PATCH_VERSION 2) +set(GMSH_PATCH_VERSION 3) if(NOT GMSH_EXTRA_VERSION) set(GMSH_EXTRA_VERSION "") endif() diff --git a/doc/texinfo/version.texi b/doc/texinfo/version.texi index c5f90c86e4..b3577cbbcd 100644 --- a/doc/texinfo/version.texi +++ b/doc/texinfo/version.texi @@ -1,4 +1,4 @@ @c This file was generated by cmake: do not edit manually! -@set GMSH-VERSION 4.10.2 (development version) +@set GMSH-VERSION 4.10.3 (development version) @set GITLAB-PREFIX https://gitlab.onelab.info/gmsh/gmsh/blob/master diff --git a/src/common/Context.h b/src/common/Context.h index 50e73b066d..1e7dfe5961 100644 --- a/src/common/Context.h +++ b/src/common/Context.h @@ -29,7 +29,7 @@ struct contextMeshOptions { int nbSmoothing, algo2d, algo3d, algoSubdivide, algoSwitchOnFailure; int algoRecombine, recombineAll, recombineOptimizeTopology; int recombineNodeRepositioning; - int recombineMinimumQuality; + double recombineMinimumQuality; int recombine3DAll, recombine3DLevel, recombine3DConformity; int flexibleTransfinite, transfiniteTri, maxRetries; int order, secondOrderLinear, secondOrderIncomplete; -- GitLab