ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
imn 2013-12-04 11:51:32 +00:00
parent 278ff1b837
commit 614945b22a
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/NETGEN/netgen49ForSalome.patch
View File

@ -1013,45 +1013,37 @@ diff -Naur netgen-4.9.13_orig/nglib/nglib.h netgen-4.9.13_new/nglib/nglib.h
#else #else
#define DLL_HEADER __declspec(dllimport) #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 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_orig/libsrc/occ/occgenmesh.cpp 2013-12-04 14:39:45.000000000 +0400
+++ netgen-4.9.13_new/libsrc/occ/occgenmesh.cpp 2013-11-29 20:30:03.000000000 +0400 +++ netgen-4.9.13_new/libsrc/occ/occgenmesh.cpp 2013-12-04 15:20:24.000000000 +0400
@@ -563,18 +563,21 @@ @@ -564,17 +564,20 @@
{
bool exists = 0; bool exists = 0;
int j; int j;
- for (j = first_ep; j <= mesh.GetNP(); 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++)
+ {
+ if (!merge_solids && mesh.Point(j).GetLayer() != geomedgenr ) continue; // to support SALOME fuse edges + 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; exists = 1;
- break; break;
+ exists = 1;
+ break;
} }
+ } + }
if (exists) if (exists)
pnums[i] = j; pnums[i] = j;
else else
{ {
- mesh.AddPoint (mp[i-1]); - 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; (*testout) << "add meshpoint " << mp[i-1] << endl;
pnums[i] = mesh.GetNP(); 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); // exit(10);
+ 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(); mesh.CalcSurfacesOfNode();
- multithread.task = savetask; 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));
}