From b3453e5bcba7aaf6dd16e7689473c51601967916 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 25 May 2007 09:07:39 +0000
Subject: [PATCH] fix mesh algo #defines for back compat
---
Common/DefaultOptions.h | 2 +-
Common/GmshDefines.h | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 5468a72416..2ba1282ff6 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -875,7 +875,7 @@ StringXNumber GeometryOptions_Number[] = {
StringXNumber MeshOptions_Number[] = {
{ F|O, "Algorithm" , opt_mesh_algo2d , ALGO_2D_MESHADAPT_DELAUNAY ,
- "2D mesh algorithm (1=MeshAdapt, 2=Delaunay, 3=MeshAdapt+Delaunay)" },
+ "2D mesh algorithm (1=MeshAdapt+Delaunay, 4=MeshAdapt, 5=Delaunay)" },
{ F|O, "Algorithm3D" , opt_mesh_algo3d ,
#if defined(HAVE_TETGEN)
ALGO_3D_TETGEN_DELAUNAY ,
diff --git a/Common/GmshDefines.h b/Common/GmshDefines.h
index 9a224eb6ec..2fa6d434ee 100644
--- a/Common/GmshDefines.h
+++ b/Common/GmshDefines.h
@@ -71,13 +71,16 @@
#define ENT_ALL (ENT_POINT | ENT_LINE | ENT_SURFACE | ENT_VOLUME)
// 2D mesh algorithms
-#define ALGO_2D_MESHADAPT 1
-#define ALGO_2D_DELAUNAY 2
-#define ALGO_2D_MESHADAPT_DELAUNAY 3
+#define ALGO_2D_MESHADAPT_DELAUNAY 1
+#define ALGO_2D_ANISOTROPIC 2 // unused
+#define ALGO_2D_TRIANGLE 3 // unused
+#define ALGO_2D_MESHADAPT 4
+#define ALGO_2D_DELAUNAY 5
// 3D mesh algorithms
#define ALGO_3D_TETGEN_DELAUNAY 1
#define ALGO_3D_NETGEN 4
+#define ALGO_3D_TETGEN 5 // unused
#define TRANSFINI 1
#define LIBRE 2
--
GitLab