From: imn <imn@opencascade.com>
Date: Wed, 4 Dec 2013 11:51:32 +0000 (+0000)
Subject: Integrated in BR_imps_2013 branch: 0022357: EDF NETGENPLUGIN: NETGEN options
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=614945b22a70c7f240d121ef1e9ac0ba1315f804;p=plugins%2Fnetgenplugin.git

Integrated in BR_imps_2013 branch: 0022357: EDF NETGENPLUGIN: NETGEN options
---

diff --git a/src/NETGEN/netgen49ForSalome.patch b/src/NETGEN/netgen49ForSalome.patch
index b8680ef..f246a50 100644
--- a/src/NETGEN/netgen49ForSalome.patch
+++ b/src/NETGEN/netgen49ForSalome.patch
@@ -1013,45 +1013,37 @@ diff -Naur netgen-4.9.13_orig/nglib/nglib.h netgen-4.9.13_new/nglib/nglib.h
     #else
        #define DLL_HEADER   __declspec(dllimport)
     }
-diff -Naur netgen-4.9.13_orig/libsrc/occ/occgenmesh.cpp netgen-4.9.13_new/libsrc/occ/occgenmesh.cpp
---- netgen-4.9.13_orig/libsrc/occ/occgenmesh.cpp	2013-11-29 20:02:13.000000000 +0400
-+++ netgen-4.9.13_new/libsrc/occ/occgenmesh.cpp	2013-11-29 20:30:03.000000000 +0400
-@@ -563,18 +563,21 @@
-                {
+diff -Naur netgen-4.9.13_orig/libsrc/occ/occgenmesh.cpp /netgen-4.9.13_new/libsrc/occ/occgenmesh.cpp
+--- netgen-4.9.13_orig/libsrc/occ/occgenmesh.cpp	2013-12-04 14:39:45.000000000 +0400
++++ netgen-4.9.13_new/libsrc/occ/occgenmesh.cpp	2013-12-04 15:20:24.000000000 +0400
+@@ -564,17 +564,20 @@
                    bool exists = 0;
                    int j;
--                  for (j = first_ep; j <= mesh.GetNP(); j++)
--                     if ((mesh.Point(j)-Point<3>(mp[i-1])).Length() < eps)
-+            	     for (j = first_ep; j <= mesh.GetNP(); j++)
-+                   {
+                   for (j = first_ep; j <= mesh.GetNP(); j++)
++                  {
 +                     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 )
+                      if ((mesh.Point(j)-Point<3>(mp[i-1])).Length() < eps)
                       {
--                        exists = 1;
--                        break;
-+                       exists = 1;
-+                       break;
+                         exists = 1;
+                         break;
                       }
-+                   }
++                  }
  
                       if (exists)
                          pnums[i] = j;
                       else
                       {
 -                        mesh.AddPoint (mp[i-1]);
-+                	mesh.AddPoint (mp[i-1], geomedgenr); // to support SALOME fuse edges
++                        mesh.AddPoint (mp[i-1], geomedgenr); // to support SALOME fuse edges
                          (*testout) << "add meshpoint " << mp[i-1] << endl;
                          pnums[i] = mesh.GetNP();
                       }
-@@ -660,7 +663,10 @@
+@@ -658,6 +661,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);
- 
-       mesh.CalcSurfacesOfNode();
--      multithread.task = savetask;
-+      multithread.task = savetask;
-+
 +      for (int j = 1; j <= mesh.GetNP(); j++) // to support SALOME fuse edges: set level to zero
-+    	  mesh.Point(j).SetPoint(mesh.Point(j));
-    }
- 
++        mesh.Point(j) = MeshPoint( (Point<3>&) mesh.Point(j) );
  
+       mesh.CalcSurfacesOfNode();
+       multithread.task = savetask;