revert salome.pyconf

diff --git a/products/patches/netgen-6.2.2204-for-SALOME.patch b/products/patches/netgen-6.2.2204-for-SALOME.patch
index b69cb6db3094ddfae5ae99bf2cea452a9ed7baf9..b4af04c55b388b0a2a2e7d2cfe1f4ef8fef8b188 100644 (file)
--- a/products/patches/netgen-6.2.2204-for-SALOME.patch
+++ b/products/patches/netgen-6.2.2204-for-SALOME.patch
@@ -1,11 +1,12 @@
  external_dependencies/pybind11 |  1 -
  libsrc/core/version.hpp        |  7 ++++++-
- libsrc/meshing/meshclass.cpp   |  5 +++--
+ libsrc/meshing/basegeom.cpp    |  1 -
+ libsrc/meshing/meshclass.cpp   |  7 ++++---
  libsrc/occ/occgenmesh.cpp      | 15 +++++++++------
  libsrc/stlgeom/stlgeom.hpp     |  2 +-
  libsrc/stlgeom/stltopology.hpp |  2 +-
  nglib/nglib.cpp                |  2 +-
- 7 files changed, 21 insertions(+), 13 deletions(-)
+ 8 files changed, 22 insertions(+), 15 deletions(-)
 
 diff --git a/external_dependencies/pybind11 b/external_dependencies/pybind11
 deleted file mode 160000
@@ -32,8 +33,20 @@ index 3048ce5b..81524b58 100644
                    if(dot == size_t(-1)) vstring = "";
                    else vstring = vstring.substr(dot+1, vstring.size()-dot-1);
                    if(!vstring.empty())
+diff --git a/libsrc/meshing/basegeom.cpp b/libsrc/meshing/basegeom.cpp
+index cb5b8407..3c50e795 100644
+--- a/libsrc/meshing/basegeom.cpp
++++ b/libsrc/meshing/basegeom.cpp
+@@ -1104,7 +1104,6 @@ namespace netgen
+     if(restricted_h.Size())
+       for(const auto& [pnt, maxh] : restricted_h)
+         mparam.meshsize_points.Append({pnt, maxh});
+-
+     if(mparam.perfstepsstart <= MESHCONST_ANALYSE)
+       {
+         if(!mesh)
 diff --git a/libsrc/meshing/meshclass.cpp b/libsrc/meshing/meshclass.cpp
-index c89064cb..5c16d67b 100644
+index c89064cb..2a1d50d0 100644
 --- a/libsrc/meshing/meshclass.cpp
 +++ b/libsrc/meshing/meshclass.cpp
 @@ -281,8 +281,9 @@ namespace netgen
@@ -48,11 +61,37 @@ index c89064cb..5c16d67b 100644
  
      for (int i = 0; i < cd2names.Size(); i++)
        delete cd2names[i];
+@@ -7087,7 +7088,7 @@ namespace netgen
+           bcnames[i] = new string("default");
+       }
+ 
+-    if ( bcnames[bcnr] ) delete bcnames[bcnr];
++    //if ( bcnames[bcnr] ) delete bcnames[bcnr];
+     bcnames[bcnr] = new string ( abcname );
+ 
+     for (auto & fd : facedecoding)
 diff --git a/libsrc/occ/occgenmesh.cpp b/libsrc/occ/occgenmesh.cpp
-index e0164177..e70a246f 100644
+index e0164177..c2043247 100644
 --- a/libsrc/occ/occgenmesh.cpp
 +++ b/libsrc/occ/occgenmesh.cpp
-@@ -653,13 +653,13 @@ namespace netgen
+@@ -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>
+@@ -535,6 +536,8 @@ namespace netgen
+ 
+             bool is_identified_edge = false;
+             // TODO: change to use hash value
++            netgen::T_Shape a = e.TShape();
++            geom.edge_map.at(a);
+             const auto& gedge = geom.GetEdge(geom.edge_map.at(e.TShape()));
+             auto& v0 = gedge.GetStartVertex();
+             auto& v1 = gedge.GetEndVertex();
+@@ -653,13 +656,13 @@ namespace netgen
  
                  for (int k = 1; k <=3; k++)
                    {
@@ -72,22 +111,6 @@ index e0164177..e70a246f 100644
                    }
  
                  //double maxside = 0;
-@@ -796,12 +796,15 @@ namespace netgen
-               }
-           }
- 
-+        MyFile << "1.8\n";
-         for (auto mspnt : mparam.meshsize_points)
-           mesh.RestrictLocalH(mspnt.pnt, mspnt.h, mspnt.layer);
- 
-+        MyFile << "1.9\n";
-         multithread.task = savetask;
- 
-       }
-+    MyFile << "2";
- 
-     mesh.LoadLocalMeshSize (mparam.meshsizefilename);
-   }
 diff --git a/libsrc/stlgeom/stlgeom.hpp b/libsrc/stlgeom/stlgeom.hpp
 index 8cc5739e..46bad1dc 100644
 --- a/libsrc/stlgeom/stlgeom.hpp