libsrc/core/version.hpp | 7 ++-
libsrc/meshing/basegeom.cpp | 3 +-
libsrc/meshing/meshclass.cpp | 6 +-
- libsrc/occ/occgenmesh.cpp | 17 +++---
+ libsrc/occ/occgenmesh.cpp | 16 +++---
libsrc/occ/occmeshsurf.cpp | 128 +++++++++++++----------------------------
libsrc/stlgeom/stlgeom.hpp | 2 +-
libsrc/stlgeom/stltopology.hpp | 2 +-
nglib/nglib.cpp | 2 +-
- 8 files changed, 64 insertions(+), 103 deletions(-)
+ 8 files changed, 63 insertions(+), 103 deletions(-)
diff --git a/libsrc/core/version.hpp b/libsrc/core/version.hpp
index 3048ce5b..81524b58 100644
for (auto & fd : facedecoding)
diff --git a/libsrc/occ/occgenmesh.cpp b/libsrc/occ/occgenmesh.cpp
-index e0164177..431050e0 100644
+index e0164177..5699952c 100644
--- a/libsrc/occ/occgenmesh.cpp
+++ b/libsrc/occ/occgenmesh.cpp
-@@ -7,6 +7,7 @@
- #include "occ_face.hpp"
- #include "occmeshsurf.hpp"
-
-+#include <BRepTools.hxx>
- #include <BRepAdaptor_Curve.hxx>
- #include <BRepGProp.hxx>
- #include <BRepLProp_CLProps.hxx>
-@@ -59,7 +60,7 @@ namespace netgen
+@@ -59,7 +59,7 @@ namespace netgen
double ComputeH (double kappa, const MeshingParameters & mparam)
{
kappa *= mparam.curvaturesafety;
double hret;
if (mparam.maxh * kappa < 1)
-@@ -71,7 +72,7 @@ namespace netgen
+@@ -71,7 +71,7 @@ namespace netgen
hret = mparam.maxh;
return hret;
// return min(mparam.maxh, 1/kappa);
return (mparam.maxh*kappa < 1) ? mparam.maxh : 1/kappa;
}
-@@ -653,13 +654,13 @@ namespace netgen
+@@ -653,13 +653,13 @@ namespace netgen
for (int k = 1; k <=3; k++)
{