-diff -Naur netgen-5.3.1_orig/libsrc/meshing/meshtype.cpp netgen-5.3.1_new/libsrc/meshing/meshtype.cpp
---- netgen-5.3.1_orig/libsrc/meshing/meshtype.cpp 2009-09-13 14:28:38.000000000 +0400
-+++ netgen-5.3.1_new/libsrc/meshing/meshtype.cpp 2014-07-22 13:01:28.000000000 +0400
+diff -NaurwB netgen-5.3.1_orig/Makefile.in netgen-5.3.1_new/Makefile.in
+--- netgen-5.3.1_orig/Makefile.in 2014-10-06 15:04:37.000000000 +0400
++++ netgen-5.3.1_new/Makefile.in 2016-10-03 16:17:10.164707368 +0300
+@@ -280,7 +280,7 @@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+ METASOURCES = AUTO
+-SUBDIRS = libsrc ng tutorials doc windows nglib
++SUBDIRS = libsrc nglib #tutorials doc windows nglib
+ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+diff -NaurwB netgen-5.3.1_orig/configure.ac netgen-5.3.1_new/configure.ac
+--- netgen-5.3.1_orig/configure.ac 2014-10-06 15:00:17.000000000 +0400
++++ netgen-5.3.1_new/configure.ac 2016-09-29 14:34:11.957389447 +0300
+@@ -42,7 +42,7 @@
+
+ if test a$occon = atrue ; then
+
+- AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/inc -I/usr/include/opencascade"])
++ AC_SUBST([OCCFLAGS], ["-DOCCGEOMETRY -I$occdir/include/opencascade"])
+ AC_SUBST([OCCLIBS], ["-L$occdir/lib -lTKernel -lTKGeomBase -lTKMath -lTKG2d -lTKG3d -lTKXSBase -lTKOffset -lTKFillet -lTKShHealing -lTKMesh -lTKMeshVS -lTKTopAlgo -lTKGeomAlgo -lTKBool -lTKPrim -lTKBO -lTKIGES -lTKBRep -lTKSTEPBase -lTKSTEP -lTKSTL -lTKSTEPAttr -lTKSTEP209 -lTKXDESTEP -lTKXDEIGES -lTKXCAF -lTKLCAF -lFWOSPlugin"])
+
+ # -lTKDCAF
+diff -NaurwB netgen-5.3.1_orig/libsrc/meshing/findip.hpp netgen-5.3.1_new/libsrc/meshing/findip.hpp
+--- netgen-5.3.1_orig/libsrc/meshing/findip.hpp 2014-08-29 13:54:05.000000000 +0400
++++ netgen-5.3.1_new/libsrc/meshing/findip.hpp 2016-09-30 20:38:56.662234111 +0300
+@@ -75,6 +75,9 @@
+ static int timer = NgProfiler::CreateTimer ("FindInnerPoint");
+ NgProfiler::RegionTimer reg (timer);
+
++ if ( points.Size() < 3 )
++ return 0;
++
+ Array<Vec3d> a;
+ Array<double> c;
+ Mat<3> m, inv;
+diff -NaurwB netgen-5.3.1_orig/libsrc/meshing/improve3.cpp netgen-5.3.1_new/libsrc/meshing/improve3.cpp
+--- netgen-5.3.1_orig/libsrc/meshing/improve3.cpp 2014-08-29 13:54:05.000000000 +0400
++++ netgen-5.3.1_new/libsrc/meshing/improve3.cpp 2016-10-03 16:16:57.636639300 +0300
+@@ -1219,6 +1219,7 @@
+
+ tetused = 0;
+ tetused[0] = 1;
++ int nbtetused = 0;
+
+ for (int l = 2; l < nsuround; l++)
+ {
+@@ -1239,10 +1240,12 @@
+
+ tetused[k] = 1;
+ suroundpts[l] = newpi;
++ ++nbtetused;
+ }
+ }
+ }
+-
++ if ( nbtetused < nsuround )
++ continue;
+
+ bad1 = 0;
+ for (int k = 0; k < nsuround; k++)
+diff -NaurwB netgen-5.3.1_orig/libsrc/meshing/meshtype.cpp netgen-5.3.1_new/libsrc/meshing/meshtype.cpp
+--- netgen-5.3.1_orig/libsrc/meshing/meshtype.cpp 2014-08-29 13:54:05.000000000 +0400
++++ netgen-5.3.1_new/libsrc/meshing/meshtype.cpp 2016-09-29 14:04:51.500148293 +0300
@@ -1,4 +1,5 @@
#include <mystdlib.h>
+#include <float.h> // to get DBL_MIN defined
#include "meshing.hpp"
-@@ -650,7 +651,8 @@
+@@ -666,7 +667,8 @@
double det = trans.Det();
err += 1e12;
else
err += frob * frob / det;
-@@ -706,7 +708,8 @@
+@@ -722,7 +724,8 @@
double det = trans(0,0)*trans(1,1)-trans(1,0)*trans(0,1);
{
dd = 0;
return 1e12;
-@@ -790,7 +793,8 @@
+@@ -806,7 +809,8 @@
= dtrans(0,0) * trans(1,1) - trans(0,1) * dtrans(1,0)
+ trans(0,0) * dtrans(1,1) - dtrans(0,1) * trans(1,0);
err += 1e12;
else
{
-@@ -840,7 +844,8 @@
+@@ -856,7 +860,8 @@
frob /= 2;
double det = trans.Det();
err += 1e12;
else
err += frob * frob / det;
-@@ -1857,7 +1862,8 @@
+@@ -1864,7 +1869,8 @@
case PYRAMID:
{
double noz = 1-p(2);
double xi = p(0) / noz;
double eta = p(1) / noz;
-@@ -2035,7 +2041,8 @@
+@@ -2030,7 +2036,8 @@
double det = -trans.Det();
err += 1e12;
else
err += frob * frob * frob / det;
-@@ -2107,7 +2114,8 @@
+@@ -2102,7 +2109,8 @@
ddet *= -1;
err += 1e12;
else
{
-@@ -2189,7 +2197,7 @@
+@@ -2184,7 +2192,7 @@
det *= -1;
err += 1e12;
else
{
-diff -Naur netgen-5.3.1_orig/libsrc/meshing/meshtype.hpp netgen-5.3.1_new/libsrc/meshing/meshtype.hpp
---- netgen-5.3.1_orig/libsrc/meshing/meshtype.hpp 2009-11-09 13:50:43.000000000 +0300
-+++ netgen-5.3.1_new/libsrc/meshing/meshtype.hpp 2014-07-22 13:01:28.000000000 +0400
-@@ -12,6 +12,7 @@
+diff -NaurwB netgen-5.3.1_orig/libsrc/meshing/meshtype.hpp netgen-5.3.1_new/libsrc/meshing/meshtype.hpp
+--- netgen-5.3.1_orig/libsrc/meshing/meshtype.hpp 2014-08-29 13:54:05.000000000 +0400
++++ netgen-5.3.1_new/libsrc/meshing/meshtype.hpp 2016-09-30 14:28:09.147575801 +0300
+@@ -15,6 +15,7 @@
Classes for NETGEN
- */
+ */
+class Mesh; // added due to compilation errors on some platforms
- enum ELEMENT_TYPE {
- SEGMENT = 1, SEGMENT3 = 2,
-diff -Naur netgen-5.3.1_orig/libsrc/meshing/smoothing2.cpp netgen-5.3.1_new/libsrc/meshing/smoothing2.cpp
-diff -Naur netgen-5.3.1_orig/libsrc/occ/occconstruction.cpp netgen-5.3.1_new/libsrc/occ/occconstruction.cpp
---- netgen-5.3.1_orig/libsrc/occ/occconstruction.cpp 2009-08-24 06:32:47.000000000 +0400
-+++ netgen-5.3.1_new/libsrc/occ/occconstruction.cpp 2014-07-22 13:01:28.000000000 +0400
+
+ enum ELEMENT_TYPE {
+@@ -360,7 +361,7 @@
+ {
+ #ifdef DEBUG
+ if (typ != QUAD && typ != QUAD6 && typ != QUAD8)
+- PrintSysError ("element2d::GetNV not implemented for typ", typ)
++ PrintSysError ("element2d::GetNV not implemented for typ", typ);
+ #endif
+ return 4;
+ }
+@@ -618,7 +619,7 @@
+ return 8;
+ default:
+ #ifdef DEBUG
+- PrintSysError ("Element3d::GetNV not implemented for typ ", typ)
++ PrintSysError ("Element3d::GetNV not implemented for typ ", typ);
+ #endif
+ ;
+ }
+@@ -682,7 +683,7 @@
+ case PRISM12: return 5;
+ default:
+ #ifdef DEBUG
+- PrintSysError ("element3d::GetNFaces not implemented for typ", typ)
++ PrintSysError ("element3d::GetNFaces not implemented for typ", typ);
+ #endif
+ ;
+ }
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/Partition_Inter2d.cxx netgen-5.3.1_new/libsrc/occ/Partition_Inter2d.cxx
+--- netgen-5.3.1_orig/libsrc/occ/Partition_Inter2d.cxx 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/Partition_Inter2d.cxx 2016-09-29 14:44:01.996464598 +0300
+@@ -47,9 +47,7 @@
+ #include <TopOpeBRep_EdgesIntersector.hxx>
+ #include <TopOpeBRep_Point2d.hxx>
+ #include <TopTools_ListIteratorOfListOfShape.hxx>
+-#include <TopTools_ListOfShape.hxx>
+ #include <TopTools_MapIteratorOfMapOfShape.hxx>
+-#include <TopTools_MapOfShape.hxx>
+ #include <TopoDS.hxx>
+ #include <TopoDS_Edge.hxx>
+ #include <TopoDS_Vertex.hxx>
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/Partition_Inter2d.hxx netgen-5.3.1_new/libsrc/occ/Partition_Inter2d.hxx
+--- netgen-5.3.1_orig/libsrc/occ/Partition_Inter2d.hxx 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/Partition_Inter2d.hxx 2016-09-29 14:44:01.996464598 +0300
+@@ -27,7 +27,9 @@
+ #ifndef _Partition_Inter2d_HeaderFile
+ #define _Partition_Inter2d_HeaderFile
+
+-#ifndef _Handle_BRepAlgo_AsDes_HeaderFile
++#include <Standard_Version.hxx>
++
++#if OCC_VERSION_MAJOR < 7
+ #include <Handle_BRepAlgo_AsDes.hxx>
+ #endif
+ #ifndef _Standard_Real_HeaderFile
+@@ -36,11 +38,13 @@
+ #ifndef _Standard_Boolean_HeaderFile
+ #include <Standard_Boolean.hxx>
+ #endif
++
++#include <TopTools_MapOfShape.hxx>
++#include <TopTools_ListOfShape.hxx>
++
+ class BRepAlgo_AsDes;
+ class TopoDS_Face;
+-class TopTools_MapOfShape;
+ class TopoDS_Vertex;
+-class TopTools_ListOfShape;
+ class TopoDS_Edge;
+
+
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/Partition_Inter3d.cxx netgen-5.3.1_new/libsrc/occ/Partition_Inter3d.cxx
+--- netgen-5.3.1_orig/libsrc/occ/Partition_Inter3d.cxx 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/Partition_Inter3d.cxx 2016-09-29 14:44:02.000464619 +0300
+@@ -48,7 +48,6 @@
+ #include <TopOpeBRepTool_BoxSort.hxx>
+ #include <TopTools_DataMapIteratorOfDataMapOfShapeListOfShape.hxx>
+ #include <TopTools_ListIteratorOfListOfShape.hxx>
+-#include <TopTools_ListOfShape.hxx>
+ #include <TopoDS.hxx>
+ #include <TopoDS_Compound.hxx>
+ #include <TopoDS_Edge.hxx>
+@@ -206,7 +205,7 @@
+ Handle (Geom_Surface) S = BRep_Tool::Surface(F,L);
+
+ if (S->IsKind(STANDARD_TYPE(Geom_RectangularTrimmedSurface))) {
+- S = (*(Handle_Geom_RectangularTrimmedSurface*)&S)->BasisSurface();
++ S = Handle(Geom_RectangularTrimmedSurface)::DownCast (S)->BasisSurface();
+ }
+ if (!S->IsUPeriodic() && !S->IsVPeriodic())
+ return;
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/Partition_Inter3d.hxx netgen-5.3.1_new/libsrc/occ/Partition_Inter3d.hxx
+--- netgen-5.3.1_orig/libsrc/occ/Partition_Inter3d.hxx 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/Partition_Inter3d.hxx 2016-09-29 14:44:02.000464619 +0300
+@@ -27,7 +27,9 @@
+ #ifndef _Partition_Inter3d_HeaderFile
+ #define _Partition_Inter3d_HeaderFile
+
+-#ifndef _Handle_BRepAlgo_AsDes_HeaderFile
++#include <Standard_Version.hxx>
++
++#if OCC_VERSION_MAJOR < 7
+ #include <Handle_BRepAlgo_AsDes.hxx>
+ #endif
+ #ifndef _TopTools_DataMapOfShapeListOfShape_HeaderFile
+@@ -36,6 +38,9 @@
+ #ifndef _TopTools_MapOfShape_HeaderFile
+ #include <TopTools_MapOfShape.hxx>
+ #endif
++#ifndef _TopTools_ListOfShape_HeaderFile
++#include <TopTools_ListOfShape.hxx>
++#endif
+ #ifndef _TopTools_DataMapOfShapeShape_HeaderFile
+ #include <TopTools_DataMapOfShapeShape.hxx>
+ #endif
+@@ -43,10 +48,7 @@
+ #include <Standard_Boolean.hxx>
+ #endif
+ class BRepAlgo_AsDes;
+-class TopTools_ListOfShape;
+-class TopTools_DataMapOfShapeShape;
+ class TopoDS_Face;
+-class TopTools_MapOfShape;
+ class TopoDS_Shape;
+ class TopoDS_Vertex;
+ class TopoDS_Edge;
+@@ -83,13 +85,13 @@
+ void FacesPartition(const TopoDS_Face& F1,const TopoDS_Face& F2) ;
+ Standard_Boolean IsDone(const TopoDS_Face& F1,const TopoDS_Face& F2) const;
+ TopTools_MapOfShape& TouchedFaces() ;
+- Handle_BRepAlgo_AsDes AsDes() const;
++ Handle(BRepAlgo_AsDes) AsDes() const;
+ TopTools_MapOfShape& NewEdges() ;
+ Standard_Boolean HasSameDomainF(const TopoDS_Shape& F) const;
+ Standard_Boolean IsSameDomainF(const TopoDS_Shape& F1,const TopoDS_Shape& F2) const;
+ const TopTools_ListOfShape& SameDomain(const TopoDS_Face& F) const;
+ TopoDS_Vertex ReplaceSameDomainV(const TopoDS_Vertex& V,const TopoDS_Edge& E) const;
+- Handle_BRepAlgo_AsDes SectionEdgesAD() const;
++ Handle(BRepAlgo_AsDes) SectionEdgesAD() const;
+ Standard_Boolean IsSectionEdge(const TopoDS_Edge& E) const;
+ Standard_Boolean HasSectionEdge(const TopoDS_Face& F) const;
+ Standard_Boolean IsSplitOn(const TopoDS_Edge& NewE,const TopoDS_Edge& OldE,const TopoDS_Face& F) const;
+@@ -121,11 +123,11 @@
+
+ // Fields PRIVATE
+ //
+- Handle_BRepAlgo_AsDes myAsDes;
++ Handle(BRepAlgo_AsDes) myAsDes;
+ TopTools_DataMapOfShapeListOfShape myDone;
+ TopTools_MapOfShape myTouched;
+ TopTools_MapOfShape myNewEdges;
+- Handle_BRepAlgo_AsDes mySectionEdgesAD;
++ Handle(BRepAlgo_AsDes) mySectionEdgesAD;
+ TopTools_DataMapOfShapeListOfShape mySameDomainFM;
+ TopTools_DataMapOfShapeShape mySameDomainVM;
+
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/Partition_Loop.hxx netgen-5.3.1_new/libsrc/occ/Partition_Loop.hxx
+--- netgen-5.3.1_orig/libsrc/occ/Partition_Loop.hxx 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/Partition_Loop.hxx 2016-09-29 14:44:02.000464619 +0300
+@@ -38,8 +38,6 @@
+ #endif
+ class TopoDS_Face;
+ class TopoDS_Edge;
+-class TopTools_ListOfShape;
+-
+
+ #ifndef _Standard_HeaderFile
+ #include <Standard.hxx>
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/Partition_Loop2d.cxx netgen-5.3.1_new/libsrc/occ/Partition_Loop2d.cxx
+--- netgen-5.3.1_orig/libsrc/occ/Partition_Loop2d.cxx 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/Partition_Loop2d.cxx 2016-09-29 14:04:51.504148314 +0300
+@@ -210,7 +210,7 @@
+ Cc->D1(uc, PC, CTg1);
+ if (!isForward) CTg1.Reverse();
+
+- Standard_Real anglemin = 3 * PI, tolAng = 1.e-8;
++ Standard_Real anglemin = 3 * M_PI, tolAng = 1.e-8;
+
+ // select an edge whose first derivative is most left of CTg1
+ // ie an angle between Tg1 and CTg1 is least
+@@ -234,7 +234,7 @@
+ // -PI < angle < PI
+ Standard_Real angle = Tg1.Angle(CTg1);
+
+- if (PI - Abs(angle) <= tolAng)
++ if (M_PI - Abs(angle) <= tolAng)
+ {
+ // an angle is too close to PI; assure that an angle sign really
+ // reflects an edge position: +PI - an edge is worst,
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/Partition_Loop2d.hxx netgen-5.3.1_new/libsrc/occ/Partition_Loop2d.hxx
+--- netgen-5.3.1_orig/libsrc/occ/Partition_Loop2d.hxx 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/Partition_Loop2d.hxx 2016-09-29 14:44:02.000464619 +0300
+@@ -24,7 +24,6 @@
+ #endif
+ class TopoDS_Face;
+ class TopoDS_Edge;
+-class TopTools_ListOfShape;
+ class BRepAlgo_Image;
+
+
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/Partition_Loop3d.hxx netgen-5.3.1_new/libsrc/occ/Partition_Loop3d.hxx
+--- netgen-5.3.1_orig/libsrc/occ/Partition_Loop3d.hxx 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/Partition_Loop3d.hxx 2016-09-29 14:44:02.000464619 +0300
+@@ -13,6 +13,9 @@
+ #ifndef _TopTools_ListOfShape_HeaderFile
+ #include <TopTools_ListOfShape.hxx>
+ #endif
++#ifndef _TopTools_MapOfOrientedShape_HeaderFile
++#include <TopTools_MapOfOrientedShape.hxx>
++#endif
+ #ifndef _TopTools_IndexedDataMapOfShapeListOfShape_HeaderFile
+ #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+ #endif
+@@ -23,8 +26,6 @@
+ #include <Standard_Real.hxx>
+ #endif
+ class TopoDS_Shape;
+-class TopTools_ListOfShape;
+-class TopTools_MapOfOrientedShape;
+ class TopoDS_Edge;
+ class TopoDS_Face;
+ class gp_Vec;
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/Partition_Spliter.cxx netgen-5.3.1_new/libsrc/occ/Partition_Spliter.cxx
+--- netgen-5.3.1_orig/libsrc/occ/Partition_Spliter.cxx 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/Partition_Spliter.cxx 2016-09-29 14:44:02.000464619 +0300
+@@ -48,7 +48,6 @@
+ #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
+ #include <TopTools_IndexedMapOfShape.hxx>
+ #include <TopTools_ListIteratorOfListOfShape.hxx>
+-#include <TopTools_ListOfShape.hxx>
+ #include <TopTools_MapIteratorOfMapOfShape.hxx>
+ #include <TopTools_SequenceOfShape.hxx>
+
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/Partition_Spliter.hxx netgen-5.3.1_new/libsrc/occ/Partition_Spliter.hxx
+--- netgen-5.3.1_orig/libsrc/occ/Partition_Spliter.hxx 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/Partition_Spliter.hxx 2016-09-29 14:44:02.004464639 +0300
+@@ -28,9 +28,6 @@
+ #ifndef _TopTools_DataMapOfShapeShape_HeaderFile
+ #include <TopTools_DataMapOfShapeShape.hxx>
+ #endif
+-#ifndef _Handle_BRepAlgo_AsDes_HeaderFile
+-#include <Handle_BRepAlgo_AsDes.hxx>
+-#endif
+ #ifndef _BRepAlgo_Image_HeaderFile
+ #include <BRepAlgo_Image.hxx>
+ #endif
+@@ -45,7 +42,6 @@
+ #endif
+ class BRepAlgo_AsDes;
+ class TopoDS_Shape;
+-class TopTools_ListOfShape;
+ class TopoDS_Edge;
+
+
+@@ -129,7 +125,7 @@
+ TopTools_DataMapOfShapeShape myFaceShapeMap;
+ TopTools_DataMapOfShapeShape myInternalFaces;
+ TopTools_DataMapOfShapeShape myIntNotClFaces;
+- Handle_BRepAlgo_AsDes myAsDes;
++ Handle(BRepAlgo_AsDes) myAsDes;
+ BRepAlgo_Image myImagesFaces;
+ BRepAlgo_Image myImagesEdges;
+ BRepAlgo_Image myImageShape;
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/occconstruction.cpp netgen-5.3.1_new/libsrc/occ/occconstruction.cpp
+--- netgen-5.3.1_orig/libsrc/occ/occconstruction.cpp 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/occconstruction.cpp 2016-09-29 14:04:51.500148293 +0300
@@ -28,7 +28,7 @@
#include <BRepAlgoAPI_Common.hxx>
#include <BRepAlgoAPI_Fuse.hxx>
//#include <BRepAlgo_Sewing.hxx>
#include <BRepOffsetAPI_MakeOffsetShape.hxx>
#include <ShapeFix_Shape.hxx>
-diff -Naur netgen-5.3.1_orig/libsrc/occ/occgenmesh.cpp netgen-5.3.1_new/libsrc/occ/occgenmesh.cpp
---- netgen-5.3.1_orig/libsrc/occ/occgenmesh.cpp 2010-03-16 09:30:07.000000000 +0300
-+++ netgen-5.3.1_new/libsrc/occ/occgenmesh.cpp 2014-07-22 13:01:28.000000000 +0400
-@@ -168,8 +173,8 @@
- if(h < 1e-4*maxside)
- return;
-
--
-- if (h > 30) return;
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/occgenmesh.cpp netgen-5.3.1_new/libsrc/occ/occgenmesh.cpp
+--- netgen-5.3.1_orig/libsrc/occ/occgenmesh.cpp 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/occgenmesh.cpp 2016-09-29 14:04:51.500148293 +0300
+@@ -171,8 +171,8 @@
+ if(h < 1e-4*maxside)\r
+ return;\r
+ \r
+-\r
+- if (h > 30) return;\r
+ // commented to restrict H on a large sphere for example
+ //if (h > 30) return;
- }
-
- if (h < maxside && depth < 10)
-@@ -247,8 +253,8 @@
- hvalue[0] = 0;
- pnt = c->Value(s0);
-
-- double olddist = 0;
-- double dist = 0;
+ }\r
+ \r
+ if (h < maxside && depth < 10)\r
+@@ -250,8 +250,8 @@
+ hvalue[0] = 0;\r
+ pnt = c->Value(s0);\r
+ \r
+- double olddist = 0;\r
+- double dist = 0;\r
+ //double olddist = 0; -- useless variables
+ //double dist = 0;
-
- int tmpVal = (int)(DIVIDEEDGESECTIONS);
-
-@@ -256,15 +262,19 @@
- {
- oldpnt = pnt;
- pnt = c->Value(s0+(i/double(DIVIDEEDGESECTIONS))*(s1-s0));
+ \r
+ int tmpVal = (int)(DIVIDEEDGESECTIONS);\r
+ \r
+@@ -259,15 +259,19 @@
+ {\r
+ oldpnt = pnt;\r
+ pnt = c->Value(s0+(i/double(DIVIDEEDGESECTIONS))*(s1-s0));\r
+ // -- no more than 1 segment per <edge length>/DIVIDEEDGESECTIONS
- hvalue[i] = hvalue[i-1] +
-- 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*
-- pnt.Distance(oldpnt);
+ hvalue[i] = hvalue[i-1] +\r
+ // 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*
+ // pnt.Distance(oldpnt);
+ min( 1.0,
-+ 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*
+ 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*\r
+- pnt.Distance(oldpnt);\r
+ pnt.Distance(oldpnt));
-
- //(*testout) << "mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z())) " << mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))
- // << " pnt.Distance(oldpnt) " << pnt.Distance(oldpnt) << endl;
-
-- olddist = dist;
-- dist = pnt.Distance(oldpnt);
+ \r
+ //(*testout) << "mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z())) " << mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))\r
+ // << " pnt.Distance(oldpnt) " << pnt.Distance(oldpnt) << endl;\r
+ \r
+- olddist = dist;\r
+- dist = pnt.Distance(oldpnt);\r
+ //olddist = dist; -- useless variables
+ //dist = pnt.Distance(oldpnt);
- }
-
- // nsubedges = int(ceil(hvalue[DIVIDEEDGESECTIONS]));
-@@ -279,7 +289,10 @@
- {
- if (hvalue[i1]/hvalue[DIVIDEEDGESECTIONS]*nsubedges >= i)
- {
-- params[i] = s0+(i1/double(DIVIDEEDGESECTIONS))*(s1-s0);
+ }\r
+ \r
+ // nsubedges = int(ceil(hvalue[DIVIDEEDGESECTIONS]));\r
+@@ -282,7 +286,10 @@
+ {\r
+ if (hvalue[i1]/hvalue[DIVIDEEDGESECTIONS]*nsubedges >= i)\r
+ {\r
+- params[i] = s0+(i1/double(DIVIDEEDGESECTIONS))*(s1-s0);\r
+ // -- for nsubedges comparable to DIVIDEEDGESECTIONS
+ //params[i] = s0+(i1/double(DIVIDEEDGESECTIONS))*(s1-s0);
+ double d1 = i1 - (hvalue[i1] - i*hvalue[DIVIDEEDGESECTIONS]/nsubedges)/(hvalue[i1]-hvalue[i1-1]);
+ params[i] = s0+(d1/double(DIVIDEEDGESECTIONS))*(s1-s0);
- pnt = c->Value(params[i]);
- ps[i-1] = MeshPoint (Point3d(pnt.X(), pnt.Y(), pnt.Z()));
- i++;
-@@ -323,6 +336,9 @@
- (*testout) << "nedges = " << nedges << endl;
-
- double eps = 1e-6 * geom.GetBoundingBox().Diam();
+ pnt = c->Value(params[i]);\r
+ ps[i-1] = MeshPoint (Point3d(pnt.X(), pnt.Y(), pnt.Z()));\r
+ i++;\r
+@@ -326,6 +333,9 @@
+ (*testout) << "nedges = " << nedges << endl;\r
+ \r
+ double eps = 1e-6 * geom.GetBoundingBox().Diam();\r
+ const double eps2 = eps * eps; // -- small optimization
+
+ int first_vp = mesh.GetNP()+1; // -- to support SALOME sub-meshes
-
- for (int i = 1; i <= nvertices; i++)
- {
-@@ -332,7 +348,8 @@
- bool exists = 0;
- if (merge_solids)
- for (PointIndex pi = 1; pi <= mesh.GetNP(); pi++)
-- if ( Dist2 (mesh[pi], Point<3>(mp)) < eps*eps)
+ \r
+ for (int i = 1; i <= nvertices; i++)\r
+ {\r
+@@ -335,7 +345,8 @@
+ bool exists = 0;\r
+ if (merge_solids)\r
+ for (PointIndex pi = 1; pi <= mesh.GetNP(); pi++)\r
+- if ( Dist2 (mesh[pi], Point<3>(mp)) < eps*eps)\r
+ //if ( Dist2 (mesh[pi], Point<3>(mp)) < eps*eps)
+ if ( Dist2 (mesh[pi], Point<3>(mp)) < eps2 ) // -- small optimization
- {
- exists = 1;
- break;
-@@ -362,6 +379,7 @@
- {
- TopoDS_Face face = TopoDS::Face(exp1.Current());
- int facenr = geom.fmap.FindIndex(face);
+ {\r
+ exists = 1;\r
+ break;\r
+@@ -365,6 +376,7 @@
+ {\r
+ TopoDS_Face face = TopoDS::Face(exp1.Current());\r
+ int facenr = geom.fmap.FindIndex(face);\r
+ if ( facenr < 1 ) continue; // -- to support SALOME sub-meshes
-
- if (face2solid[0][facenr-1] == 0)
- face2solid[0][facenr-1] = solidnr;
-@@ -381,6 +399,7 @@
- int facenr = 0;
- int edgenr = 0;
-
+ \r
+ if (face2solid[0][facenr-1] == 0)\r
+ face2solid[0][facenr-1] = solidnr;\r
+@@ -384,6 +396,7 @@
+ int facenr = 0;\r
+ int edgenr = 0;\r
+ \r
+ edgenr = mesh.GetNSeg(); // to support SALOME sub-meshes
-
- (*testout) << "faces = " << geom.fmap.Extent() << endl;
- int curr = 0;
-@@ -442,6 +461,7 @@
- //(*testout) << "ignoring degenerated edge" << endl;
- continue;
- }
+ \r
+ (*testout) << "faces = " << geom.fmap.Extent() << endl;\r
+ int curr = 0;\r
+@@ -445,6 +458,7 @@
+ //(*testout) << "ignoring degenerated edge" << endl;\r
+ continue;\r
+ }\r
+ if ( geom.emap.FindIndex(edge) < 1 ) continue; // to support SALOME sub-meshes
-
- if (geom.vmap.FindIndex(TopExp::FirstVertex (edge)) ==
- geom.vmap.FindIndex(TopExp::LastVertex (edge)))
-@@ -474,20 +494,104 @@
-
- if (!merge_solids)
- {
-- pnums[0] = geom.vmap.FindIndex (TopExp::FirstVertex (edge));
-- pnums[pnums.Size()-1] = geom.vmap.FindIndex (TopExp::LastVertex (edge));
+ \r
+ if (geom.vmap.FindIndex(TopExp::FirstVertex (edge)) ==\r
+ geom.vmap.FindIndex(TopExp::LastVertex (edge)))\r
+@@ -477,20 +491,104 @@
+ \r
+ if (!merge_solids)\r
+ {\r
+- pnums[0] = geom.vmap.FindIndex (TopExp::FirstVertex (edge));\r
+- pnums[pnums.Size()-1] = geom.vmap.FindIndex (TopExp::LastVertex (edge));\r
+ //pnums[0] = geom.vmap.FindIndex (TopExp::FirstVertex (edge));
+ //pnums[pnums.Size()-1] = geom.vmap.FindIndex (TopExp::LastVertex (edge));
+ MeshPoint dfltP ( Point<3> ( 0, 0, 0 ) );
+ mesh.Point(ip) = MeshPoint( mesh.Point(ip), iv );
+ break;
+ }
-+ }
-+ else
-+ {
+ }\r
+ else\r
+ {\r
+- Point<3> fp = occ2ng (BRep_Tool::Pnt (TopExp::FirstVertex (edge)));\r
+- Point<3> lp = occ2ng (BRep_Tool::Pnt (TopExp::LastVertex (edge)));\r
+ ip += first_vp - 1;
+ }
+ }
- }
- else
- {
-- Point<3> fp = occ2ng (BRep_Tool::Pnt (TopExp::FirstVertex (edge)));
-- Point<3> lp = occ2ng (BRep_Tool::Pnt (TopExp::LastVertex (edge)));
++ }
++ else
++ {
+ TopoDS_Iterator vIt( edge, false );
+ TopoDS_Vertex v1 = TopoDS::Vertex( vIt.Value() ); vIt.Next();
+ TopoDS_Vertex v2 = TopoDS::Vertex( vIt.Value() );
+ double tol2 = std::min( eps*eps, 1e-6 * Dist2( fp, lp ));
+ if ( isClosedEdge )
+ tol2 = BRep_Tool::Tolerance( v1 ) * BRep_Tool::Tolerance( v1 );
-
- pnums[0] = -1;
- pnums.Last() = -1;
- for (PointIndex pi = 1; pi < first_ep; pi++)
- {
-- if (Dist2 (mesh[pi], fp) < eps*eps) pnums[0] = pi;
-- if (Dist2 (mesh[pi], lp) < eps*eps) pnums.Last() = pi;
+ \r
+ pnums[0] = -1;\r
+ pnums.Last() = -1;\r
+ for (PointIndex pi = 1; pi < first_ep; pi++)\r
+ {\r
+- if (Dist2 (mesh[pi], fp) < eps*eps) pnums[0] = pi;\r
+- if (Dist2 (mesh[pi], lp) < eps*eps) pnums.Last() = pi;\r
+ if (Dist2 (mesh[pi], fp) < tol2) pnums[0] = pi;
+ if (Dist2 (mesh[pi], lp) < tol2) pnums.Last() = pi;
+ }
+ Dist2( lp, mesh[PointIndex(pnums.Last())]))
+ std::swap( pnums[0], pnums.Last() );
+ }
- }
- }
-
-@@ -497,17 +601,20 @@
- bool exists = 0;
- int j;
- for (j = first_ep; j <= mesh.GetNP(); j++)
+ }\r
+ }\r
+ \r
+@@ -500,17 +598,20 @@
+ bool exists = 0;\r
+ int j;\r
+ for (j = first_ep; j <= mesh.GetNP(); j++)\r
+ {
+ if (!merge_solids && mesh.Point(j).GetLayer() != geomedgenr ) continue; // to support SALOME fuse edges
- if ((mesh.Point(j)-Point<3>(mp[i-1])).Length() < eps)
- {
- exists = 1;
- break;
- }
+ if ((mesh.Point(j)-Point<3>(mp[i-1])).Length() < eps)\r
+ {\r
+ exists = 1;\r
+ break;\r
+ }\r
+ }
-
- if (exists)
- pnums[i] = j;
- else
- {
-- mesh.AddPoint (mp[i-1]);
+ \r
+ if (exists)\r
+ pnums[i] = j;\r
+ else\r
+ {\r
+- mesh.AddPoint (mp[i-1]);\r
+ mesh.AddPoint (mp[i-1], geomedgenr); // to support SALOME fuse edges
- (*testout) << "add meshpoint " << mp[i-1] << endl;
- pnums[i] = mesh.GetNP();
- }
-@@ -591,6 +698,8 @@
- // (*testout) << "edge " << mesh.LineSegment(i).edgenr << " face " << mesh.LineSegment(i).si
- // << " p1 " << mesh.LineSegment(i)[0] << " p2 " << mesh.LineSegment(i)[1] << endl;
- // exit(10);
+ (*testout) << "add meshpoint " << mp[i-1] << endl;\r
+ pnums[i] = mesh.GetNP();\r
+ }\r
+@@ -594,6 +695,8 @@
+ // (*testout) << "edge " << mesh.LineSegment(i).edgenr << " face " << mesh.LineSegment(i).si\r
+ // << " p1 " << mesh.LineSegment(i)[0] << " p2 " << mesh.LineSegment(i)[1] << endl;\r
+ // exit(10);\r
+ for (int j = 1; j <= mesh.GetNP(); j++) // to support SALOME fuse edges: set level to zero
+ mesh.Point(j) = MeshPoint( (Point<3>&) mesh.Point(j) );
-
- mesh.CalcSurfacesOfNode();
- multithread.task = savetask;
-diff -Naur netgen-5.3.1_orig/libsrc/occ/occgeom.cpp netgen-5.3.1_new/libsrc/occ/occgeom.cpp
---- netgen-5.3.1_orig/libsrc/occ/occgeom.cpp 2010-03-05 16:16:21.000000000 +0300
-+++ netgen-5.3.1_new/libsrc/occ/occgeom.cpp 2014-07-22 13:01:28.000000000 +0400
+ \r
+ mesh.CalcSurfacesOfNode();\r
+ multithread.task = savetask;\r
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/occgeom.cpp netgen-5.3.1_new/libsrc/occ/occgeom.cpp
+--- netgen-5.3.1_orig/libsrc/occ/occgeom.cpp 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/occgeom.cpp 2016-09-29 16:22:31.636328123 +0300
@@ -8,6 +8,8 @@
- #include "ShapeAnalysis_CheckSmallFace.hxx"
- #include "ShapeAnalysis_DataMapOfShapeListOfReal.hxx"
- #include "ShapeAnalysis_Surface.hxx"
+ #include "ShapeAnalysis_CheckSmallFace.hxx"\r
+ #include "ShapeAnalysis_DataMapOfShapeListOfReal.hxx"\r
+ #include "ShapeAnalysis_Surface.hxx"\r
+#include <BRepTopAdaptor_FClass2d.hxx> // -- to optimize Project() and FastProject()
+#include <TopAbs_State.hxx>
- #include "BRepAlgoAPI_Fuse.hxx"
- #include "BRepCheck_Analyzer.hxx"
- #include "BRepLib.hxx"
-@@ -16,10 +18,17 @@
- #include "ShapeFix_FixSmallFace.hxx"
- #include "Partition_Spliter.hxx"
-
--
- namespace netgen
- {
-- void OCCGeometry :: PrintNrShapes ()
+ #include "BRepAlgoAPI_Fuse.hxx"\r
+ #include "BRepCheck_Analyzer.hxx"\r
+ #include "BRepLib.hxx"\r
+@@ -16,9 +18,16 @@
+ #include "ShapeFix_FixSmallFace.hxx"\r
+ #include "Partition_Spliter.hxx"\r
+ \r
+-\r
+ namespace netgen\r
+ {\r
+ // free data used to optimize Project() and FastProject()
+ OCCGeometry::~OCCGeometry()
+ {
+ delete it.Value();
+ }
+
-+ void OCCGeometry :: PrintNrShapes ()
- {
- TopExp_Explorer e;
- int count = 0;
+ void OCCGeometry :: PrintNrShapes ()\r
+ {\r
+ TopExp_Explorer e;\r
+@@ -112,7 +121,7 @@
+ double surfacecont = 0;\r
+ \r
+ {\r
+- Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;\r
++ Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
+ rebuild->Apply(shape);\r
+ for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())\r
+ {\r
+@@ -143,7 +152,7 @@
+ cout << endl << "- repairing faces" << endl;\r
+ \r
+ Handle(ShapeFix_Face) sff;\r
+- Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;\r
++ Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
+ rebuild->Apply(shape);\r
+ \r
+ \r
+@@ -200,7 +209,7 @@
+ \r
+ \r
+ {\r
+- Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;\r
++ Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
+ rebuild->Apply(shape);\r
+ for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())\r
+ {\r
+@@ -217,7 +226,7 @@
+ cout << endl << "- fixing small edges" << endl;\r
+ \r
+ Handle(ShapeFix_Wire) sfw;\r
+- Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;\r
++ Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
+ rebuild->Apply(shape);\r
+ \r
+ \r
+@@ -284,7 +293,7 @@
+ \r
+ {\r
+ BuildFMap();\r
+- Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;\r
++ Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
+ rebuild->Apply(shape);\r
+ \r
+ for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())\r
+@@ -312,7 +321,7 @@
+ \r
+ \r
+ {\r
+- Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;\r
++ Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
+ rebuild->Apply(shape);\r
+ for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())\r
+ {\r
+@@ -438,7 +447,7 @@
+ \r
+ \r
+ {\r
+- Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;\r
++ Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
+ rebuild->Apply(shape);\r
+ for (exp1.Init (shape, TopAbs_EDGE); exp1.More(); exp1.Next())\r
+ {\r
+@@ -483,7 +492,7 @@
+ TopoDS_Solid solid = TopoDS::Solid(exp0.Current());\r
+ TopoDS_Solid newsolid = solid;\r
+ BRepLib::OrientClosedSolid (newsolid);\r
+- Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;\r
++ Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
+ // rebuild->Apply(shape);\r
+ rebuild->Replace(solid, newsolid, Standard_False);\r
+ TopoDS_Shape newshape = rebuild->Apply(shape, TopAbs_COMPSOLID);//, 1);\r
+@@ -906,7 +915,7 @@
+ TopoDS_Solid solid = TopoDS::Solid(exp0.Current());\r
+ TopoDS_Solid newsolid = solid;\r
+ BRepLib::OrientClosedSolid (newsolid);\r
+- Handle_ShapeBuild_ReShape rebuild = new ShapeBuild_ReShape;\r
++ Handle(ShapeBuild_ReShape) rebuild = new ShapeBuild_ReShape;
+ rebuild->Replace(solid, newsolid, Standard_False);\r
+ \r
+ TopoDS_Shape newshape = rebuild->Apply(shape, TopAbs_SHAPE, 1);\r
@@ -951,25 +960,58 @@
- }
-
-
+ }\r
+ \r
+ \r
+ // returns a projector and a classifier for the given surface
+ void OCCGeometry::GetFaceTools(int surfi, Handle(ShapeAnalysis_Surface)& proj,
+ BRepTopAdaptor_FClass2d*& cls) const
+ fclsmap.Bind(surfi, cls);
+ }
+ }
-
--
-- void OCCGeometry :: Project (int surfi, Point<3> & p) const
+ \r
+-\r
+- void OCCGeometry :: Project (int surfi, Point<3> & p) const\r
+ // void OCCGeometry :: Project (int surfi, Point<3> & p) const
+ bool OCCGeometry :: Project (int surfi, Point<3> & p, double& u, double& v) const
- {
- static int cnt = 0;
- if (++cnt % 1000 == 0) cout << "Project cnt = " << cnt << endl;
-
- gp_Pnt pnt(p(0), p(1), p(2));
-
-- double u,v;
-- Handle( Geom_Surface ) thesurf = BRep_Tool::Surface(TopoDS::Face(fmap(surfi)));
-- Handle( ShapeAnalysis_Surface ) su = new ShapeAnalysis_Surface( thesurf );
-- gp_Pnt2d suval = su->ValueOfUV ( pnt, BRep_Tool::Tolerance( TopoDS::Face(fmap(surfi)) ) );
-- suval.Coord( u, v);
-- pnt = thesurf->Value( u, v );
--
--
+ {\r
+ static int cnt = 0;\r
+ if (++cnt % 1000 == 0) cout << "Project cnt = " << cnt << endl;\r
+ \r
+ gp_Pnt pnt(p(0), p(1), p(2));\r
+ \r
+- double u,v;\r
+- Handle( Geom_Surface ) thesurf = BRep_Tool::Surface(TopoDS::Face(fmap(surfi)));\r
+- Handle( ShapeAnalysis_Surface ) su = new ShapeAnalysis_Surface( thesurf );\r
+- gp_Pnt2d suval = su->ValueOfUV ( pnt, BRep_Tool::Tolerance( TopoDS::Face(fmap(surfi)) ) );\r
+- suval.Coord( u, v);\r
+- pnt = thesurf->Value( u, v );\r
+ // -- Optimization: use cached projector and classifier
+ // double u,v;
+ // Handle( Geom_Surface ) thesurf = BRep_Tool::Surface(TopoDS::Face(fmap(surfi)));
+ Handle(ShapeAnalysis_Surface) proj;
+ BRepTopAdaptor_FClass2d *cls;
+ GetFaceTools(surfi, proj, cls);
-+
+ \r
+ gp_Pnt2d p2d = proj->ValueOfUV(pnt, Precision::Confusion());
+ if (cls->Perform(p2d) == TopAbs_OUT)
+ {
+ }
+ pnt = proj->Value(p2d);
+ p2d.Coord(u, v);
-+
- p = Point<3> (pnt.X(), pnt.Y(), pnt.Z());
-
+ \r
+ p = Point<3> (pnt.X(), pnt.Y(), pnt.Z());\r
+ \r
+ return true;
- }
-
-
+ }\r
+ \r
+ \r
@@ -979,54 +1021,69 @@
- {
- gp_Pnt p(ap(0), ap(1), ap(2));
-
-- Handle(Geom_Surface) surface = BRep_Tool::Surface(TopoDS::Face(fmap(surfi)));
--
-- gp_Pnt x = surface->Value (u,v);
--
-- if (p.SquareDistance(x) <= sqr(PROJECTION_TOLERANCE)) return true;
--
-- gp_Vec du, dv;
--
-- surface->D1(u,v,x,du,dv);
--
-- int count = 0;
--
-- gp_Pnt xold;
-- gp_Vec n;
-- double det, lambda, mu;
--
-- do {
-- count++;
--
-- n = du^dv;
--
-- det = Det3 (n.X(), du.X(), dv.X(),
-- n.Y(), du.Y(), dv.Y(),
-- n.Z(), du.Z(), dv.Z());
--
-- if (det < 1e-15) return false;
--
-- lambda = Det3 (n.X(), p.X()-x.X(), dv.X(),
-- n.Y(), p.Y()-x.Y(), dv.Y(),
-- n.Z(), p.Z()-x.Z(), dv.Z())/det;
--
-- mu = Det3 (n.X(), du.X(), p.X()-x.X(),
-- n.Y(), du.Y(), p.Y()-x.Y(),
-- n.Z(), du.Z(), p.Z()-x.Z())/det;
--
-- u += lambda;
-- v += mu;
--
-- xold = x;
-- surface->D1(u,v,x,du,dv);
--
-- } while (xold.SquareDistance(x) > sqr(PROJECTION_TOLERANCE) && count < 50);
--
-- // (*testout) << "FastProject count: " << count << endl;
--
-- if (count == 50) return false;
--
-- ap = Point<3> (x.X(), x.Y(), x.Z());
+ {\r
+ gp_Pnt p(ap(0), ap(1), ap(2));\r
+ \r
+- Handle(Geom_Surface) surface = BRep_Tool::Surface(TopoDS::Face(fmap(surfi)));\r
+-\r
+- gp_Pnt x = surface->Value (u,v);\r
+-\r
+- if (p.SquareDistance(x) <= sqr(PROJECTION_TOLERANCE)) return true;\r
+-\r
+- gp_Vec du, dv;\r
+ // -- Optimization: use cached projector and classifier
+ // Handle(Geom_Surface) surface = BRep_Tool::Surface(TopoDS::Face(fmap(surfi)));
+ //
+ Handle(ShapeAnalysis_Surface) proj;
+ BRepTopAdaptor_FClass2d *cls;
+ GetFaceTools(surfi, proj, cls);
-+
+ \r
+- surface->D1(u,v,x,du,dv);\r
+-\r
+- int count = 0;\r
+-\r
+- gp_Pnt xold;\r
+- gp_Vec n;\r
+- double det, lambda, mu;\r
+-\r
+- do {\r
+- count++;\r
+-\r
+- n = du^dv;\r
+-\r
+- det = Det3 (n.X(), du.X(), dv.X(),\r
+- n.Y(), du.Y(), dv.Y(),\r
+- n.Z(), du.Z(), dv.Z());\r
+-\r
+- if (det < 1e-15) return false;\r
+-\r
+- lambda = Det3 (n.X(), p.X()-x.X(), dv.X(),\r
+- n.Y(), p.Y()-x.Y(), dv.Y(),\r
+- n.Z(), p.Z()-x.Z(), dv.Z())/det;\r
+-\r
+- mu = Det3 (n.X(), du.X(), p.X()-x.X(),\r
+- n.Y(), du.Y(), p.Y()-x.Y(),\r
+- n.Z(), du.Z(), p.Z()-x.Z())/det;\r
+-\r
+- u += lambda;\r
+- v += mu;\r
+-\r
+- xold = x;\r
+- surface->D1(u,v,x,du,dv);\r
+-\r
+- } while (xold.SquareDistance(x) > sqr(PROJECTION_TOLERANCE) && count < 50);\r
+-\r
+- // (*testout) << "FastProject count: " << count << endl;\r
+-\r
+- if (count == 50) return false;\r
+ gp_Pnt2d p2d = proj->NextValueOfUV(gp_Pnt2d(u,v), p, Precision::Confusion());
+ if (cls->Perform(p2d) == TopAbs_OUT)
+ {
+ //cout << "Projection fails" << endl;
+ return false;
+ }
-+
+ \r
+- ap = Point<3> (x.X(), x.Y(), x.Z());\r
+ p = proj->Value(p2d);
+ p2d.Coord(u, v);
+ ap = Point<3> (p.X(), p.Y(), p.Z());
-
- return true;
- }
-diff -Naur netgen-5.3.1_orig/libsrc/occ/occgeom.hpp netgen-5.3.1_new/libsrc/occ/occgeom.hpp
---- netgen-5.3.1_orig/libsrc/occ/occgeom.hpp 2010-01-14 19:56:19.000000000 +0300
-+++ netgen-5.3.1_new/libsrc/occ/occgeom.hpp 2014-07-22 13:09:03.000000000 +0400
+ \r
+ return true;\r
+ }\r
+@@ -1038,9 +1095,9 @@
+ {\r
+ cout << "writing stl..."; cout.flush();\r
+ StlAPI_Writer writer;\r
+- writer.RelativeMode() = Standard_False;\r
++ //writer.RelativeMode() = Standard_False;
+ \r
+- writer.SetDeflection(0.02);\r
++ //writer.SetDeflection(0.02);
+ writer.Write(shape,filename);\r
+ \r
+ cout << "done" << endl;\r
+@@ -1059,10 +1116,10 @@
+ occgeo = new OCCGeometry;\r
+ \r
+ // Initiate a dummy XCAF Application to handle the IGES XCAF Document\r
+- static Handle_XCAFApp_Application dummy_app = XCAFApp_Application::GetApplication();\r
++ static Handle(XCAFApp_Application) dummy_app = XCAFApp_Application::GetApplication();
+ \r
+ // Create an XCAF Document to contain the IGES file itself\r
+- Handle_TDocStd_Document iges_doc;\r
++ Handle(TDocStd_Document) iges_doc;
+ \r
+ // Check if a IGES File is already open under this handle, if so, close it to prevent\r
+ // Segmentation Faults when trying to create a new document\r
+@@ -1089,8 +1146,8 @@
+ reader.Transfer(iges_doc);\r
+ \r
+ // Read in the shape(s) and the colours present in the IGES File\r
+- Handle_XCAFDoc_ShapeTool iges_shape_contents = XCAFDoc_DocumentTool::ShapeTool(iges_doc->Main());\r
+- Handle_XCAFDoc_ColorTool iges_colour_contents = XCAFDoc_DocumentTool::ColorTool(iges_doc->Main());\r
++ Handle(XCAFDoc_ShapeTool) iges_shape_contents = XCAFDoc_DocumentTool::ShapeTool(iges_doc->Main());
++ Handle(XCAFDoc_ColorTool) iges_colour_contents = XCAFDoc_DocumentTool::ColorTool(iges_doc->Main());
+ \r
+ TDF_LabelSequence iges_shapes;\r
+ iges_shape_contents->GetShapes(iges_shapes);\r
+@@ -1137,10 +1194,10 @@
+ occgeo = new OCCGeometry;\r
+ \r
+ // Initiate a dummy XCAF Application to handle the STEP XCAF Document\r
+- static Handle_XCAFApp_Application dummy_app = XCAFApp_Application::GetApplication();\r
++ static Handle(XCAFApp_Application) dummy_app = XCAFApp_Application::GetApplication();
+ \r
+ // Create an XCAF Document to contain the STEP file itself\r
+- Handle_TDocStd_Document step_doc;\r
++ Handle(TDocStd_Document) step_doc;
+ \r
+ // Check if a STEP File is already open under this handle, if so, close it to prevent\r
+ // Segmentation Faults when trying to create a new document\r
+@@ -1167,8 +1224,8 @@
+ reader.Transfer(step_doc);\r
+ \r
+ // Read in the shape(s) and the colours present in the STEP File\r
+- Handle_XCAFDoc_ShapeTool step_shape_contents = XCAFDoc_DocumentTool::ShapeTool(step_doc->Main());\r
+- Handle_XCAFDoc_ColorTool step_colour_contents = XCAFDoc_DocumentTool::ColorTool(step_doc->Main());\r
++ Handle(XCAFDoc_ShapeTool) step_shape_contents = XCAFDoc_DocumentTool::ShapeTool(step_doc->Main());
++ Handle(XCAFDoc_ColorTool) step_colour_contents = XCAFDoc_DocumentTool::ColorTool(step_doc->Main());
+ \r
+ TDF_LabelSequence step_shapes;\r
+ step_shape_contents->GetShapes(step_shapes);\r
+@@ -1221,7 +1278,7 @@
+ // Fixed a bug in the OpenCascade XDE Colour handling when \r
+ // opening BREP Files, since BREP Files have no colour data.\r
+ // Hence, the face_colours Handle needs to be created as a NULL handle.\r
+- occgeo->face_colours = Handle_XCAFDoc_ColorTool();\r
++ occgeo->face_colours = Handle(XCAFDoc_ColorTool)();
+ occgeo->face_colours.Nullify();\r
+ occgeo->changed = 1;\r
+ occgeo->BuildFMap();\r
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/occgeom.hpp netgen-5.3.1_new/libsrc/occ/occgeom.hpp
+--- netgen-5.3.1_orig/libsrc/occ/occgeom.hpp 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/occgeom.hpp 2016-09-29 14:44:01.996464598 +0300
@@ -15,8 +15,8 @@
- #include "Geom_Curve.hxx"
- #include "Geom2d_Curve.hxx"
- #include "Geom_Surface.hxx"
--#include "GeomAPI_ProjectPointOnSurf.hxx"
--#include "GeomAPI_ProjectPointOnCurve.hxx"
+ #include "Geom_Curve.hxx"\r
+ #include "Geom2d_Curve.hxx"\r
+ #include "Geom_Surface.hxx"\r
+-#include "GeomAPI_ProjectPointOnSurf.hxx"\r
+-#include "GeomAPI_ProjectPointOnCurve.hxx"\r
+// #include "GeomAPI_ProjectPointOnSurf.hxx"
+// #include "GeomAPI_ProjectPointOnCurve.hxx"
- #include "BRepTools.hxx"
- #include "TopExp.hxx"
- #include "BRepBuilderAPI_MakeVertex.hxx"
+ #include "BRepTools.hxx"\r
+ #include "TopExp.hxx"\r
+ #include "BRepBuilderAPI_MakeVertex.hxx"\r
@@ -42,8 +42,8 @@
- #include "Geom_Curve.hxx"
- #include "Geom2d_Curve.hxx"
- #include "Geom_Surface.hxx"
--#include "GeomAPI_ProjectPointOnSurf.hxx"
--#include "GeomAPI_ProjectPointOnCurve.hxx"
+ #include "Geom_Curve.hxx"\r
+ #include "Geom2d_Curve.hxx"\r
+ #include "Geom_Surface.hxx"\r
+-#include "GeomAPI_ProjectPointOnSurf.hxx"\r
+-#include "GeomAPI_ProjectPointOnCurve.hxx"\r
+// #include "GeomAPI_ProjectPointOnSurf.hxx"
+// #include "GeomAPI_ProjectPointOnCurve.hxx"
- #include "TopoDS_Wire.hxx"
- #include "BRepTools_WireExplorer.hxx"
- #include "BRepTools.hxx"
+ #include "TopoDS_Wire.hxx"\r
+ #include "BRepTools_WireExplorer.hxx"\r
+ #include "BRepTools.hxx"\r
@@ -68,18 +68,26 @@
- #include "IGESToBRep_Reader.hxx"
- #include "Interface_Static.hxx"
- #include "GeomAPI_ExtremaCurveCurve.hxx"
--#include "Standard_ErrorHandler.hxx"
+ #include "IGESToBRep_Reader.hxx"\r
+ #include "Interface_Static.hxx"\r
+ #include "GeomAPI_ExtremaCurveCurve.hxx"\r
+-#include "Standard_ErrorHandler.hxx"\r
+//#include "Standard_ErrorHandler.hxx"
- #include "Standard_Failure.hxx"
- #include "ShapeUpgrade_ShellSewing.hxx"
- #include "ShapeFix_Shape.hxx"
- #include "ShapeFix_Wireframe.hxx"
+ #include "Standard_Failure.hxx"\r
+ #include "ShapeUpgrade_ShellSewing.hxx"\r
+ #include "ShapeFix_Shape.hxx"\r
+ #include "ShapeFix_Wireframe.hxx"\r
+#include <Standard_Version.hxx>
+#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) <= 0x060702
+// porting to OCCT6.7.3
- #include "BRepMesh.hxx"
+ #include "BRepMesh.hxx"\r
+#endif
- #include "BRepMesh_IncrementalMesh.hxx"
- #include "BRepBndLib.hxx"
- #include "Bnd_Box.hxx"
- #include "ShapeAnalysis.hxx"
- #include "ShapeBuild_ReShape.hxx"
-
+ #include "BRepMesh_IncrementalMesh.hxx"\r
+ #include "BRepBndLib.hxx"\r
+ #include "Bnd_Box.hxx"\r
+ #include "ShapeAnalysis.hxx"\r
+ #include "ShapeBuild_ReShape.hxx"\r
+ \r
+// -- Optimization: to use cached projector and classifier
+#include <NCollection_DataMap.hxx>
-+class Handle_ShapeAnalysis_Surface;
++class ShapeAnalysis_Surface;
+class BRepTopAdaptor_FClass2d;
-
- // Philippose - 29/01/2009
- // OpenCascade XDE Support
-@@ -190,6 +198,9 @@
- class OCCGeometry : public NetgenGeometry
- {
- Point<3> center;
+ \r
+ // Philippose - 29/01/2009\r
+ // OpenCascade XDE Support\r
+@@ -192,6 +200,9 @@
+ class OCCGeometry : public NetgenGeometry\r
+ {\r
+ Point<3> center;\r
+ // -- Optimization: to use cached projector and classifier
-+ mutable NCollection_DataMap<int,Handle_ShapeAnalysis_Surface> fprjmap;
++ mutable NCollection_DataMap<int,Handle(ShapeAnalysis_Surface)> fprjmap;
+ mutable NCollection_DataMap<int,BRepTopAdaptor_FClass2d*> fclsmap;
-
- public:
- TopoDS_Shape shape;
-@@ -241,6 +252,8 @@
- vmap.Clear();
- }
-
+ \r
+ public:\r
+ TopoDS_Shape shape;\r
+@@ -203,7 +214,7 @@
+ // OpenCascade XDE Support\r
+ // XCAF Handle to make the face colours available to the rest of\r
+ // the system\r
+- Handle_XCAFDoc_ColorTool face_colours;\r
++ Handle(XCAFDoc_ColorTool) face_colours;
+ \r
+ mutable int changed;\r
+ Array<int> facemeshstatus;\r
+@@ -247,6 +258,8 @@
+ virtual void Save (string filename) const;\r
+ \r
+ \r
+ ~OCCGeometry(); // -- to free cached projector and classifier
+
- void BuildFMap();
-
- Box<3> GetBoundingBox()
-@@ -260,9 +273,14 @@
- Point<3> Center()
- { return center;}
-
-- void Project (int surfi, Point<3> & p) const;
+ void BuildFMap();\r
+ \r
+ Box<3> GetBoundingBox()\r
+@@ -266,9 +279,14 @@
+ Point<3> Center()\r
+ { return center;}\r
+ \r
+- void Project (int surfi, Point<3> & p) const;\r
+ // void Project (int surfi, Point<3> & p) const; -- optimization
+ bool Project (int surfi, Point<3> & p, double& u, double& v) const;
- bool FastProject (int surfi, Point<3> & ap, double& u, double& v) const;
-
+ bool FastProject (int surfi, Point<3> & ap, double& u, double& v) const;\r
+ \r
+ // -- Optimization: to use cached projector and classifier
+ void GetFaceTools(int surfi, Handle(ShapeAnalysis_Surface)& proj,
+ BRepTopAdaptor_FClass2d*& cls) const;
+
- OCCSurface GetSurface (int surfi)
- {
- cout << "OCCGeometry::GetSurface using PLANESPACE" << endl;
-diff -Naur netgen-5.3.1_orig/libsrc/occ/occmeshsurf.cpp netgen-5.3.1_new/libsrc/occ/occmeshsurf.cpp
---- netgen-5.3.1_orig/libsrc/occ/occmeshsurf.cpp 2009-08-24 06:32:47.000000000 +0400
-+++ netgen-5.3.1_new/libsrc/occ/occmeshsurf.cpp 2014-07-22 13:01:28.000000000 +0400
+ OCCSurface GetSurface (int surfi)\r
+ {\r
+ cout << "OCCGeometry::GetSurface using PLANESPACE" << endl;\r
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/occmeshsurf.cpp netgen-5.3.1_new/libsrc/occ/occmeshsurf.cpp
+--- netgen-5.3.1_orig/libsrc/occ/occmeshsurf.cpp 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/occmeshsurf.cpp 2016-09-29 14:08:00.045144560 +0300
@@ -6,6 +6,7 @@
#include <meshing.hpp>
#include <GeomLProp_SLProps.hxx>
namespace netgen
+@@ -96,13 +97,16 @@
+
+ n.Normalize();
+ }
+- else
++ else if ( lprop.IsNormalDefined() )
+ {
+ n(0)=lprop.Normal().X();
+ n(1)=lprop.Normal().Y();
+ n(2)=lprop.Normal().Z();
+ }
+-
++ else
++ {
++ n = 0;
++ }
+ if(glob_testout)
+ {
+ (*testout) << "u " << geominfo.u << " v " << geominfo.v
@@ -434,23 +435,33 @@
void MeshOptimize2dOCCSurfaces :: ProjectPoint (INDEX surfind, Point<3> & p) const
Point<3> hp = p;
- if (geometry.FastProject (surfind, hp, u, v))
- {
-- p = hp;
-- return 1;
-- }
-- ProjectPoint (surfind, p);
-- return CalcPointGeomInfo (surfind, gi, p);
+ // -- u and v are computed by FastProject() and Project(), no need to call CalcPointGeomInfo()
+ // if (geometry.FastProject (surfind, hp, u, v))
+ // {
+ ok = geometry.FastProject (surfind, hp, gi.u, gi.v);
+ else
+ ok = geometry.Project (surfind, hp, gi.u, gi.v);
-+ p = hp;
+ p = hp;
+- return 1;
+- }
+- ProjectPoint (surfind, p);
+- return CalcPointGeomInfo (surfind, gi, p);
+ return ok;
}
newp = hnewp;
newgi = ap1;
- };
-+ }
++ }//; -- to compile with -Wall -pedantic
- void OCCRefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi)
+ void OCCRefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi) const
{
if (surfi > 0)
- geometry.Project (surfi, p);
- };
-+ // geometry.Project (surfi, p); -- Project() changed for optimization
++ //geometry.Project (surfi, p);
+ {
+ double u, v;
+ geometry.Project (surfi, p, u, v);
+ }
+ }//; -- to compile with -Wall -pedantic
- void OCCRefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi, PointGeomInfo & gi)
+ void OCCRefinementSurfaces :: ProjectToSurface (Point<3> & p, int surfi, PointGeomInfo & gi) const
{
@@ -723,9 +739,10 @@
if (!geometry.FastProject (surfi, p, gi.u, gi.v))
- geometry.Project (surfi, p);
+ double u, v;
+ geometry.Project (surfi, p, u, v);
++ }
}
- };
-+ }
-diff -Naur netgen-5.3.1_orig/libsrc/occ/Partition_Loop2d.cxx netgen-5.3.1_new/libsrc/occ/Partition_Loop2d.cxx
---- netgen-5.3.1_orig/libsrc/occ/Partition_Loop2d.cxx 2009-08-24 06:12:24.000000000 +0400
-+++ netgen-5.3.1_new/libsrc/occ/Partition_Loop2d.cxx 2014-07-22 13:01:28.000000000 +0400
-@@ -209,7 +217,7 @@
- Cc->D1(uc, PC, CTg1);
- if (!isForward) CTg1.Reverse();
-
-- Standard_Real anglemin = 3 * PI, tolAng = 1.e-8;
-+ Standard_Real anglemin = 3 * M_PI, tolAng = 1.e-8;
-
- // select an edge whose first derivative is most left of CTg1
- // ie an angle between Tg1 and CTg1 is least
-@@ -233,7 +241,7 @@
- // -PI < angle < PI
- Standard_Real angle = Tg1.Angle(CTg1);
-
-- if (PI - Abs(angle) <= tolAng)
-+ if (M_PI - Abs(angle) <= tolAng)
- {
- // an angle is too close to PI; assure that an angle sign really
- // reflects an edge position: +PI - an edge is worst,
-diff -Naur netgen-5.3.1_orig/libsrc/occ/utilities.h netgen-5.3.1_new/libsrc/occ/utilities.h
---- netgen-5.3.1_orig/libsrc/occ/utilities.h 2009-08-24 06:12:24.000000000 +0400
-+++ netgen-5.3.1_new/libsrc/occ/utilities.h 2014-07-22 13:01:28.000000000 +0400
+diff -NaurwB netgen-5.3.1_orig/libsrc/occ/utilities.h netgen-5.3.1_new/libsrc/occ/utilities.h
+--- netgen-5.3.1_orig/libsrc/occ/utilities.h 2014-08-29 13:54:03.000000000 +0400
++++ netgen-5.3.1_new/libsrc/occ/utilities.h 2016-09-29 14:04:51.504148314 +0300
@@ -33,6 +33,7 @@
#include <string>
#include <cstdlib>
// #include "SALOME_Log.hxx"
-diff -Naur netgen-5.3.1_orig/nglib/nglib.h netgen-5.3.1_new/nglib/nglib.h
---- netgen-5.3.1_orig/nglib/nglib.h 2010-05-18 15:20:25.000000000 +0400
-+++ netgen-5.3.1_new/nglib/nglib.h 2014-07-22 13:01:28.000000000 +0400
+diff -NaurwB netgen-5.3.1_orig/nglib/nglib.h netgen-5.3.1_new/nglib/nglib.h
+--- netgen-5.3.1_orig/nglib/nglib.h 2014-08-29 13:54:00.000000000 +0400
++++ netgen-5.3.1_new/nglib/nglib.h 2016-09-29 14:04:51.504148314 +0300
@@ -24,7 +24,7 @@
- // Philippose - 14.02.2009
- // Modifications for creating a DLL in Windows
- #ifdef WIN32
-- #ifdef NGLIB_EXPORTS || nglib_EXPORTS
+ // Philippose - 14.02.2009\r
+ // Modifications for creating a DLL in Windows\r
+ #ifdef WIN32\r
+- #ifdef NGLIB_EXPORTS || nglib_EXPORTS\r
+ #if defined NGLIB_EXPORTS || defined nglib_EXPORTS
- #define DLL_HEADER __declspec(dllexport)
- #else
- #define DLL_HEADER __declspec(dllimport)
+ #define DLL_HEADER __declspec(dllexport)\r
+ #else\r
+ #define DLL_HEADER __declspec(dllimport)\r
