gmsh/opnscs650.patch

   1 diff -Nur Geo.orig/OCC_Connect.cpp Geo/OCC_Connect.cpp
   2 --- Geo.orig/OCC_Connect.cpp    2011-12-24 13:39:19.061729844 +0100
   3 +++ Geo/OCC_Connect.cpp 2011-12-24 13:36:24.462678584 +0100
   4 @@ -597,7 +597,7 @@
   5              double tolerance=std::max(BRep_Tool::Tolerance(edge),
   6                                        BRep_Tool::Tolerance(vertex));
   7              for(int i=1;i<=distance.NbExt();i++) {
   8 -                if(distance.Value(i)<tolerance) {
   9 +                if(distance.SquareDistance(i)<tolerance) {
  10                      try {
  11                          // No idea why this can fail
  12                          splitter1.Add(vertex,distance.Parameter(i),edge);
  13 @@ -616,7 +616,7 @@
  14                              double d2=BRep_Tool::Pnt(v2).Distance(
  15                                  BRep_Tool::Pnt(vertex));
  16                              cout << "Adding " << i << " to edge " << e
  17 -                                << " distance=" << distance.Value(i)
  18 +                                << " distance=" << distance.SquareDistance(i)
  19                                  << " parameter=" << distance.Parameter(i)
  20                                  << " point=" << distance.Point(i)
  21                                  << " dv1=" << d1
  22 @@ -649,7 +649,7 @@
  23              double tolerance=std::max(BRep_Tool::Tolerance(edge),
  24                                        BRep_Tool::Tolerance(vertex));
  25              for(int i=1;i<=distance.NbExt();i++) {
  26 -                if(distance.Value(i)<tolerance) {
  27 +                if(distance.SquareDistance(i)<tolerance) {
  28                      try {
  29                          splitter2.Add(vertex,distance.Parameter(i),edge);
  30                      }
  31 @@ -667,7 +667,7 @@
  32                              double d2=BRep_Tool::Pnt(v2).Distance(
  33                                  BRep_Tool::Pnt(vertex));
  34                              cout << "Adding " << i << " to edge " << e
  35 -                                << " distance=" << distance.Value(i)
  36 +                                << " distance=" << distance.SquareDistance(i)
  37                                  << " parameter=" << distance.Parameter(i)
  38                                  << " point=" << distance.Point(i)
  39                                  << " dv1=" << d1
  40 diff -Nur Geo.orig/OCCFace.cpp Geo/OCCFace.cpp
  41 --- Geo.orig/OCCFace.cpp        2011-12-24 13:39:19.055063214 +0100
  42 +++ Geo/OCCFace.cpp     2011-12-24 13:38:20.518715406 +0100
  43 @@ -349,7 +349,7 @@
  44    Standard_Real aDiscret = aCoeff * dMax;
  45    BRepMesh_FastDiscret aMesher(aDiscret, 0.5, aBox, Standard_False, Standard_True,
  46                                 Standard_False, Standard_True);
  47 -  aMesher.Add(s);
  48 +  //aMesher.Add(s);
  49    TopLoc_Location loc;
  50    Handle(Poly_Triangulation) triangulation = BRep_Tool::Triangulation(s, loc);
  51    if(triangulation.IsNull()){