From f7716af075354abe4f546d5ed6bf03e963786484 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 1 Apr 2009 06:41:11 +0000
Subject: [PATCH] fix error msg for transfinite lines (small bug introduced
last week)
---
Mesh/Generator.cpp | 4 ++--
Parser/Gmsh.tab.cpp | 2 +-
Parser/Gmsh.y | 2 +-
benchmarks/step/tank.geo | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index faa147102c..9270d99eed 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -303,8 +303,8 @@ static bool CancelDelaunayHybrid(GModel *m)
return !Msg::GetBinaryAnswer
("You are trying to generate a mixed structured/unstructured grid using\n"
"the 3D Delaunay algorithm. This algorithm cannot garantee that the\n"
- "final mesh will be conforming. You should probably use the Frontal\n"
- "Netgen algorithm instead. Do you really want to continue?\n\n"
+ "final mesh will be conforming. You should probably use the 3D Frontal\n"
+ "algorithm instead. Do you really want to continue?\n\n"
"(To disable this warning in the future, select `Enable expert mode'\n"
"in the option dialog.)",
"Continue", "Cancel");
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 1670544c54..8296588f78 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -6594,7 +6594,7 @@ yyreduce:
ge->meshAttributes.typeTransfinite = type * sign(d);
ge->meshAttributes.coeffTransfinite = coef;
}
- else if(j > 0)
+ else if(sign > 0)
yymsg(0, "Unknown line %d", j);
}
}
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index c523d27f3c..f0e19e4546 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -2576,7 +2576,7 @@ Transfinite :
ge->meshAttributes.typeTransfinite = type * sign(d);
ge->meshAttributes.coeffTransfinite = coef;
}
- else if(j > 0)
+ else if(sign > 0)
yymsg(0, "Unknown line %d", j);
}
}
diff --git a/benchmarks/step/tank.geo b/benchmarks/step/tank.geo
index 92a7258f18..123aefd78d 100644
--- a/benchmarks/step/tank.geo
+++ b/benchmarks/step/tank.geo
@@ -1,5 +1,5 @@
-Geometry.OCCFixSmallEdges=1;
-Geometry.OCCFixSmallFaces=1;
+Geometry.OCCFixSmallEdges = 1;
+Geometry.OCCFixSmallFaces = 1;
Merge "tank.brep";
--
GitLab